Don't emit _ZTW wrappers for TLS variables which don't use the C++ thread_local keyword.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@180004 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index fdd35684722d90e31aee1bad2487d02dbfa26b94..5a10602589fb4a65e981b98acf92ba44bbe4364b 100644 (file)
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1479,7 +1479,8 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName,
     }
 
     if (D->getTLSKind()) {
-      CXXThreadLocals.push_back(std::make_pair(D, GV));
+      if (D->getTLSKind() == VarDecl::TLS_Dynamic)
+        CXXThreadLocals.push_back(std::make_pair(D, GV));
       setTLSMode(GV, *D);
     }
   }

diff --git a/test/CodeGen/thread-specifier.c b/test/CodeGen/thread-specifier.c
index a2d3e62c8c5d9d62a66ab55bb26e4b5cb915bd8d..8e21651cd8854e0c7ba818386e092dbf14e15f55 100644 (file)
--- a/test/CodeGen/thread-specifier.c
+++ b/test/CodeGen/thread-specifier.c
@@ -10,6 +10,9 @@
 // CHECK: @i = thread_local(initialexec) global
 // CHECK: @j = thread_local(localexec) global
 
+// CHECK-NOT: @_ZTW
+// CHECK-NOT: @_ZTH
+
 __thread int a;
 extern __thread int b;
 int c() { return *&b; }