diff --git a/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp b/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp --- a/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp +++ b/llvm/lib/Transforms/Utils/FunctionImportUtils.cpp @@ -239,11 +239,20 @@ // propagateConstants hasn't been run. We can't internalize GV // in such case. if (!GV.isDeclaration() && VI && ImportIndex.withGlobalValueDeadStripping()) { - const auto &SL = VI.getSummaryList(); - auto *GVS = SL.empty() ? nullptr : dyn_cast(SL[0].get()); - // At this stage "maybe" is "definitely" - if (GVS && (GVS->maybeReadOnly() || GVS->maybeWriteOnly())) - cast(&GV)->addAttribute("thinlto-internalize"); + if (GlobalVariable *V = dyn_cast(&GV)) { + GlobalVarSummary* GVS = nullptr; + for (auto &S : VI.getSummaryList()) { + GVS = dyn_cast(S->getBaseObject()); + if (GVS) { + if (GVS->modulePath() == M.getModuleIdentifier()) + break; + GVS = nullptr; + } + } + // At this stage "maybe" is "definitely" + if (GVS && (GVS->maybeReadOnly() || GVS->maybeWriteOnly())) + V->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 new file mode 100644 --- /dev/null +++ b/llvm/test/ThinLTO/X86/Inputs/guid_collision.ll @@ -0,0 +1,12 @@ +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 new file mode 100644 --- /dev/null +++ b/llvm/test/ThinLTO/X86/guid_collision.ll @@ -0,0 +1,17 @@ +; 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