diff --git a/llvm/lib/Transforms/IPO/FunctionImport.cpp b/llvm/lib/Transforms/IPO/FunctionImport.cpp --- a/llvm/lib/Transforms/IPO/FunctionImport.cpp +++ b/llvm/lib/Transforms/IPO/FunctionImport.cpp @@ -992,6 +992,8 @@ GV.replaceAllUsesWith(NewGV); return false; } + if (!GV.isImplicitDSOLocal()) + GV.setDSOLocal(false); return true; } diff --git a/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll b/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll --- a/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll +++ b/llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll @@ -7,12 +7,14 @@ ; var2 is not prevailing and here we check it is not inlined. ; Check 'var2' was not inlined. -; RUN: llvm-objdump -d %t2.o.1 | FileCheck %s +; RUN: llvm-objdump -d -r %t2.o.1 | FileCheck %s ; CHECK: : ; CHECK-NEXT: movl $10, %eax ; CHECK-NEXT: retq ; CHECK: : -; CHECK-NEXT: movl (%rip), %eax +; CHECK-NEXT: movq (%rip), %rax +; CHECK-NEXT: R_X86_64_GOTPCREL var2-0x4 +; CHECK-NEXT: movl (%rax), %eax ; CHECK-NEXT: retq ; Check 'var2' is undefined. diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-dsolocal.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-dsolocal.ll new file mode 100644 --- /dev/null +++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-dsolocal.ll @@ -0,0 +1,23 @@ +; RUN: opt -thinlto-bc -thinlto-split-lto-unit -o %t %s +; RUN: llvm-modextract -b -n 0 -o %t0.bc %t +; RUN: llvm-modextract -b -n 1 -o %t1.bc %t +; RUN: llvm-dis -o - %t0.bc | FileCheck --check-prefix=M0 %s +; RUN: llvm-dis -o - %t1.bc | FileCheck --check-prefix=M1 %s + +; M0: @default = external constant [1 x i8] +; M0: @hidden = external hidden constant [1 x i8] +; M0: @al = external global [1 x i8] + +; M1: @default = dso_local constant [1 x i8] c"0", !type !0 +; M1: @hidden = hidden constant [1 x i8] c"0", !type !0 +; M1: @al = dso_local alias [1 x i8], [1 x i8]* @default +@default = dso_local constant [1 x i8] c"0", !type !0 +@hidden = dso_local hidden constant [1 x i8] c"0", !type !0 + +@al = dso_local alias [1 x i8], [1 x i8]* @default + +define [1 x i8]* @f_default() { ret [1 x i8]* @default } +define [1 x i8]* @f_hidden() { ret [1 x i8]* @hidden } +define [1 x i8]* @f_al() { ret [1 x i8]* @al } + +!0 = !{i32 0, !"typeid"}