From 4c3d9c5e24200e026168d3ff8a68a85f10d2877f Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Tue, 17 Sep 2013 19:38:55 +0000 Subject: [PATCH] ObjectiveC migrator: Don't infer a property from isXXX method of retainable object (readonly or otherwise). llvm-svn: 190881 --- clang/lib/ARCMigrate/ObjCMT.cpp | 8 ++++++-- clang/test/ARCMT/objcmt-property.m.result | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp index b859c0b19d68..b51f8bb49384 100644 --- a/clang/lib/ARCMigrate/ObjCMT.cpp +++ b/clang/lib/ARCMigrate/ObjCMT.cpp @@ -741,8 +741,11 @@ bool ObjCMigrateASTConsumer::migrateProperty(ASTContext &Ctx, // try a different naming convention for getter: isXxxxx StringRef getterNameString = getterName->getName(); bool IsPrefix = getterNameString.startswith("is"); - if ((IsPrefix && !GRT->isObjCRetainableType()) || - getterNameString.startswith("get")) { + // Note that we don't want to change an isXXX method of retainable object + // type to property (readonly or otherwise). + if (IsPrefix && GRT->isObjCRetainableType()) + return false; + if (IsPrefix || getterNameString.startswith("get")) { LengthOfPrefix = (IsPrefix ? 2 : 3); const char *CGetterName = getterNameString.data() + LengthOfPrefix; // Make sure that first character after "is" or "get" prefix can @@ -759,6 +762,7 @@ bool ObjCMigrateASTConsumer::migrateProperty(ASTContext &Ctx, } } } + if (SetterMethod) { // Is this a valid setter, matching the target getter? QualType SRT = SetterMethod->getResultType(); diff --git a/clang/test/ARCMT/objcmt-property.m.result b/clang/test/ARCMT/objcmt-property.m.result index eff89294cf3b..355a8c124cca 100644 --- a/clang/test/ARCMT/objcmt-property.m.result +++ b/clang/test/ARCMT/objcmt-property.m.result @@ -86,7 +86,7 @@ typedef char BOOL; @property(nonatomic, getter=isContinuous) BOOL continuous; -@property(nonatomic, readonly) id isAnObject; +- (id) isAnObject; - (void)setAnObject : (id) object; @property(nonatomic, getter=isinValid, readonly) BOOL inValid; @@ -138,7 +138,7 @@ typedef char BOOL; @property(nonatomic, getter=isContinuous) BOOL continuous; -@property(nonatomic, readonly) id isAnObject; +- (id) isAnObject; - (void)setAnObject : (id) object; @property(nonatomic, getter=isinValid, readonly) BOOL inValid;