Fix a nasty C99 scope issue that Neil pointed out (for ifs)
This fixes test/Parser/control-scope.c
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41263 91177308-0d34-0410-b5e6-96231b3b80d8
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);