diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/ARCMigrate/ObjCMT.cpp | 7 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-property.m | 3 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-property.m.result | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp index dfe123fd301..8d5395ae3cf 100644 --- a/clang/lib/ARCMigrate/ObjCMT.cpp +++ b/clang/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/clang/test/ARCMT/objcmt-property.m b/clang/test/ARCMT/objcmt-property.m index 080e87e1b5c..c02d987ba84 100644 --- a/clang/test/ARCMT/objcmt-property.m +++ b/clang/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/clang/test/ARCMT/objcmt-property.m.result b/clang/test/ARCMT/objcmt-property.m.result index 27f7c1c05a0..29559bfb35a 100644 --- a/clang/test/ARCMT/objcmt-property.m.result +++ b/clang/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 |
