diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp
index 25a5ecb..3edf04d 100644
--- a/lib/Analysis/UninitializedValues.cpp
+++ b/lib/Analysis/UninitializedValues.cpp
@@ -223,7 +223,7 @@
 //===----------------------------------------------------------------------===//      
 
 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 041c946..fa6d0fc 100644
--- a/test/Analysis/uninit-vals.c
+++ b/test/Analysis/uninit-vals.c
@@ -20,7 +20,7 @@
 int f4(int x) {
   int y;
   if (x) y = 1;
-  return y; // no-warning
+  return y; // expected-warning {{use of uninitialized variable}}
 }
 
 int f5() {