replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MS ABI] __declspec(thread) behaves like thread_local in MSVC 2015 

MSVC 2015 changed __declspec(thread) to make it behave like C++11's
thread_local keyword instead of acting similarly to __thread.

llvm-svn: 237337
This commit is contained in:
David Majnemer 2015-05-14 05:19:23 +00:00
parent dd0bed1b2d
commit 1b5baffd73
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/AST/Decl.cpp
View File

@ -1795,9 +1795,12 @@ void VarDecl::setStorageClass(StorageClass SC) {
VarDecl::TLSKind VarDecl::getTLSKind() const {
switch (VarDeclBits.TSCSpec) {
case TSCS_unspecified:
if (hasAttr<ThreadAttr>())
return TLS_Static;
return TLS_None;
if (!hasAttr<ThreadAttr>())
return TLS_None;
return getASTContext().getLangOpts().isCompatibleWithMSVC(
LangOptions::MSVC2015)
? TLS_Dynamic
: TLS_Static;
case TSCS___thread: // Fall through.
case TSCS__Thread_local:
return TLS_Static;

17
clang/test/SemaCXX/declspec-thread.cpp
View File

@ -1,17 +1,30 @@
// RUN: %clang_cc1 -triple i686-pc-win32 -std=c++11 -fms-extensions -verify %s
// RUN: %clang_cc1 -triple i686-pc-win32 -std=c++11 -fms-extensions -fms-compatibility-version=18.00 -verify %s
// RUN: %clang_cc1 -triple i686-pc-win32 -std=c++11 -fms-extensions -fms-compatibility-version=19.00 -verify %s
__thread __declspec(thread) int a; // expected-error {{already has a thread-local storage specifier}}
__declspec(thread) __thread int b; // expected-error {{already has a thread-local storage specifier}}
__declspec(thread) int c(); // expected-warning {{only applies to variables}}
__declspec(thread) int d;
int foo();
#if _MSC_VER >= 1900
__declspec(thread) int e = foo();
#else
__declspec(thread) int e = foo(); // expected-error {{must be a constant expression}} expected-note {{thread_local}}
#endif
struct HasCtor { HasCtor(); int x; };
#if _MSC_VER >= 1900
__declspec(thread) HasCtor f;
#else
__declspec(thread) HasCtor f; // expected-error {{must be a constant expression}} expected-note {{thread_local}}
#endif
struct HasDtor { ~HasDtor(); int x; };
__declspec(thread) HasDtor g; // expected-error {{non-trivial destruction}} expected-note {{thread_local}}
#if _MSC_VER >= 1900
__declspec(thread) HasDtor g;
#else
__declspec(thread) HasCtor f; // expected-error {{must be a constant expression}} expected-note {{thread_local}}
#endif
struct HasDefaultedDefaultCtor {
HasDefaultedDefaultCtor() = default;