Skip to content

Commit

Permalink
ThinLTOBitcodeWriter: drop dso_local when a GlobalVariable is convert…
Browse files Browse the repository at this point in the history
…ed to a declaration

If we infer the dso_local flag for -fpic, dso_local should be dropped
when we convert a GlobalVariable a declaration. dso_local causes the
generation of direct access (e.g. R_X86_64_PC32). Such relocations referencing
STB_GLOBAL STV_DEFAULT objects are not allowed in a -shared link.

Reviewed By: tejohnson

Differential Revision: https://reviews.llvm.org/D74749
  • Loading branch information
MaskRay committed Mar 6, 2020
1 parent 71e2ca6 commit 952ee0d
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
2 changes: 2 additions & 0 deletions llvm/lib/Transforms/IPO/FunctionImport.cpp
Expand Up @@ -992,6 +992,8 @@ bool llvm::convertToDeclaration(GlobalValue &GV) {
GV.replaceAllUsesWith(NewGV);
return false;
}
if (!GV.isImplicitDSOLocal())
GV.setDSOLocal(false);
return true;
}

Expand Down
6 changes: 4 additions & 2 deletions llvm/test/LTO/Resolution/X86/not-prevailing-variables.ll
Expand Up @@ -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: <testVar1>:
; CHECK-NEXT: movl $10, %eax
; CHECK-NEXT: retq
; CHECK: <testVar2>:
; 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.
Expand Down
23 changes: 23 additions & 0 deletions 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"}

0 comments on commit 952ee0d

Please sign in to comment.