commit a83b407c511f7670bda5cad3b3c4dcc56f91f549
author Ted Kremenek <kremenek@apple.com> Sat Jan 19 04:33:14 2013 +0000
committer Ted Kremenek <kremenek@apple.com> Sat Jan 19 04:33:14 2013 +0000
tree c53fa2cb8c4a6cf473a0f7a754a8dd790c28d834
parent 4c781fd78a6477cb648ddff5f81cee9decf04950

Reapply r172878 with test case.

llvm-svn: 172888

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 29d3176..dbdbc3d 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -6685,9 +6685,15 @@
     void HandleDeclRefExpr(DeclRefExpr *DRE) {
       Decl* ReferenceDecl = DRE->getDecl();
       if (OrigDecl != ReferenceDecl) return;
-      unsigned diag = isReferenceType
-          ? diag::warn_uninit_self_reference_in_reference_init
-          : diag::warn_uninit_self_reference_in_init;
+      unsigned diag;
+      if (isReferenceType) {
+        diag = diag::warn_uninit_self_reference_in_reference_init;
+      } else if (cast<VarDecl>(OrigDecl)->isStaticLocal()) {
+        diag = diag::warn_static_self_reference_in_init;
+      } else {
+        diag = diag::warn_uninit_self_reference_in_init;
+      }
+
       S.DiagRuntimeBehavior(DRE->getLocStart(), DRE,
                             S.PDiag(diag)
                               << DRE->getNameInfo().getName()