aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Analysis/UninitializedValues.cpp2
-rw-r--r--test/Analysis/uninit-vals.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp
index 25a5ecb483..3edf04ddb6 100644
--- a/lib/Analysis/UninitializedValues.cpp
+++ b/lib/Analysis/UninitializedValues.cpp
@@ -223,7 +223,7 @@ bool TransferFuncs::BlockStmt_VisitExpr(Expr* E) {
//===----------------------------------------------------------------------===//
namespace {
- typedef ExprDeclBitVector_Types::Union Merge;
+ typedef ExprDeclBitVector_Types::Intersect Merge;
typedef DataflowSolver<UninitializedValues,TransferFuncs,Merge> Solver;
}
diff --git a/test/Analysis/uninit-vals.c b/test/Analysis/uninit-vals.c
index 041c946fb0..fa6d0fc481 100644
--- a/test/Analysis/uninit-vals.c
+++ b/test/Analysis/uninit-vals.c
@@ -20,7 +20,7 @@ int f3(int x) {
int f4(int x) {
int y;
if (x) y = 1;
- return y; // no-warning
+ return y; // expected-warning {{use of uninitialized variable}}
}
int f5() {