diff options
Diffstat (limited to 'clang/lib/Sema/IdentifierResolver.cpp')
| -rw-r--r-- | clang/lib/Sema/IdentifierResolver.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Sema/IdentifierResolver.cpp b/clang/lib/Sema/IdentifierResolver.cpp index 773cef65dcbd..2213c3c83724 100644 --- a/clang/lib/Sema/IdentifierResolver.cpp +++ b/clang/lib/Sema/IdentifierResolver.cpp @@ -60,6 +60,9 @@ public: } } + IdDeclInfoMap(const IdDeclInfoMap &) = delete; + IdDeclInfoMap &operator=(const IdDeclInfoMap &) = delete; + /// Returns the IdDeclInfo associated to the DeclarationName. /// It creates a new IdDeclInfo if one was not created before for this id. IdDeclInfo &operator[](DeclarationName Name); @@ -106,7 +109,9 @@ bool IdentifierResolver::isDeclInScope(Decl *D, DeclContext *Ctx, Scope *S, return false; if (Ctx->isFunctionOrMethod() || (S && S->isFunctionPrototypeScope())) { // Ignore the scopes associated within transparent declaration contexts. - while (S->getEntity() && S->getEntity()->isTransparentContext()) + while (S->getEntity() && + (S->getEntity()->isTransparentContext() || + (!LangOpt.CPlusPlus && isa<RecordDecl>(S->getEntity())))) S = S->getParent(); if (S->isDeclScope(D)) |