ObjectiveC migrator. Don't suggest @property for

methods which look like getters but belong to
known family of methods. // rdar://15044058

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

diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index a82ac97e00a9241d2263bae87230f7fd83e4204c..a9fc171512d2f12f35fc1da61ba59cfa33865a93 100644 (file)
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -772,6 +772,12 @@ bool ObjCMigrateASTConsumer::migrateProperty(ASTContext &Ctx,
     return false;
   
   Selector GetterSelector = Method->getSelector();
+  ObjCInstanceTypeFamily OIT_Family =
+    Selector::getInstTypeMethodFamily(GetterSelector);
+  
+  if (OIT_Family != OIT_None)
+    return false;
+  
   IdentifierInfo *getterName = GetterSelector.getIdentifierInfoForSlot(0);
   Selector SetterSelector =
   SelectorTable::constructSetterSelector(PP.getIdentifierTable(),

diff --git a/test/ARCMT/objcmt-property.m b/test/ARCMT/objcmt-property.m
index 03aaaa0619e824835b40dfaa3fa8bf5f99715820..f27299f148a89dc163c44c8d6265aadd48f04f6a 100644 (file)
--- a/test/ARCMT/objcmt-property.m
+++ b/test/ARCMT/objcmt-property.m
@@ -207,4 +207,7 @@ DEPRECATED
 - (id)method1 ALIGNED NS_AVAILABLE;
 - (void) setMethod1 : (id) object NS_AVAILABLE ALIGNED;
 
+- (NSURL *)init;  // No Change
++ (id)alloc;      // No Change
+
 @end

diff --git a/test/ARCMT/objcmt-property.m.result b/test/ARCMT/objcmt-property.m.result
index ace9c67e48689e63ccd2f108bec1b7ed4a49555e..902dcb39c05d5e589d56c4db8d8ec7ff047023b0 100644 (file)
--- a/test/ARCMT/objcmt-property.m.result
+++ b/test/ARCMT/objcmt-property.m.result
@@ -207,4 +207,7 @@ DEPRECATED
 @property (nonatomic, retain) id method1 ALIGNED NS_AVAILABLE;
 
 
+- (NSURL *)init;  // No Change
++ (id)alloc;      // No Change
+
 @end