diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index 3ced0eff4c52..3a010b0cdf50 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -379,8 +379,18 @@ SourceLocation Decl::getBodyRBrace() const {
 
 #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/clang/lib/AST/DeclPrinter.cpp b/clang/lib/AST/DeclPrinter.cpp
index 191d356755f9..275f2db82b52 100644
--- a/clang/lib/AST/DeclPrinter.cpp
+++ b/clang/lib/AST/DeclPrinter.cpp
@@ -202,7 +202,10 @@ void DeclPrinter::VisitDeclContext(DeclContext *DC, bool Indent) {
 
     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;