3 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp
index 931f6ed051f..14d5cf6112b 100644
--- a/clang/lib/ARCMigrate/ObjCMT.cpp
+++ b/clang/lib/ARCMigrate/ObjCMT.cpp
@@ -318,10 +318,10 @@ void ObjCMigrateASTConsumer::migrateObjCInterfaceDecl(ASTContext &Ctx,
     if (!SetterMethod) {
       // try a different naming convention for getter: isXxxxx
       StringRef getterNameString = getterName->getName();
-      if (getterNameString.startswith("is")) {
+      if (getterNameString.startswith("is") && !GRT->isObjCRetainableType()) {
         GetterHasIsPrefix = true;
         const char *CGetterName = getterNameString.data() + 2;
-        if (CGetterName[0]) {
+        if (CGetterName[0] && isUppercase(CGetterName[0])) {
           getterName = &Ctx.Idents.get(CGetterName);
           SetterSelector =
             SelectorTable::constructSetterSelector(PP.getIdentifierTable(),
diff --git a/clang/test/ARCMT/objcmt-property.m b/clang/test/ARCMT/objcmt-property.m
index 8453999cd25..9a8bfa5aafa 100644
--- a/clang/test/ARCMT/objcmt-property.m
+++ b/clang/test/ARCMT/objcmt-property.m
@@ -85,6 +85,6 @@ typedef char BOOL;
 - (id) isAnObject;
 - (void)setAnObject : (id) object;
 
-- (id)isxdelegateYYY;
-- (void)setXdelegateYYY:(id)delegate;
+- (BOOL) isinValid;
+- (void) setInValid : (BOOL) arg;
 @end
diff --git a/clang/test/ARCMT/objcmt-property.m.result b/clang/test/ARCMT/objcmt-property.m.result
index 1cd771a1c72..dcdf0da773c 100644
--- a/clang/test/ARCMT/objcmt-property.m.result
+++ b/clang/test/ARCMT/objcmt-property.m.result
@@ -82,9 +82,9 @@ typedef char BOOL;
 @property(getter=isContinuous) BOOL continuous;
 
 
-@property(getter=isAnObject, retain) id anObject;
-
-
-@property(getter=isxdelegateYYY, unsafe_unretained) id xdelegateYYY;
+- (id) isAnObject;
+- (void)setAnObject : (id) object;
 
+- (BOOL) isinValid;
+- (void) setInValid : (BOOL) arg;
 @end