maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't elide the use of the thread wrapper for a thread_local constinit 

variable with non-trivial destruction.

We still need to invoke the thread wrapper to trigger registration of
the destructor call on thread shutdown.

llvm-svn: 373289
This commit is contained in:
Richard Smith 2019-10-01 01:23:23 +00:00
parent 54167ea316
commit 8ac5c746fc
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/CodeGen/ItaniumCXXABI.cpp
View File

@ -360,7 +360,8 @@ public:
} }
bool usesThreadWrapperFunction(const VarDecl *VD) const override { bool usesThreadWrapperFunction(const VarDecl *VD) const override {
return !isEmittedWithConstantInitializer(VD); return !isEmittedWithConstantInitializer(VD) ||
VD->needsDestruction(getContext());
} }
LValue EmitThreadLocalVarDeclLValue(CodeGenFunction &CGF, const VarDecl *VD, LValue EmitThreadLocalVarDeclLValue(CodeGenFunction &CGF, const VarDecl *VD,
QualType LValType) override; QualType LValType) override;
@ -2606,7 +2607,7 @@ void ItaniumCXXABI::EmitThreadLocalInitFuncs(
llvm::GlobalValue *Init = nullptr; llvm::GlobalValue *Init = nullptr;
bool InitIsInitFunc = false; bool InitIsInitFunc = false;
bool HasConstantInitialization = false; bool HasConstantInitialization = false;
if (isEmittedWithConstantInitializer(VD)) { if (!usesThreadWrapperFunction(VD)) {
HasConstantInitialization = true; HasConstantInitialization = true;
} else if (VD->hasDefinition()) { } else if (VD->hasDefinition()) {
InitIsInitFunc = true; InitIsInitFunc = true;

32
clang/test/CodeGenCXX/cxx2a-thread-local-constinit.cpp
View File

@ -33,11 +33,6 @@ extern thread_local int c;
// CHECK: } // CHECK: }
int h() { return c; } int h() { return c; }
thread_local int c = 0;
int d_init();
thread_local int d = d_init();
// Note: use of 'c' does not trigger initialization of 'd', because 'c' has a // Note: use of 'c' does not trigger initialization of 'd', because 'c' has a
// constant initializer. // constant initializer.
// CHECK-LABEL: define weak_odr {{.*}} @_ZTW1c() // CHECK-LABEL: define weak_odr {{.*}} @_ZTW1c()
@ -45,3 +40,30 @@ thread_local int d = d_init();
// CHECK-NOT: call // CHECK-NOT: call
// CHECK: ret i32* @c // CHECK: ret i32* @c
// CHECK: } // CHECK: }
thread_local int c = 0;
int d_init();
// CHECK: define {{.*}}[[D_INIT:@__cxx_global_var_init[^(]*]](
// CHECK: call {{.*}} @_Z6d_initv()
thread_local int d = d_init();
struct Destructed {
int n;
~Destructed();
};
extern thread_local constinit Destructed e;
// CHECK-LABEL: define i32 @_Z1iv()
// CHECK: call {{.*}}* @_ZTW1e()
// CHECK: }
int i() { return e.n; }
// CHECK: define {{.*}}[[E2_INIT:@__cxx_global_var_init[^(]*]](
// CHECK: call {{.*}} @__cxa_thread_atexit({{.*}} @_ZN10DestructedD1Ev {{.*}} @e2
thread_local constinit Destructed e2;
// CHECK-LABEL: define {{.*}}__tls_init
// CHECK: call {{.*}} [[D_INIT]]
// CHECK: call {{.*}} [[E2_INIT]]