-Wuninitialized: don't issue fixit for initializer if a variable declaration already has an initializer.

llvm-svn: 128838

2 files changed, 5 insertions, 1 deletions

diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp
index bcbf887916b..75e2c5b8ac1 100644
--- a/clang/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp
@@ -453,6 +453,10 @@ public:
           continue;
       
         fixitIssued = true;
+        
+        // Don't issue a fixit if there is already an initializer.
+        if (vd->getInit())
+          continue;
 
         // Suggest possible initialization (if any).
         const char *initialization = 0;
diff --git a/clang/test/Sema/uninit-variables.c b/clang/test/Sema/uninit-variables.c
index 17bd07f3e55..3ddd097c8f2 100644
--- a/clang/test/Sema/uninit-variables.c
+++ b/clang/test/Sema/uninit-variables.c
@@ -92,7 +92,7 @@ void test14() {
 }
 
 void test15() {
-  int x = x; // expected-warning{{variable 'x' is possibly uninitialized when used here}} expected-note{{variable 'x' is declared here}} expected-note{{add initialization to silence this warning}}
+  int x = x; // expected-warning{{variable 'x' is possibly uninitialized when used here}} expected-note{{variable 'x' is declared here}}
 }
 
 // Don't warn in the following example; shows dataflow confluence.