Don't emit 'dead initialization' warnings for variables marked 'unused'.

This fixes PR 2573: http://llvm.org/bugs/show_bug.cgi?id=2573

llvm-svn: 54009

1 files changed, 9 insertions, 3 deletions

diff --git a/clang/lib/Analysis/CheckDeadStores.cpp b/clang/lib/Analysis/CheckDeadStores.cpp
index 4ab6680a78d..4acacdf0ce9 100644
--- a/clang/lib/Analysis/CheckDeadStores.cpp
+++ b/clang/lib/Analysis/CheckDeadStores.cpp
@@ -164,11 +164,16 @@ public:
       for (ScopedDecl* SD = DS->getDecl(); SD; SD = SD->getNextDeclarator()) {
         
         VarDecl* V = dyn_cast<VarDecl>(SD);
-        if (!V) continue;
+
+        if (!V)
+          continue;
         
         if (V->hasLocalStorage())
-          if (Expr* E = V->getInit())
-            if (!Live(V, AD)) {
+          if (Expr* E = V->getInit()) {
+            // A dead initialization is a variable that is dead after it
+            // is initialized.  We don't flag warnings for those variables
+            // marked 'unused'.
+            if (!Live(V, AD) && V->getAttr<UnusedAttr>() == 0) {
               // Special case: check for initializations with constants.
               //
               //  e.g. : int x = 0;
@@ -179,6 +184,7 @@ public:
               if (!E->isConstantExpr(Ctx,NULL))
                 Report(V, DeadInit, V->getLocation(), E->getSourceRange());
             }
+          }
       }
   }
 };