commit 211b4a2b2260ba5a3150f2b8d47f569e9773b1d3
author Fariborz Jahanian <fjahanian@apple.com> Tue Jul 23 23:55:55 2013 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Tue Jul 23 23:55:55 2013 +0000
tree 70a4e7c272bda6bcb023a8659cc74f8823fe1ccc
parent 26cf046ff3a2d24ff3e2c3757599976b644a06da

ObjectiveC migration: more migration to
instancetype of NSDictionary methods.


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

lib/ARCMigrate/ObjCMT.cpp

diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index 9048e54..5d53830 100644
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -557,8 +557,14 @@
   if (OIT_Family == OIT_None)
     return;
   // TODO. Many more to come
-  if (OIT_Family != OIT_Array)
-    return;
+  switch (OIT_Family) {
+    case OIT_Array:
+      break;
+    case OIT_Dictionary:
+      break;
+    default:
+      return;
+  }
   if (!OM->getResultType()->isObjCIdType())
     return;
   
@@ -569,7 +575,14 @@
     else if (ObjCImplDecl *ImpDecl = dyn_cast<ObjCImplDecl>(CDecl))
       IDecl = ImpDecl->getClassInterface();
   }
-  if (!IDecl || !IDecl->lookupInheritedClass(&Ctx.Idents.get("NSArray")))
+  if (!IDecl)
+    return;
+  
+  if (OIT_Family ==  OIT_Array &&
+      !IDecl->lookupInheritedClass(&Ctx.Idents.get("NSArray")))
+    return;
+  else if (OIT_Family == OIT_Dictionary &&
+           !IDecl->lookupInheritedClass(&Ctx.Idents.get("NSDictionary")))
     return;
   
   TypeSourceInfo *TSInfo =  OM->getResultTypeSourceInfo();

test/ARCMT/objcmt-instancetype.m.result

diff --git a/test/ARCMT/objcmt-instancetype.m.result b/test/ARCMT/objcmt-instancetype.m.result
index 00b875f..3b3ee8b 100644
--- a/test/ARCMT/objcmt-instancetype.m.result
+++ b/test/ARCMT/objcmt-instancetype.m.result
@@ -44,12 +44,12 @@
 @end
 
 @interface NSDictionary (NSDictionaryCreation)
-+ (id)dictionary;
-+ (id)dictionaryWithObject:(id)object forKey:(id)key;
-+ (id)dictionaryWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt;
-+ (id)dictionaryWithObjectsAndKeys:(id)firstObject, ...;
-+ (id)dictionaryWithDictionary:(NSDictionary *)dict;
-+ (id)dictionaryWithObjects:(NSArray *)objects forKeys:(NSArray *)keys;
++ (instancetype)dictionary;
++ (instancetype)dictionaryWithObject:(id)object forKey:(id)key;
++ (instancetype)dictionaryWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt;
++ (instancetype)dictionaryWithObjectsAndKeys:(id)firstObject, ...;
++ (instancetype)dictionaryWithDictionary:(NSDictionary *)dict;
++ (instancetype)dictionaryWithObjects:(NSArray *)objects forKeys:(NSArray *)keys;
 
 - (id)initWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt;
 - (id)initWithObjectsAndKeys:(id)firstObject, ...;