diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-09 18:31:57 +0900 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-09 18:33:27 +0900 |
| commit | df025ebf872052c0761d44a3ef9b65e9675af8a8 (patch) | |
| tree | 9b4e94583e2536546d6606270bcdf846c95e1ba2 /llvm/lib/Linker/IRMover.cpp | |
| parent | 4428c9d0b1344179f85a72e183a44796976521e3 (diff) | |
| parent | bdcf47e4bcb92889665825654bb80a8bbe30379e (diff) | |
| download | llvm-users/chapuni/cov/single/loop.zip llvm-users/chapuni/cov/single/loop.tar.gz llvm-users/chapuni/cov/single/loop.tar.bz2 | |
Merge branch 'users/chapuni/cov/single/base' into users/chapuni/cov/single/loopusers/chapuni/cov/single/loop
Conflicts:
clang/lib/CodeGen/CoverageMappingGen.cpp
Diffstat (limited to 'llvm/lib/Linker/IRMover.cpp')
| -rw-r--r-- | llvm/lib/Linker/IRMover.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index a0c3f2c..be3535a 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -1562,10 +1562,6 @@ Error IRLinker::run() { bool EnableDLWarning = true; bool EnableTripleWarning = true; if (SrcTriple.isNVPTX() && DstTriple.isNVPTX()) { - std::string ModuleId = SrcM->getModuleIdentifier(); - StringRef FileName = llvm::sys::path::filename(ModuleId); - bool SrcIsLibDevice = - FileName.starts_with("libdevice") && FileName.ends_with(".10.bc"); bool SrcHasLibDeviceDL = (SrcM->getDataLayoutStr().empty() || SrcM->getDataLayoutStr() == "e-i64:64-v16:16-v32:32-n16:32:64"); @@ -1576,8 +1572,8 @@ Error IRLinker::run() { SrcTriple.getOSName() == "gpulibs") || (SrcTriple.getVendorName() == "unknown" && SrcTriple.getOSName() == "unknown"); - EnableTripleWarning = !(SrcIsLibDevice && SrcHasLibDeviceTriple); - EnableDLWarning = !(SrcIsLibDevice && SrcHasLibDeviceDL); + EnableTripleWarning = !SrcHasLibDeviceTriple; + EnableDLWarning = !(SrcHasLibDeviceTriple && SrcHasLibDeviceDL); } if (EnableDLWarning && (SrcM->getDataLayout() != DstM.getDataLayout())) { |