Add a workaround for decls that come from friend decls pointing to undeclared classes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80438 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 3ced0ef..3a010b0 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -379,8 +379,18 @@
#ifndef NDEBUG
void Decl::CheckAccessDeclContext() const {
- assert((Access != AS_none || isa<TranslationUnitDecl>(this) ||
- !isa<CXXRecordDecl>(getDeclContext())) &&
+ // If the decl is the toplevel translation unit or if we're not in a
+ // record decl context, we don't need to check anything.
+ if (isa<TranslationUnitDecl>(this) ||
+ !isa<CXXRecordDecl>(getDeclContext()))
+ return;
+
+ // FIXME: This check should not be necessary - If a friend decl refers to an
+ // undeclared decl, then that decl shouldn't be in any decl context.
+ if (getFriendObjectKind() == FOK_Undeclared)
+ return;
+
+ assert(Access != AS_none &&
"Access specifier is AS_none inside a record decl");
}
diff --git a/lib/AST/DeclPrinter.cpp b/lib/AST/DeclPrinter.cpp
index 191d356..275f2db 100644
--- a/lib/AST/DeclPrinter.cpp
+++ b/lib/AST/DeclPrinter.cpp
@@ -202,7 +202,10 @@
if (PrintAccess) {
AccessSpecifier AS = D->getAccess();
- if (AS != CurAS) {
+
+ if (AS != CurAS &&
+ // FIXME: This check shouldn't be necessary.
+ D->getFriendObjectKind() == Decl::FOK_Undeclared) {
Print(AS);
Out << ":\n";
CurAS = AS;