ObjectiveC migrator: rename inferred isXXX property,

with a suitable 'getter' attribute.

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

diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index f91741abf894f957f9c696bed1671ef9bbd0a2ba..efe2e858c42bf11f5be807abc219804cbc3cd013 100644 (file)
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -770,7 +770,7 @@ bool ObjCMigrateASTConsumer::migrateProperty(ASTContext &Ctx,
     // as a 'readonly' property.
     edit::Commit commit(*Editor);
     rewriteToObjCProperty(Method, 0 /*SetterMethod*/, *NSAPIObj, commit,
-                          false /*GetterHasIsPrefix*/);
+                          GetterHasIsPrefix);
     Editor->commit(commit);
     return true;
   }

diff --git a/test/ARCMT/objcmt-property.m b/test/ARCMT/objcmt-property.m
index 2f655b9a2a3b69aa803f2e0ae9145aaa08c9cad5..8f9c5f7fc50daffa2e8410198140ad92a7b47e6c 100644 (file)
--- a/test/ARCMT/objcmt-property.m
+++ b/test/ARCMT/objcmt-property.m
@@ -97,6 +97,7 @@ typedef char BOOL;
 - (id) object;
 + (double) D;
 - (void *)JSObject WEBKIT_OBJC_METHOD_ANNOTATION(AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER);
+- (BOOL)isIgnoringInteractionEvents;
 @end
 
 

diff --git a/test/ARCMT/objcmt-property.m.result b/test/ARCMT/objcmt-property.m.result
index 751b85e3db6292ec6ba2c00ba629c9f8eca74b47..a2cecd5dcf86057a97ade909cc4a62d163bcb23e 100644 (file)
--- a/test/ARCMT/objcmt-property.m.result
+++ b/test/ARCMT/objcmt-property.m.result
@@ -89,7 +89,7 @@ typedef char BOOL;
 @property(nonatomic, readonly) id isAnObject;
 - (void)setAnObject : (id) object;
 
-@property(nonatomic, readonly) BOOL isinValid;
+@property(nonatomic, getter=isinValid, readonly) BOOL inValid;
 - (void) setInValid : (BOOL) arg;
 
 - (void) Nothing;
@@ -97,6 +97,7 @@ typedef char BOOL;
 @property(nonatomic, readonly) id object;
 + (double) D;
 @property(nonatomic, readonly) void * JSObject WEBKIT_OBJC_METHOD_ANNOTATION(AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER);
+@property(nonatomic, getter=isIgnoringInteractionEvents, readonly) BOOL ignoringInteractionEvents;
 @end