diff options
Diffstat (limited to 'clang/lib/Parse/ParseStmt.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseStmt.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp index fe884148ebe..f57ff97ceb5 100644 --- a/clang/lib/Parse/ParseStmt.cpp +++ b/clang/lib/Parse/ParseStmt.cpp @@ -1135,9 +1135,6 @@ StmtResult Parser::ParseSwitchStatement(SourceLocation *TrailingElseLoc) { ScopeFlags |= Scope::DeclScope | Scope::ControlScope; ParseScope SwitchScope(this, ScopeFlags); - // Temporarily disable 'break' while parsing condition. - SwitchScope.ClearFlags(Scope::BreakScope); - // Parse the condition. ExprResult Cond; Decl *CondVar = 0; @@ -1160,9 +1157,6 @@ StmtResult Parser::ParseSwitchStatement(SourceLocation *TrailingElseLoc) { return Switch; } - // Enable 'break' in the body of switch statement. - SwitchScope.SetFlags(Scope::BreakScope); - // C99 6.8.4p3 - In C99, the body of the switch statement is a scope, even if // there is no compound stmt. C90 does not have this clause. We only do this // if the body isn't a compound statement to avoid push/pop in common cases. @@ -1233,9 +1227,6 @@ StmtResult Parser::ParseWhileStatement(SourceLocation *TrailingElseLoc) { ScopeFlags = Scope::BreakScope | Scope::ContinueScope; ParseScope WhileScope(this, ScopeFlags); - // Disable 'break' and 'continue' while parsing condition. - WhileScope.ClearFlags(Scope::BreakScope | Scope::ContinueScope); - // Parse the condition. ExprResult Cond; Decl *CondVar = 0; @@ -1244,9 +1235,6 @@ StmtResult Parser::ParseWhileStatement(SourceLocation *TrailingElseLoc) { FullExprArg FullCond(Actions.MakeFullExpr(Cond.get(), WhileLoc)); - // Allow 'break' and 'continue' in the body of the statement. - WhileScope.SetFlags(Scope::BreakScope | Scope::ContinueScope); - // C99 6.8.5p5 - In C99, the body of the if statement is a scope, even if // there is no compound stmt. C90 does not have this clause. We only do this // if the body isn't a compound statement to avoid push/pop in common cases. @@ -1326,9 +1314,6 @@ StmtResult Parser::ParseDoStatement() { return StmtError(); } - // Do not allow 'break' and 'continue' in 'while' condition expression. - DoScope.ClearFlags(Scope::BreakScope | Scope::ContinueScope); - // Parse the parenthesized expression. BalancedDelimiterTracker T(*this, tok::l_paren); T.consumeOpen(); @@ -1406,10 +1391,6 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) { BalancedDelimiterTracker T(*this, tok::l_paren); T.consumeOpen(); - // Until loop body starts, statements 'break' and 'continue' cannot - // be used. - ForScope.ClearFlags(Scope::BreakScope | Scope::ContinueScope); - ExprResult Value; bool ForEach = false, ForRange = false; @@ -1553,10 +1534,6 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) { // Parse the third part of the for specifier. if (Tok.isNot(tok::r_paren)) { // for (...;...;) - // This is needed to compile QT 4.8.4, which uses statement - // expression with 'break' in it. - ForScope.SetFlags(Scope::BreakScope); - ExprResult Third = ParseExpression(); // FIXME: The C++11 standard doesn't actually say that this is a // discarded-value expression, but it clearly should be. @@ -1589,9 +1566,6 @@ StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc) { T.getCloseLocation()); } - // When parsing body of 'for' statement, 'break' and 'continue' may be used. - ForScope.SetFlags(Scope::BreakScope | Scope::ContinueScope); - // C99 6.8.5p5 - In C99, the body of the if statement is a scope, even if // there is no compound stmt. C90 does not have this clause. We only do this // if the body isn't a compound statement to avoid push/pop in common cases. |
