diff options
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 1 | ||||
| -rw-r--r-- | clang/test/ARCMT/objcmt-instancetype-2.m.result | 2 |
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 |
