commit 4013404eff6d39ee69f79c0dd0fade8e4ca944a3
author Anders Carlsson <andersca@mac.com> Fri Sep 03 01:11:38 2010 +0000
committer Anders Carlsson <andersca@mac.com> Fri Sep 03 01:11:38 2010 +0000
tree ee151a12cf0d007f81f151ac7b845d9026bdbc77
parent ba8752aac8e1e59f6bcbb63ccb7fb8f993a19021

Static local variables don't result in global constructors being emitted.

llvm-svn: 112933

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 4b11689..9c10b85 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -4280,7 +4280,7 @@
   if (getLangOptions().CPlusPlus) {
     if (!VDecl->isInvalidDecl() &&
         !VDecl->getDeclContext()->isDependentContext() &&
-        VDecl->hasGlobalStorage() &&
+        VDecl->hasGlobalStorage() && !VDecl->isStaticLocal() &&
         !Init->isConstantInitializer(Context,
                                      VDecl->getType()->isReferenceType()))
       Diag(VDecl->getLocation(), diag::warn_global_constructor)
@@ -4492,7 +4492,7 @@
         Var->setInit(MaybeCreateCXXExprWithTemporaries(Init.takeAs<Expr>()));
 
         if (getLangOptions().CPlusPlus && !Var->isInvalidDecl() && 
-            Var->hasGlobalStorage() &&
+            Var->hasGlobalStorage() && !Var->isStaticLocal() &&
             !Var->getDeclContext()->isDependentContext() &&
             !Var->getInit()->isConstantInitializer(Context, false))
           Diag(Var->getLocation(), diag::warn_global_constructor);