ObjectiveC migrator: remove dead code.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189592 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 4a54728..764ef04 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -586,7 +586,6 @@
OIT_None,
OIT_Array,
OIT_Dictionary,
- OIT_MemManage,
OIT_Singleton
};
diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp
index d71ab0d..b21c75b 100644
--- a/lib/ARCMigrate/ObjCMT.cpp
+++ b/lib/ARCMigrate/ObjCMT.cpp
@@ -700,11 +700,6 @@
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/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index b1a22ee..5102f7c 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -461,20 +461,12 @@
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"))