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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66317 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 2 insertions, 10 deletions

diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index 84d4055b78..893eae5d1a 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -657,14 +657,6 @@ FormatDiagnostic(llvm::SmallVectorImpl<char> &OutStr) const {
       OutStr.push_back('\'');
       break;
     }
-    case Diagnostic::ak_selector: {
-      Selector S = getArgSelector(ArgNo);
-      OutStr.push_back('\'');
-      const std::string &s = S.getAsString();
-      OutStr.append(&s[0], &s[0]+s.length());
-      OutStr.push_back('\'');
-      break;
-    }
     case Diagnostic::ak_qualtype:
     case Diagnostic::ak_declarationname:
     case Diagnostic::ak_nameddecl:
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index a26581824f..476b6afea5 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1139,7 +1139,7 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
     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 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
       Diag(property->getLocation(), 
            diag::err_accessor_property_type_mismatch) 
         << property->getDeclName()
-        << SetterMethod->getSelector();
+        << SetterMethod->getSelector().getAsIdentifierInfo();
       Diag(SetterMethod->getLocation(), diag::note_declared_at);
     }
   }