1 files changed, 10 insertions, 2 deletions
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 3ced0eff4c..5d30795abd 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -379,8 +379,16 @@ SourceLocation Decl::getBodyRBrace() const {
 
 #ifndef NDEBUG
 void Decl::CheckAccessDeclContext() const {
-  assert((Access != AS_none || isa<TranslationUnitDecl>(this) ||
-          !isa<CXXRecordDecl>(getDeclContext())) &&
+  if (isa<TranslationUnitDecl>(this) ||
+      !isa<CXXRecordDecl>(getDeclContext()))
+    return;
+  
+  // FIXME: Should friend declarations have access specifiers?
+  if (isa<FriendDecl>(this) ||
+      getFriendObjectKind() != FOK_None)
+    return;
+  
+  assert(Access != AS_none &&
          "Access specifier is AS_none inside a record decl");
 }