Previously when emitting a C++ guarded initializer, we tried to work out what the enclosing function would be used for and added it to the COMDAT containing the variable if we thought that doing so would be correct. But this was done from a context in which we didn't -- and realistically couldn't -- correctly infer how the enclosing function would be used. Instead, add the initialization function to a COMDAT from the code that creates it, in the case where it makes sense to do so: when we know that the one and only reference to the initialization function is in @llvm.global.ctors and that reference is in the same COMDAT. Reviewed By: rjmccall Differential Revision: https://reviews.llvm.org/D108680
27 lines
1.1 KiB
C++
27 lines
1.1 KiB
C++
// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -triple x86_64-linux-gnu | FileCheck %s
|
|
|
|
// PR48030
|
|
|
|
template<typename T> struct TLS { static thread_local T *mData; };
|
|
inline decltype(nullptr) non_constant_initializer() { return nullptr; }
|
|
template<typename T> thread_local T *TLS<T>::mData = non_constant_initializer();
|
|
struct S {};
|
|
S *current() { return TLS<S>::mData; };
|
|
|
|
// CHECK-DAG: @_ZN3TLSI1SE5mDataE = linkonce_odr thread_local global {{.*}}, comdat,
|
|
// CHECK-DAG: @_ZGVN3TLSI1SE5mDataE = linkonce_odr thread_local global {{.*}}, comdat($_ZN3TLSI1SE5mDataE),
|
|
// CHECK-DAG: @_ZTHN3TLSI1SE5mDataE = linkonce_odr alias {{.*}} @__cxx_global_var_init
|
|
|
|
// CHECK-LABEL: define {{.*}} @_Z7currentv()
|
|
// CHECK: call {{.*}} @_ZTWN3TLSI1SE5mDataE()
|
|
|
|
// CHECK-LABEL: define weak_odr hidden {{.*}} @_ZTWN3TLSI1SE5mDataE() {{.*}} comdat {
|
|
// CHECK: call void @_ZTHN3TLSI1SE5mDataE()
|
|
// CHECK: ret {{.*}} @_ZN3TLSI1SE5mDataE
|
|
|
|
// Unlike for a global, the global initialization function must not be in a
|
|
// COMDAT with the variable, because it is referenced from the _ZTH function
|
|
// which is outside that COMDAT.
|
|
//
|
|
// CHECK-NOT: define {{.*}} @__cxx_global_var_init{{.*}}comdat
|