remove warn_previous_declaration

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

diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 45b0535dec19629b897c1e4d26431f7becd1ef8a..f1024c36e66b9f96a949217a21f4e0c8b61ff522 100644 (file)
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -504,8 +504,6 @@ DIAG(err_missing_class_definition, ERROR,
      "cannot find definition of 'Class'")
 DIAG(warn_previous_alias_decl, WARNING,
      "previously declared alias is ignored")
-DIAG(warn_previous_declaration, WARNING,
-     "previous declaration is here")
 DIAG(err_conflicting_aliasing_type, ERROR,
      "conflicting types for alias %0")
 DIAG(err_statically_allocated_object, ERROR,

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 7a7b3767b896db14968641d15b5fbf1367d56a82..0b4ebabb9a7294424d9cef18734f7e82b567dcf5 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -143,14 +143,11 @@ Sema::DeclTy *Sema::ActOnCompatiblityAlias(SourceLocation AtLoc,
   // Look for previous declaration of alias name
   Decl *ADecl = LookupDecl(AliasName, Decl::IDNS_Ordinary, TUScope);
   if (ADecl) {
-    if (isa<ObjCCompatibleAliasDecl>(ADecl)) {
+    if (isa<ObjCCompatibleAliasDecl>(ADecl))
       Diag(AliasLocation, diag::warn_previous_alias_decl);
-      Diag(ADecl->getLocation(), diag::warn_previous_declaration);
-    }
-    else {
+    else
       Diag(AliasLocation, diag::err_conflicting_aliasing_type) << AliasName;
-      Diag(ADecl->getLocation(), diag::note_previous_declaration);
-    }
+    Diag(ADecl->getLocation(), diag::note_previous_declaration);
     return 0;
   }
   // Check for class declaration
@@ -159,7 +156,7 @@ Sema::DeclTy *Sema::ActOnCompatiblityAlias(SourceLocation AtLoc,
   if (CDecl == 0) {
     Diag(ClassLocation, diag::warn_undef_interface) << ClassName;
     if (CDeclU)
-      Diag(CDeclU->getLocation(), diag::warn_previous_declaration);
+      Diag(CDeclU->getLocation(), diag::note_previous_declaration);
     return 0;
   }
   

diff --git a/test/SemaObjC/alias-test-1.m b/test/SemaObjC/alias-test-1.m
index 377f62f5baade37728194031873b6d6cec4a2d88..6a33b98b366b68295c17e43d19dd3cd1d5eaf4ad 100644 (file)
--- a/test/SemaObjC/alias-test-1.m
+++ b/test/SemaObjC/alias-test-1.m
@@ -5,7 +5,7 @@
 @class class2; // expected-note {{previous declaration is here}}
 @class class3;
 
-typedef int I;  // expected-warning {{previous declaration is here}}
+typedef int I;  // expected-note {{previous declaration is here}}
 
 @compatibility_alias alias1 I;  // expected-warning {{cannot find interface declaration for 'I'}}