tweaked my last patch to 1) preserve the protocol in

extension class's protocol list so its AST is complete.
2) Because of this no need to issue warning on unimplemeted
methods coming from the extended class protocols
because warning is issued when class definition is seen.



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

1 files changed, 1 insertions, 3 deletions

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index e978a5b60f..7f38ac1d9a 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -148,15 +148,13 @@ void ObjCInterfaceDecl::mergeClassExtensionProtocolList(
   }
   if (ProtocolRefs.empty())
     return;
-  
+  // Merge ProtocolRefs into class's protocol list;
   for (protocol_iterator p = protocol_begin(), e = protocol_end();
        p != e; p++)
     ProtocolRefs.push_back(*p);
   ReferencedProtocols.Destroy(C);
   unsigned NumProtoRefs = ProtocolRefs.size();
   setProtocolList((ObjCProtocolDecl**)&ProtocolRefs[0], NumProtoRefs, C);
-  // Merge ProtocolRefs into class's protocol list;
-  
 }
 
 ObjCIvarDecl *ObjCInterfaceDecl::lookupInstanceVariable(IdentifierInfo *ID,