Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-24 01:58:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a nasty C99 scope issue that Neil pointed out (for ifs)

Browse Source 
This fixes test/Parser/control-scope.c

llvm-svn: 41263
This commit is contained in:
Chris Lattner 2007-08-22 05:16:28 +00:00
parent 8a63218855
commit 37e54f454a
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/Parse/ParseStmt.cpp
View File

@ -433,6 +433,10 @@ Parser::StmtResult Parser::ParseIfStatement() {
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 @@ Parser::StmtResult Parser::ParseIfStatement() {
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);

8
clang/test/Parser/control-scope.c Normal file
View File

@ -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;
}