Speculatively revert r110610 " Make ObjCInterfaceDecl redeclarable,

and create separate decl nodes for forward declarations and the
definition," which appears to be causing significant Objective-C
breakage.


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

1 files changed, 3 insertions, 10 deletions

diff --git a/lib/AST/DeclPrinter.cpp b/lib/AST/DeclPrinter.cpp
index d3ebc8f508..fae1e724a1 100644
--- a/lib/AST/DeclPrinter.cpp
+++ b/lib/AST/DeclPrinter.cpp
@@ -727,19 +727,12 @@ void DeclPrinter::VisitObjCImplementationDecl(ObjCImplementationDecl *OID) {
 
 void DeclPrinter::VisitObjCInterfaceDecl(ObjCInterfaceDecl *OID) {
   std::string I = OID->getNameAsString();
-
-  if (OID->isForwardDecl()) {
-    // These shouldn't be directly visited, but in case they are, write them
-    // as an @class declaration.
-    Out << "@class " << I;
-    return;
-  }
-
   ObjCInterfaceDecl *SID = OID->getSuperClass();
 
-  Out << "@interface " << I;
   if (SID)
-    Out << " : " << SID;
+    Out << "@interface " << I << " : " << SID;
+  else
+    Out << "@interface " << I;
 
   // Protocols?
   const ObjCList<ObjCProtocolDecl> &Protocols = OID->getReferencedProtocols();