ObjectiveC migrator: A typical implementation of

'default' methods in Foundation does not
infer 'instancetype' for methods' result type.
// rdar://15145218

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

diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index a3eafe2b59b1901e25fd25c5a7dfcc45c9b9e9da..2c70b9933a7dd03393411fc9b026fceb0fd92e0b 100644 (file)
--- a/lib/Basic/IdentifierTable.cpp
+++ b/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/test/ARCMT/objcmt-instancetype-2.m.result b/test/ARCMT/objcmt-instancetype-2.m.result
index 89ce243335be7ad9f36c2594f5d0a5b6acbd8d09..199430b7555b1be74a45b97fea0ceb4eda49e7cf 100644 (file)
--- a/test/ARCMT/objcmt-instancetype-2.m.result
+++ b/test/ARCMT/objcmt-instancetype-2.m.result
@@ -79,7 +79,7 @@ typedef enum NSURLBookmarkResolutionOptions {
 @end
 
 @interface NSNotificationCenter
-+ (instancetype) defaultCenter;
++ (id) defaultCenter;
 @end
 
 @interface UIApplication