diff options
| -rw-r--r-- | include/clang/Parse/Parser.h | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaCXXScopeSpec.cpp | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h index 18f61e793c..bebc874b62 100644 --- a/include/clang/Parse/Parser.h +++ b/include/clang/Parse/Parser.h @@ -1089,7 +1089,8 @@ private: assert(!EnteredScope && "Already entered the scope!"); assert(SS.isSet() && "C++ scope was not set!"); P.Actions.ActOnCXXEnterDeclaratorScope(P.CurScope, SS); - EnteredScope = true; + if (!SS.isInvalid()) + EnteredScope = true; } ~DeclaratorScopeObj() { diff --git a/lib/Sema/SemaCXXScopeSpec.cpp b/lib/Sema/SemaCXXScopeSpec.cpp index a14bcd5287..aad6e6d68c 100644 --- a/lib/Sema/SemaCXXScopeSpec.cpp +++ b/lib/Sema/SemaCXXScopeSpec.cpp @@ -286,7 +286,10 @@ Sema::CXXScopeTy *Sema::ActOnCXXNestedNameSpecifier(Scope *S, /// The 'SS' should be a non-empty valid CXXScopeSpec. void Sema::ActOnCXXEnterDeclaratorScope(Scope *S, const CXXScopeSpec &SS) { assert(SS.isSet() && "Parser passed invalid CXXScopeSpec."); - EnterDeclaratorContext(S, computeDeclContext(SS)); + if (DeclContext *DC = computeDeclContext(SS)) + EnterDeclaratorContext(S, DC); + else + const_cast<CXXScopeSpec&>(SS).setScopeRep(0); } /// ActOnCXXExitDeclaratorScope - Called when a declarator that previously @@ -296,6 +299,8 @@ void Sema::ActOnCXXEnterDeclaratorScope(Scope *S, const CXXScopeSpec &SS) { /// defining scope. void Sema::ActOnCXXExitDeclaratorScope(Scope *S, const CXXScopeSpec &SS) { assert(SS.isSet() && "Parser passed invalid CXXScopeSpec."); - assert(S->getEntity() == computeDeclContext(SS) && "Context imbalance!"); - ExitDeclaratorContext(S); + assert((SS.isInvalid() || S->getEntity() == computeDeclContext(SS)) && + "Context imbalance!"); + if (!SS.isInvalid()) + ExitDeclaratorContext(S); } |