Predicate to detect when a RecordDecl is really the injected-class-name

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67687 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 7 insertions, 0 deletions

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 321ccf34f9..15a20bd050 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -491,6 +491,11 @@ void RecordDecl::Destroy(ASTContext& C) {
   TagDecl::Destroy(C);
 }
 
+bool RecordDecl::isInjectedClassName() const {
+  return isImplicit() && getDeclName() && getDeclContext()->isRecord() && 
+    cast<RecordDecl>(getDeclContext())->getDeclName() == getDeclName();
+}
+
 /// completeDefinition - Notes that the definition of this type is now
 /// complete.
 void RecordDecl::completeDefinition(ASTContext& C) {
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index b76126aa8f..fd89507645 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3398,6 +3398,8 @@ void Sema::ActOnTagStartDefinition(Scope *S, DeclTy *TagD) {
                                 Record->getIdentifier(), Record);
       InjectedClassName->setImplicit();
       PushOnScopeChains(InjectedClassName, S);
+      assert(InjectedClassName->isInjectedClassName() && 
+             "Broken injected-class-name");
     }
   }
 }