summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-10-07 20:41:53 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-10-07 20:41:53 +0000
commit985da6c9369c5f6e3e34c31cd742dfbae71d1a49 (patch)
tree3f61100ab733e4366e6b745c927b2818a62ef6dc /clang
parentb8b41d3ea4445c9d3d4e0cd7c9b6a11c6ce1640a (diff)
downloadbcm5719-llvm-985da6c9369c5f6e3e34c31cd742dfbae71d1a49.tar.gz
bcm5719-llvm-985da6c9369c5f6e3e34c31cd742dfbae71d1a49.zip
ObjectiveC migrator: A typical implementation of
'default' methods in Foundation does not infer 'instancetype' for methods' result type. // rdar://15145218 llvm-svn: 192129
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Basic/IdentifierTable.cpp1
-rw-r--r--clang/test/ARCMT/objcmt-instancetype-2.m.result2
2 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index a3eafe2b59b..2c70b9933a7 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -465,7 +465,6 @@ ObjCInstanceTypeFamily Selector::getInstTypeMethodFamily(Selector sel) {
break;
case 'd':
if (startsWithWord(name, "dictionary")) return OIT_Dictionary;
- if (startsWithWord(name, "default")) return OIT_Singleton;
break;
case 's':
if (startsWithWord(name, "shared") ||
diff --git a/clang/test/ARCMT/objcmt-instancetype-2.m.result b/clang/test/ARCMT/objcmt-instancetype-2.m.result
index 89ce243335b..199430b7555 100644
--- a/clang/test/ARCMT/objcmt-instancetype-2.m.result
+++ b/clang/test/ARCMT/objcmt-instancetype-2.m.result
@@ -79,7 +79,7 @@ typedef enum NSURLBookmarkResolutionOptions {
@end
@interface NSNotificationCenter
-+ (instancetype) defaultCenter;
++ (id) defaultCenter;
@end
@interface UIApplication
OpenPOWER on IntegriCloud