remove duplicate error message.

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

diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 2da8b3673ddd3f527c8f64fdd8a1bf73fa856351..2b0f5aef6ee8d6b4b7fa6d13417cd3eb27a1a460 100644 (file)
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -424,8 +424,6 @@ DIAG(err_undef_superclass, ERROR,
      "cannot find interface declaration for '%0', superclass of '%1'")
 DIAG(err_duplicate_class_def, ERROR,
      "duplicate interface declaration for class '%0'")
-DIAG(err_undef_protocolref, ERROR,
-     "cannot find protocol definition for '%0', referenced by '%1'")
 DIAG(warn_undef_protocolref, WARNING,
      "cannot find protocol definition for '%0', referenced by '%1'")
 DIAG(err_duplicate_protocol_def, ERROR,

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 79f1e2d682372724cc47194f9e525e4ee9a7d7d1..3615ed30c6a30d2db0299011e3717c00af4d44dc 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -139,8 +139,8 @@ ActOnStartClassInterface(SourceLocation AtInterfaceLoc,
     for (unsigned int i = 0; i != NumProtocols; i++) {
       ObjCProtocolDecl* RefPDecl = ObjCProtocols[ProtocolNames[i].first];
       if (!RefPDecl)
-        Diag(ProtocolNames[i].second, diag::err_undef_protocolref,
-             ProtocolNames[i].first->getName(), ClassName->getName());
+        Diag(ProtocolNames[i].second, diag::err_undeclared_protocol,
+             ProtocolNames[i].first->getName());
       else {
         if (RefPDecl->isForwardDecl())
           Diag(ProtocolNames[i].second, diag::warn_undef_protocolref,
@@ -225,8 +225,8 @@ Sema::DeclTy *Sema::ActOnStartProtocolInterface(
     for (unsigned int i = 0; i != NumProtoRefs; i++) {
       ObjCProtocolDecl *RefPDecl = ObjCProtocols[ProtoRefNames[i].first];
       if (!RefPDecl)
-        Diag(ProtoRefNames[i].second, diag::err_undef_protocolref,
-             ProtoRefNames[i].first->getName(), ProtocolName->getName());
+        Diag(ProtoRefNames[i].second, diag::err_undeclared_protocol,
+             ProtoRefNames[i].first->getName());
       else {
         if (RefPDecl->isForwardDecl())
           Diag(ProtoRefNames[i].second, diag::warn_undef_protocolref,
@@ -439,8 +439,8 @@ ActOnStartCategoryInterface(SourceLocation AtInterfaceLoc,
     for (unsigned int i = 0; i != NumProtoRefs; i++) {
       ObjCProtocolDecl* RefPDecl = ObjCProtocols[ProtoRefNames[i].first];
       if (!RefPDecl)
-        Diag(ProtoRefNames[i].second, diag::err_undef_protocolref,
-             ProtoRefNames[i].first->getName(), CategoryName->getName());
+        Diag(ProtoRefNames[i].second, diag::err_undeclared_protocol,
+             ProtoRefNames[i].first->getName());
       else {
         if (RefPDecl->isForwardDecl())
           Diag(ProtoRefNames[i].second, diag::warn_undef_protocolref,

diff --git a/test/SemaObjC/interface-1.m b/test/SemaObjC/interface-1.m
index 0130a33f9b9cdadb9768515601e2337cedd87516..d93f29c4b6e29b4f2c11073349073dcbffb3e315 100644 (file)
--- a/test/SemaObjC/interface-1.m
+++ b/test/SemaObjC/interface-1.m
@@ -3,7 +3,7 @@
 
 @interface NSWhatever :
 NSObject     // expected-error {{cannot find interface declaration for 'NSObject'}}
-<NSCopying>  // expected-error {{cannot find protocol definition for 'NSCopying'}}
+<NSCopying>  // expected-error {{cannot find protocol declaration for 'NSCopying'}}
 @end