commit 7556853c60f3e2a3f43864d8ebe74ba5ac11e68e
author Fariborz Jahanian <fjahanian@apple.com> Fri Jul 12 22:32:19 2013 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Fri Jul 12 22:32:19 2013 +0000
tree 8c7c785a747d8ea501e1653418e328449156c1c3
parent c250192494e0fa63be50269d2c1eb7786f8ab7a0

ObjC migrator: early work for migrating implicitly conforming
protocols to classes. This is wip.


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

lib/ARCMigrate/ObjCMT.cpp

diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index a19f023..b170e08 100644
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -33,6 +33,8 @@
 class ObjCMigrateASTConsumer : public ASTConsumer {
   void migrateDecl(Decl *D);
   void migrateObjCInterfaceDecl(ASTContext &Ctx, ObjCInterfaceDecl *D);
+  void migrateProtocolConformance(ASTContext &Ctx,
+                                  const ObjCImplementationDecl *ImpDecl);
 
 public:
   std::string MigrateDir;
@@ -46,7 +48,8 @@
   const PPConditionalDirectiveRecord *PPRec;
   Preprocessor &PP;
   bool IsOutputFile;
-
+  llvm::SmallPtrSet<ObjCProtocolDecl *, 32> ObjCProtocolDecls;
+  
   ObjCMigrateASTConsumer(StringRef migrateDir,
                          bool migrateLiterals,
                          bool migrateSubscripting,
@@ -232,6 +235,27 @@
   }
 }
 
+void ObjCMigrateASTConsumer::migrateProtocolConformance(ASTContext &Ctx,
+                                            const ObjCImplementationDecl *ImpDecl) {
+  const ObjCInterfaceDecl *IDecl = ImpDecl->getClassInterface();
+  if (!IDecl || ObjCProtocolDecls.empty())
+    return;
+  // Find all implicit conforming protocols for this class
+  // and make them explicit.
+  llvm::SmallPtrSet<ObjCProtocolDecl *, 8> ExplicitProtocols;
+  Ctx.CollectInheritedProtocols(IDecl, ExplicitProtocols);
+  llvm::SmallPtrSet<ObjCProtocolDecl *, 8> PotentialImplicitProtocols;
+  
+  for (llvm::SmallPtrSet<ObjCProtocolDecl*,32>::iterator I =
+       ObjCProtocolDecls.begin(),
+       E = ObjCProtocolDecls.end(); I != E; ++I)
+    if (!ExplicitProtocols.count(*I))
+      PotentialImplicitProtocols.insert(*I);
+  
+  if (PotentialImplicitProtocols.empty())
+    return;
+}
+
 namespace {
 
 class RewritesReceiver : public edit::EditsReceiver {
@@ -258,6 +282,11 @@
          D != DEnd; ++D) {
       if (ObjCInterfaceDecl *CDecl = dyn_cast<ObjCInterfaceDecl>(*D))
         migrateObjCInterfaceDecl(Ctx, CDecl);
+      else if (ObjCProtocolDecl *PDecl = dyn_cast<ObjCProtocolDecl>(*D))
+        ObjCProtocolDecls.insert(PDecl);
+      else if (const ObjCImplementationDecl *ImpDecl =
+               dyn_cast<ObjCImplementationDecl>(*D))
+        migrateProtocolConformance(Ctx, ImpDecl);
     }
   
   Rewriter rewriter(Ctx.getSourceManager(), Ctx.getLangOpts());