diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp
index 57dfab3..fbfa46c 100644
--- a/lib/Analysis/UninitializedValues.cpp
+++ b/lib/Analysis/UninitializedValues.cpp
@@ -625,6 +625,18 @@
           // the use of the uninitialized value (which visiting the
           // initializer).
           vals[vd] = Initialized;
+        } else {
+          // No initializer: the variable is now uninitialized. This matters
+          // for cases like:
+          //   while (...) {
+          //     int n;
+          //     use(n);
+          //     n = 0;
+          //   }
+          // FIXME: Mark the variable as uninitialized whenever its scope is
+          // left, since its scope could be re-entered by a jump over the
+          // declaration.
+          vals[vd] = Uninitialized;
         }
       }
     }
diff --git a/test/Sema/uninit-variables.c b/test/Sema/uninit-variables.c
index ef03d44..180d60c 100644
--- a/test/Sema/uninit-variables.c
+++ b/test/Sema/uninit-variables.c
@@ -437,3 +437,28 @@
   int c;  // expected-note {{initialize the variable 'c' to silence this warning}}
   ASSIGN(int, c, d);  // expected-warning {{variable 'c' is uninitialized when used here}}
 }
+
+void uninit_in_loop() {
+  int produce(void);
+  void consume(int);
+  for (int n = 0; n < 100; ++n) {
+    int k; // expected-note {{initialize}}
+    consume(k); // expected-warning {{variable 'k' is uninitialized}}
+    k = produce();
+  }
+}
+
+void uninit_in_loop_goto() {
+  int produce(void);
+  void consume(int);
+  for (int n = 0; n < 100; ++n) {
+    goto skip_decl;
+    int k; // expected-note {{initialize}}
+skip_decl:
+    // FIXME: This should produce the 'is uninitialized' diagnostic, but we
+    // don't have enough information in the CFG to easily tell that the
+    // variable's scope has been left and re-entered.
+    consume(k); // expected-warning {{variable 'k' may be uninitialized}}
+    k = produce();
+  }
+}