ObjectiveC migrator: remove dead code.

llvm-svn: 189592

3 files changed, 1 insertions, 15 deletions

diff --git a/clang/include/clang/Basic/IdentifierTable.h b/clang/include/clang/Basic/IdentifierTable.h
index 4a54728dff2..764ef04f54e 100644
--- a/clang/include/clang/Basic/IdentifierTable.h
+++ b/clang/include/clang/Basic/IdentifierTable.h
@@ -586,7 +586,6 @@ enum ObjCInstanceTypeFamily {
   OIT_None,
   OIT_Array,
   OIT_Dictionary,
-  OIT_MemManage,
   OIT_Singleton
 };
 
diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp
index d71ab0d1bcd..b21c75b7fe9 100644
--- a/clang/lib/ARCMigrate/ObjCMT.cpp
+++ b/clang/lib/ARCMigrate/ObjCMT.cpp
@@ -700,11 +700,6 @@ void ObjCMigrateASTConsumer::migrateMethodInstanceType(ASTContext &Ctx,
     case OIT_Dictionary:
       ClassName = "NSDictionary";
       break;
-    // For methods where Clang automatically infers instancetype from the selector 
-    // (e.g., all -init* methods), we should not suggest "instancetype" because it 
-    // is redundant,
-    case OIT_MemManage:
-      return;
     case OIT_Singleton:
       migrateFactoryMethod(Ctx, CDecl, OM, OIT_Singleton);
       return;
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index b1a22eea7ec..5102f7cfd33 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -461,20 +461,12 @@ ObjCInstanceTypeFamily Selector::getInstTypeMethodFamily(Selector sel) {
   if (name.empty()) return OIT_None;
   switch (name.front()) {
     case 'a':
-      if (startsWithWord(name, "alloc")) return OIT_MemManage;
-      else
-        if (startsWithWord(name, "array")) return OIT_Array;
+      if (startsWithWord(name, "array")) return OIT_Array;
       break;
     case 'd':
       if (startsWithWord(name, "dictionary")) return OIT_Dictionary;
       if (startsWithWord(name, "default")) return OIT_Singleton;
       break;
-    case 'i':
-      if (startsWithWord(name, "init")) return OIT_MemManage;
-      break;
-    case 'r':
-      if (startsWithWord(name, "retain")) return OIT_MemManage;
-      break;
     case 's':
       if (startsWithWord(name, "shared") ||
           startsWithWord(name, "standard"))