diff options
| -rw-r--r-- | clang/lib/AST/Decl.cpp | 9 | ||||
| -rw-r--r-- | clang/test/SemaCXX/declspec-thread.cpp | 17 |
2 files changed, 21 insertions, 5 deletions
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp index 5d5ef96cfd2..550810367d9 100644 --- a/clang/lib/AST/Decl.cpp +++ b/clang/lib/AST/Decl.cpp @@ -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; diff --git a/clang/test/SemaCXX/declspec-thread.cpp b/clang/test/SemaCXX/declspec-thread.cpp index 0ace9a65a4c..04537cc30ec 100644 --- a/clang/test/SemaCXX/declspec-thread.cpp +++ b/clang/test/SemaCXX/declspec-thread.cpp @@ -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; |
