commit 774672e9434cb8d0e54371b7a78d19fa3e1fe5fa
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Apr 15 08:07:34 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Apr 15 08:07:34 2013 +0000
tree 9480e9849961c22e9286cedaa911fbfaffcb8aa3
parent a8f52c8d88eba776470e2612f5b858fe58f3ad9e

Properly check for a constant initializer for a thread-local variable.

llvm-svn: 179516

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 99702be..b943e31 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -7630,7 +7630,8 @@
     else if (VDecl->getTLSKind() == VarDecl::TLS_Static &&
              !VDecl->isInvalidDecl() && !DclT->isDependentType() &&
              !Init->isValueDependent() && !VDecl->isConstexpr() &&
-             !Init->isEvaluatable(Context)) {
+             !Init->isConstantInitializer(
+                 Context, VDecl->getType()->isReferenceType())) {
       // GNU C++98 edits for __thread, [basic.start.init]p4:
       //   An object of thread storage duration shall not require dynamic
       //   initialization.