diff options
| -rw-r--r-- | include/clang/Parse/Scope.h | 6 | ||||
| -rw-r--r-- | lib/Parse/ParseStmt.cpp | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/include/clang/Parse/Scope.h b/include/clang/Parse/Scope.h index 023f40d395..f4f0cb7206 100644 --- a/include/clang/Parse/Scope.h +++ b/include/clang/Parse/Scope.h @@ -72,11 +72,7 @@ public: /// ObjCMethodScope - This scope corresponds to an Objective-C method body. /// It always has FnScope and DeclScope set as well. - ObjCMethodScope = 0x400, - - /// ElseScope - This scope corresponds to an 'else' scope of an if/then/else - /// statement. - ElseScope = 0x800 + ObjCMethodScope = 0x400 }; private: /// The parent scope for this scope. This is null for the translation-unit diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index baf8488e74..1136be006f 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -667,13 +667,7 @@ Parser::OwningStmtResult Parser::ParseIfStatement(AttributeList *Attr) { ParseScope InnerScope(this, Scope::DeclScope, C99orCXX && Tok.isNot(tok::l_brace)); - // Regardless of whether or not InnerScope actually pushed a scope, set the - // ElseScope flag for the innermost scope so we can diagnose use of the if - // condition variable in C++. - unsigned OldFlags = getCurScope()->getFlags(); - getCurScope()->setFlags(OldFlags | Scope::ElseScope); ElseStmt = ParseStatement(); - getCurScope()->setFlags(OldFlags); // Pop the 'else' scope if needed. InnerScope.Exit(); |