r189592 - ObjectiveC migrator: remove dead code.

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Aug 29 11:22:26 2013
New Revision: 189592

URL: http://llvm.org/viewvc/llvm-project?rev=189592&view=rev
Log:
ObjectiveC migrator: remove dead code.

Modified:
    cfe/trunk/include/clang/Basic/IdentifierTable.h
    cfe/trunk/lib/ARCMigrate/ObjCMT.cpp
    cfe/trunk/lib/Basic/IdentifierTable.cpp

Modified: cfe/trunk/include/clang/Basic/IdentifierTable.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/IdentifierTable.h?rev=189592&r1=189591&r2=189592&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/IdentifierTable.h (original)
+++ cfe/trunk/include/clang/Basic/IdentifierTable.h Thu Aug 29 11:22:26 2013
@@ -586,7 +586,6 @@ enum ObjCInstanceTypeFamily {
   OIT_None,
   OIT_Array,
   OIT_Dictionary,
-  OIT_MemManage,
   OIT_Singleton
 };
 

Modified: cfe/trunk/lib/ARCMigrate/ObjCMT.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ObjCMT.cpp?rev=189592&r1=189591&r2=189592&view=diff
==============================================================================
--- cfe/trunk/lib/ARCMigrate/ObjCMT.cpp (original)
+++ cfe/trunk/lib/ARCMigrate/ObjCMT.cpp Thu Aug 29 11:22:26 2013
@@ -700,11 +700,6 @@ void ObjCMigrateASTConsumer::migrateMeth
     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;

Modified: cfe/trunk/lib/Basic/IdentifierTable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/IdentifierTable.cpp?rev=189592&r1=189591&r2=189592&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/IdentifierTable.cpp (original)
+++ cfe/trunk/lib/Basic/IdentifierTable.cpp Thu Aug 29 11:22:26 2013
@@ -461,20 +461,12 @@ ObjCInstanceTypeFamily Selector::getInst
   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"))