summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-09-10 18:39:32 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-09-10 18:39:32 +0000
commitc02bfb9a85465a58730ef15a66e85aa7a627762e (patch)
treef6c2bfdfcef7375261c0303887712d16efbfa690
parentbac9d13647b5a875f1a564703bca70ab59f49726 (diff)
downloadbcm5719-llvm-c02bfb9a85465a58730ef15a66e85aa7a627762e.tar.gz
bcm5719-llvm-c02bfb9a85465a58730ef15a66e85aa7a627762e.zip
ObjectiveC migrator: rename inferred isXXX property,
with a suitable 'getter' attribute. llvm-svn: 190420
-rw-r--r--clang/lib/ARCMigrate/ObjCMT.cpp2
-rw-r--r--clang/test/ARCMT/objcmt-property.m1
-rw-r--r--clang/test/ARCMT/objcmt-property.m.result3
3 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp
index f91741abf89..efe2e858c42 100644
--- a/clang/lib/ARCMigrate/ObjCMT.cpp
+++ b/clang/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/clang/test/ARCMT/objcmt-property.m b/clang/test/ARCMT/objcmt-property.m
index 2f655b9a2a3..8f9c5f7fc50 100644
--- a/clang/test/ARCMT/objcmt-property.m
+++ b/clang/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/clang/test/ARCMT/objcmt-property.m.result b/clang/test/ARCMT/objcmt-property.m.result
index 751b85e3db6..a2cecd5dcf8 100644
--- a/clang/test/ARCMT/objcmt-property.m.result
+++ b/clang/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
OpenPOWER on IntegriCloud