diff options
| -rw-r--r-- | llvm/lib/Transforms/Utils/FunctionImportUtils.cpp | 16 | ||||
| -rw-r--r-- | llvm/test/ThinLTO/X86/Inputs/guid_collision.ll | 12 | ||||
| -rw-r--r-- | llvm/test/ThinLTO/X86/guid_collision.ll | 17 |
3 files changed, 5 insertions, 40 deletions
diff --git a/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp b/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp index 3109224dc2c..76b4635ad50 100644 --- a/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp +++ b/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp @@ -239,17 +239,11 @@ void FunctionImportGlobalProcessing::processGlobalForThinLTO(GlobalValue &GV) { // propagateConstants hasn't been run. We can't internalize GV // in such case. if (!GV.isDeclaration() && VI && ImportIndex.withGlobalValueDeadStripping()) { - if (GlobalVariable *V = dyn_cast<GlobalVariable>(&GV)) { - // We can have more than one local with the same GUID, in the case of - // same-named locals in different but same-named source files that were - // compiled in their respective directories (so the source file name - // and resulting GUID is the same). Find the one in this module. - auto* GVS = dyn_cast<GlobalVarSummary>( - ImportIndex.findSummaryInModule(VI, M.getModuleIdentifier())); - // At this stage "maybe" is "definitely" - if (GVS && (GVS->maybeReadOnly() || GVS->maybeWriteOnly())) - V->addAttribute("thinlto-internalize"); - } + const auto &SL = VI.getSummaryList(); + auto *GVS = SL.empty() ? nullptr : dyn_cast<GlobalVarSummary>(SL[0].get()); + // At this stage "maybe" is "definitely" + if (GVS && (GVS->maybeReadOnly() || GVS->maybeWriteOnly())) + cast<GlobalVariable>(&GV)->addAttribute("thinlto-internalize"); } bool DoPromote = false; diff --git a/llvm/test/ThinLTO/X86/Inputs/guid_collision.ll b/llvm/test/ThinLTO/X86/Inputs/guid_collision.ll deleted file mode 100644 index 885761cc494..00000000000 --- a/llvm/test/ThinLTO/X86/Inputs/guid_collision.ll +++ /dev/null @@ -1,12 +0,0 @@ -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -target triple = "x86_64-pc-linux-gnu" - -; The source for the GUID for this symbol will be -:F -source_filename = "-" -define internal fastcc i64 @F() { - ret i64 0 -} - -; Needed to give llvm-lto2 something to do -@dummy2 = global i32 0 - diff --git a/llvm/test/ThinLTO/X86/guid_collision.ll b/llvm/test/ThinLTO/X86/guid_collision.ll deleted file mode 100644 index 4d1add861b6..00000000000 --- a/llvm/test/ThinLTO/X86/guid_collision.ll +++ /dev/null @@ -1,17 +0,0 @@ -; Make sure LTO succeeds even if %t.bc contains a GlobalVariable F and -; %t2.bc cointains a Function F with the same GUID. -; -; RUN: opt -module-summary %s -o %t.bc -; RUN: opt -module-summary %p/Inputs/guid_collision.ll -o %t2.bc -; RUN: llvm-lto2 run %t.bc %t2.bc -o %t.out \ -; RUN: -r=%t.bc,dummy,px -r=%t2.bc,dummy2,px - -target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -target triple = "x86_64-pc-linux-gnu" - -; The source for the GUID for this symbol will be -:F -source_filename = "-" -@F = internal constant i8 0 - -; Needed to give llvm-lto2 something to do -@dummy = global i32 0 |
