diff --git a/Parse/ParseStmt.cpp b/Parse/ParseStmt.cpp
index 6784f16..f96da44 100644
--- a/Parse/ParseStmt.cpp
+++ b/Parse/ParseStmt.cpp
@@ -433,6 +433,10 @@
     return true;
   }
   
+  // In C99, the body of the if statement is a scope, even if there is no
+  // compound stmt.
+  if (getLang().C99) EnterScope(0);
+  
   // Read the if condition.
   StmtResult CondStmt = ParseStatement();
 
@@ -440,13 +444,23 @@
   if (CondStmt.isInvalid)
     CondStmt = Actions.ParseNullStmt(Tok.getLocation());
   
+  // Pop the 'if' scope if needed.
+  if (getLang().C99) ExitScope();
   
   // If it has an else, parse it.
   SourceLocation ElseLoc;
   StmtResult ElseStmt(false);
   if (Tok.getKind() == tok::kw_else) {
     ElseLoc = ConsumeToken();
+    
+    // In C99, the body of the if statement is a scope, even if there is no
+    // compound stmt.
+    if (getLang().C99) EnterScope(0);
+    
     ElseStmt = ParseStatement();
+
+    // Pop the 'else' scope if needed.
+    if (getLang().C99) ExitScope();
     
     if (ElseStmt.isInvalid)
       ElseStmt = Actions.ParseNullStmt(ElseLoc);
diff --git a/test/Parser/control-scope.c b/test/Parser/control-scope.c
new file mode 100644
index 0000000..62f79db
--- /dev/null
+++ b/test/Parser/control-scope.c
@@ -0,0 +1,8 @@
+// RUN: not clang %s -std=c90
+// RUN: clang %s -std=c99
+
+int f (int z) { 
+  if (z + sizeof (enum {a})) 
+    return 1 + sizeof (enum {a}); 
+  return 0; 
+}