ObjectiveC migrator: Add support for inferring

properties of function pointer type.
// rdar://15082812

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

diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index dfe123fd3017adc9d1cbab3966f1af9b455df5d5..8d5395ae3cf060021c9c21bfd4175c1251e9cbc7 100644 (file)
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -247,9 +247,12 @@ void MigrateBlockOrFunctionPointerTypeVariable(std::string & PropertyString,
         paren--;
         break;
       case '^':
-        PropertyString += '^';
-        if (paren == 1)
+      case '*':
+        PropertyString += (*argPtr);
+        if (paren == 1) {
           PropertyString += name;
+          name = "";
+        }
         break;
       default:
         PropertyString += *argPtr;

diff --git a/test/ARCMT/objcmt-property.m b/test/ARCMT/objcmt-property.m
index 080e87e1b5c9477fb3c1e161be824d7c90413660..c02d987ba8432f9fd4bdb543fb6ecb89ccc884f0 100644 (file)
--- a/test/ARCMT/objcmt-property.m
+++ b/test/ARCMT/objcmt-property.m
@@ -223,4 +223,7 @@ DEPRECATED
 - (id (^)(id, NSArray *, NSMutableDictionary *)) expressionBlock;
 - (id (^)(id, NSArray *, NSMutableDictionary *)) MyBlock;
 - (void) setMyBlock : (id (^)(id, NSArray *, NSMutableDictionary *)) bl;
+- (id (*)(id, NSArray *, NSMutableDictionary *)) expressionFuncptr;
+- (id (*)(id, NSArray *, NSMutableDictionary *)) MyFuncptr;
+- (void) setMyFuncptr : (id (*)(id, NSArray *, NSMutableDictionary *)) bl;
 @end

diff --git a/test/ARCMT/objcmt-property.m.result b/test/ARCMT/objcmt-property.m.result
index 27f7c1c05a0c34dd2cea2bb90fb31bce895e54b2..29559bfb35a6da48bc34b4dbc7d14e04cefb0efc 100644 (file)
--- a/test/ARCMT/objcmt-property.m.result
+++ b/test/ARCMT/objcmt-property.m.result
@@ -223,4 +223,7 @@ DEPRECATED
 @property (nonatomic, readonly) id (^expressionBlock)(id, NSArray *, NSMutableDictionary *);
 @property (nonatomic, copy) id (^MyBlock)(id, NSArray *, NSMutableDictionary *);
 
+@property (nonatomic, readonly) id (*expressionFuncptr)(__strong id, NSArray *__strong, NSMutableDictionary *__strong);
+@property (nonatomic) id (*MyFuncptr)(__strong id, NSArray *__strong, NSMutableDictionary *__strong);
+
 @end