Skip to content

Commit 75cb304

Browse files
committed
[TargetLowering] Fix the problem of emulated-TLS implementation without checking alias of current global value at first.
For a __thread variable x, when emulated TLS is enabled and there is an access to x, the compiler first looks up the symbol __emutls_v.x within the module. However, the issue arises with an alias y of x, the compiler still tries to look up __emutls_v.y instead of __emutls_v.x. As a result, the lookup returns a nullptr, causing the compiler to crash. The purpose of this MR (Merge Request) is to ensure that in emulated TLS, before checking __emutls_v.y, the compiler first identifies which global value y is an alias of.
1 parent 26ca782 commit 75cb304

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10225,10 +10225,13 @@ SDValue TargetLowering::LowerToTLSEmulatedModel(const GlobalAddressSDNode *GA,
1022510225

1022610226
ArgListTy Args;
1022710227
ArgListEntry Entry;
10228-
std::string NameString = ("__emutls_v." + GA->getGlobal()->getName()).str();
10229-
Module *VariableModule = const_cast<Module*>(GA->getGlobal()->getParent());
10228+
const GlobalValue *GV =
10229+
cast<GlobalValue>(GA->getGlobal()->stripPointerCastsAndAliases());
10230+
SmallString<32> NameString("__emutls_v.");
10231+
NameString += GV->getName();
1023010232
StringRef EmuTlsVarName(NameString);
10231-
GlobalVariable *EmuTlsVar = VariableModule->getNamedGlobal(EmuTlsVarName);
10233+
const GlobalVariable *EmuTlsVar =
10234+
GV->getParent()->getNamedGlobal(EmuTlsVarName);
1023210235
assert(EmuTlsVar && "Cannot find EmuTlsVar ");
1023310236
Entry.Node = DAG.getGlobalAddress(EmuTlsVar, dl, PtrVT);
1023410237
Entry.Ty = VoidPtrType;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
; RUN: llc < %s -emulated-tls -mtriple=aarch64-linux-ohos \
2+
; RUN: | FileCheck -check-prefix=EMUTLS_CHECK %s
3+
4+
%struct.__res_state = type { [5 x i8] }
5+
6+
@foo = dso_local thread_local global %struct.__res_state { [5 x i8] c"\01\02\03\04\05" }, align 1
7+
8+
@bar = hidden thread_local(initialexec) alias %struct.__res_state, ptr @foo
9+
10+
define dso_local i32 @main() {
11+
%1 = alloca i32, align 4
12+
store i32 0, ptr %1, align 4
13+
store i8 0, ptr @bar, align 1
14+
; EMUTLS_CHECK: adrp x0, __emutls_v.foo
15+
; EMUTLS_CHECK-NEXT: add x0, x0, :lo12:__emutls_v.foo
16+
ret i32 0
17+
}

0 commit comments

Comments
 (0)