commit c217ced5ada5c5723bfca450b37ac046193a8c2f
author Fariborz Jahanian <fjahanian@apple.com> Fri Aug 02 22:34:18 2013 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Fri Aug 02 22:34:18 2013 +0000
tree 2246d9d338e82ce76ac2f8ac2fa64eaa3f0f7f40
parent bd77c59acc58e797756b0fcc6739319587e95d85

ObjectiveC migrator. Differentiate 'instancetype'
from 'id' result type when deciding on migration
to instancetype.


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

lib/ARCMigrate/ObjCMT.cpp

diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index 706a4ec..c8fc312 100644
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -628,7 +628,9 @@
                                                   ObjCContainerDecl *CDecl,
                                                   ObjCMethodDecl *OM,
                                                   ObjCInstanceTypeFamily OIT_Family) {
-  if (OM->isInstanceMethod() || !OM->getResultType()->isObjCIdType())
+  if (OM->isInstanceMethod() ||
+      OM->getResultType() == Ctx.getObjCInstanceType() ||
+      !OM->getResultType()->isObjCIdType())
     return;
   
   // Candidate factory methods are + (id) NaMeXXX : ... which belong to a class