From b21dd02e6122542a421fe8569ee96f144eef535b Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 17 Jul 2012 01:27:33 +0000
Subject: [PATCH] Uninitialized variables: two little changes:  * Treat
 compound assignment as a use, at Jordy's request.  * Always add compound
 assignments into the CFG, so we can correctly diagnose the use in 'return x
 += 1;'

llvm-svn: 160334
---
 clang/lib/Analysis/UninitializedValues.cpp |  4 +++-
 clang/lib/Sema/AnalysisBasedWarnings.cpp   |  1 +
 clang/test/Sema/uninit-variables.c         | 21 +++++++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/clang/lib/Analysis/UninitializedValues.cpp b/clang/lib/Analysis/UninitializedValues.cpp
index 1b37c2999016..acf695a1e9c7 100644
--- a/clang/lib/Analysis/UninitializedValues.cpp
+++ b/clang/lib/Analysis/UninitializedValues.cpp
@@ -447,7 +447,9 @@ void ClassifyRefs::VisitBinaryOperator(BinaryOperator *BO) {
   // when TransferFunctions visits it. A compound-assignment does not affect
   // whether a variable is uninitialized, and there's no point counting it as a
   // use.
-  if (BO->isAssignmentOp())
+  if (BO->isCompoundAssignmentOp())
+    classify(BO->getLHS(), Use);
+  else if (BO->getOpcode() == BO_Assign)
     classify(BO->getLHS(), Ignore);
 }
 
diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp
index d696283f7f51..19a7d6f35c8f 100644
--- a/clang/lib/Sema/AnalysisBasedWarnings.cpp
+++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp
@@ -1220,6 +1220,7 @@ AnalysisBasedWarnings::IssueWarnings(sema::AnalysisBasedWarnings::Policy P,
   else {
     AC.getCFGBuildOptions()
       .setAlwaysAdd(Stmt::BinaryOperatorClass)
+      .setAlwaysAdd(Stmt::CompoundAssignOperatorClass)
       .setAlwaysAdd(Stmt::BlockExprClass)
       .setAlwaysAdd(Stmt::CStyleCastExprClass)
       .setAlwaysAdd(Stmt::DeclRefExprClass)
diff --git a/clang/test/Sema/uninit-variables.c b/clang/test/Sema/uninit-variables.c
index 4e3d74b3eafe..9257751e4717 100644
--- a/clang/test/Sema/uninit-variables.c
+++ b/clang/test/Sema/uninit-variables.c
@@ -33,8 +33,8 @@ int test5() {
 
 int test6() {
   int x; // expected-note{{initialize the variable 'x' to silence this warning}}
-  x += 2;
-  return x; // expected-warning{{variable 'x' is uninitialized when used here}}
+  x += 2; // expected-warning{{variable 'x' is uninitialized when used here}}
+  return x;
 }
 
 int test7(int y) {
@@ -489,12 +489,17 @@ int returns_twice() {
 int compound_assign(int *arr, int n) {
   int sum; // expected-note {{initialize}}
   for (int i = 0; i < n; ++i)
-    sum += arr[i];
-  return sum / n; // expected-warning {{variable 'sum' is uninitialized}}
+    sum += arr[i]; // expected-warning {{variable 'sum' is uninitialized}}
+  return sum / n;
 }
 
-void compound_assign_2(int n) {
-  volatile int ignore;
-  for (int j = 0; j < n; ++j)
-    ignore += test1(); // ok
+int compound_assign_2() {
+  int x; // expected-note {{initialize}}
+  return x += 1; // expected-warning {{variable 'x' is uninitialized}}
+}
+
+int compound_assign_3() {
+  int x; // expected-note {{initialize}}
+  x *= 0; // expected-warning {{variable 'x' is uninitialized}}
+  return x;
 }