Revert my last couple patches until I can get them to not make the tests fail.

llvm-svn: 66317
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index a265818..476b6af 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -1139,7 +1139,7 @@
     Diag(property->getLocation(), 
          diag::err_accessor_property_type_mismatch) 
       << property->getDeclName()
-      << GetterMethod->getSelector();
+      << GetterMethod->getSelector().getAsIdentifierInfo();
     Diag(GetterMethod->getLocation(), diag::note_declared_at);
   }
   
@@ -1152,7 +1152,7 @@
       Diag(property->getLocation(), 
            diag::err_accessor_property_type_mismatch) 
         << property->getDeclName()
-        << SetterMethod->getSelector();
+        << SetterMethod->getSelector().getAsIdentifierInfo();
       Diag(SetterMethod->getLocation(), diag::note_declared_at);
     }
   }