[ThinLTO] Don't internalize during promotion

Differential revision: https://reviews.llvm.org/D69107

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@375493 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/IPO/FunctionImport.cpp b/lib/Transforms/IPO/FunctionImport.cpp
index 531dbb5b6f218c4b6f2873e3b357593f6035f76c..2ce8c92ec8abab669bab4a234b2715b77514082b 100644 (file)
--- a/lib/Transforms/IPO/FunctionImport.cpp
+++ b/lib/Transforms/IPO/FunctionImport.cpp
@@ -952,6 +952,7 @@ void llvm::thinLTOResolvePrevailingInModule(
     if (NewLinkage == GV.getLinkage())
       return;
     if (GlobalValue::isLocalLinkage(GV.getLinkage()) ||
+        GlobalValue::isLocalLinkage(NewLinkage) ||
         // In case it was dead and already converted to declaration.
         GV.isDeclaration())
       return;

diff --git a/test/ThinLTO/X86/not-internalized.ll b/test/ThinLTO/X86/not-internalized.ll
new file mode 100644 (file)
index 0000000..cf3ae05
--- /dev/null
+++ b/test/ThinLTO/X86/not-internalized.ll
@@ -0,0 +1,34 @@
+; ModuleID = 'test.c'
+source_filename = "test.c"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+; RUN: opt -module-summary %s -o %t.bc
+; RUN: llvm-lto2 run -save-temps %t.bc -o %t.out \
+; RUN:    -r=%t.bc,foo,plx \
+; RUN:    -r=%t.bc,bar,lx
+
+; Check that we don't internalize `bar` during promotion,
+; because foo and bar are members of the same comdat
+; RUN: llvm-dis %t.out.1.1.promote.bc -o - | FileCheck %s
+
+; Thin LTO internalization shouldn't internalize `bar` as well
+; RUN: llvm-dis %t.out.1.2.internalize.bc -o - | FileCheck %s
+
+; CHECK: define linkonce_odr dso_local i32 @bar() comdat($foo)
+
+$foo = comdat any
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local i32 @bar() comdat($foo) {
+entry:
+  ret i32 33
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local i32 @foo() comdat {
+entry:
+  %call = call i32 @bar()
+  %add = add nsw i32 42, %call
+  ret i32 %add
+}

diff --git a/test/ThinLTO/X86/weak_externals.ll b/test/ThinLTO/X86/weak_externals.ll
index d5429b7234bf71ad6109a9ae0565235057e364c3..83e0e0ecd611095b0f78b1208077c4564bc523b4 100644 (file)
--- a/test/ThinLTO/X86/weak_externals.ll
+++ b/test/ThinLTO/X86/weak_externals.ll
@@ -7,10 +7,12 @@
 ; RUN:               -r=%t.bc,_ZZN9SingletonI1SE11getInstanceEvE8instance,lx \
 ; RUN:               -r=%t.bc,_ZZN9SingletonI1SE11getInstanceEvE13instance_weak,lx
 ; RUN: llvm-dis %t.out.1.1.promote.bc -o - | FileCheck %s
+; RUN: llvm-dis %t.out.1.2.internalize.bc -o - | FileCheck %s --check-prefix=INTERNALIZE
 
 ; CHECK: @_ZZN9SingletonI1SE11getInstanceEvE8instance = available_externally dso_local global %struct.S zeroinitializer
 ; CHECK: @_ZZN9SingletonI1SE11getInstanceEvE13instance_weak = available_externally dso_local global %struct.S* null, align 8
-; CHECK: define internal dereferenceable(16) %struct.S* @_ZN9SingletonI1SE11getInstanceEv() comdat
+; CHECK: define linkonce_odr dso_local dereferenceable(16) %struct.S* @_ZN9SingletonI1SE11getInstanceEv() comdat
+; INTERNALIZE: define internal dereferenceable(16) %struct.S* @_ZN9SingletonI1SE11getInstanceEv()
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"