Have the exception specification checkers take partial diagnostics. Use this to merge...

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

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index fc840a2d58bbdedfe3c4e79acd40313fd83c52d0..b03676d877e26f1e44b76cf13ddc0cbf9a9cc45c 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -365,10 +365,8 @@ def err_override_exception_spec : Error<
   "base version">;
 def err_incompatible_exception_specs : Error<
   "target exception specification is not superset of source">;
-def err_return_type_specs_differ : Error<
-  "exception specifications of return types differ">;
-def err_arg_type_specs_differ : Error<
-  "exception specifications of argument types differ">;
+def err_deep_exception_specs_differ : Error<
+  "exception specifications of %select{return|argument}0 types differ">;
 
 // C++ access checking
 def err_class_redeclared_with_different_access : Error<

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 04addfd3a98b1a1984b6aaf439cdd8234b470d65..80f366302171bc769a407d73c96ed19e4aa95725 100644 (file)
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -482,13 +482,15 @@ public:
   bool CheckEquivalentExceptionSpec(
       const FunctionProtoType *Old, SourceLocation OldLoc,
       const FunctionProtoType *New, SourceLocation NewLoc);
-  bool CheckEquivalentExceptionSpec(unsigned DiagID, unsigned NoteID,
+  bool CheckEquivalentExceptionSpec(
+      const PartialDiagnostic &DiagID, const PartialDiagnostic & NoteID,
       const FunctionProtoType *Old, SourceLocation OldLoc,
       const FunctionProtoType *New, SourceLocation NewLoc);
-  bool CheckExceptionSpecSubset(unsigned DiagID, unsigned NoteID,
+  bool CheckExceptionSpecSubset(
+      const PartialDiagnostic &DiagID, const PartialDiagnostic & NoteID,
       const FunctionProtoType *Superset, SourceLocation SuperLoc,
       const FunctionProtoType *Subset, SourceLocation SubLoc);
-  bool CheckParamExceptionSpec(unsigned NoteID,
+  bool CheckParamExceptionSpec(const PartialDiagnostic & NoteID,
       const FunctionProtoType *Target, SourceLocation TargetLoc,
       const FunctionProtoType *Source, SourceLocation SourceLoc);
 

diff --git a/lib/Sema/SemaExceptionSpec.cpp b/lib/Sema/SemaExceptionSpec.cpp
index 0adeb99d0c02aece31604cc0ed97ffbd951a03c9..bdd00b84049d3e476d091847e92a25fd3061aba4 100644 (file)
--- a/lib/Sema/SemaExceptionSpec.cpp
+++ b/lib/Sema/SemaExceptionSpec.cpp
@@ -100,7 +100,7 @@ bool Sema::CheckEquivalentExceptionSpec(
 /// they allow exactly the same set of exception types. It does not matter how
 /// that is achieved. See C++ [except.spec]p2.
 bool Sema::CheckEquivalentExceptionSpec(
-    unsigned DiagID, unsigned NoteID,
+    const PartialDiagnostic &DiagID, const PartialDiagnostic & NoteID,
     const FunctionProtoType *Old, SourceLocation OldLoc,
     const FunctionProtoType *New, SourceLocation NewLoc) {
   bool OldAny = !Old->hasExceptionSpec() || Old->hasAnyExceptionSpec();
@@ -109,7 +109,7 @@ bool Sema::CheckEquivalentExceptionSpec(
     return false;
   if (OldAny || NewAny) {
     Diag(NewLoc, DiagID);
-    if (NoteID != 0)
+    if (NoteID.getDiagID() != 0)
       Diag(OldLoc, NoteID);
     return true;
   }
@@ -137,7 +137,7 @@ bool Sema::CheckEquivalentExceptionSpec(
     return false;
   }
   Diag(NewLoc, DiagID);
-  if (NoteID != 0)
+  if (NoteID.getDiagID() != 0)
     Diag(OldLoc, NoteID);
   return true;
 }
@@ -145,7 +145,8 @@ bool Sema::CheckEquivalentExceptionSpec(
 /// CheckExceptionSpecSubset - Check whether the second function type's
 /// exception specification is a subset (or equivalent) of the first function
 /// type. This is used by override and pointer assignment checks.
-bool Sema::CheckExceptionSpecSubset(unsigned DiagID, unsigned NoteID,
+bool Sema::CheckExceptionSpecSubset(
+    const PartialDiagnostic &DiagID, const PartialDiagnostic & NoteID,
     const FunctionProtoType *Superset, SourceLocation SuperLoc,
     const FunctionProtoType *Subset, SourceLocation SubLoc) {
   // FIXME: As usual, we could be more specific in our error messages, but
@@ -161,7 +162,7 @@ bool Sema::CheckExceptionSpecSubset(unsigned DiagID, unsigned NoteID,
   // It does not. If the subset contains everything, we've failed.
   if (!Subset->hasExceptionSpec() || Subset->hasAnyExceptionSpec()) {
     Diag(SubLoc, DiagID);
-    if (NoteID != 0)
+    if (NoteID.getDiagID() != 0)
       Diag(SuperLoc, NoteID);
     return true;
   }
@@ -230,7 +231,7 @@ bool Sema::CheckExceptionSpecSubset(unsigned DiagID, unsigned NoteID,
     }
     if (!Contained) {
       Diag(SubLoc, DiagID);
-      if (NoteID != 0)
+      if (NoteID.getDiagID() != 0)
         Diag(SuperLoc, NoteID);
       return true;
     }
@@ -240,7 +241,7 @@ bool Sema::CheckExceptionSpecSubset(unsigned DiagID, unsigned NoteID,
 }
 
 static bool CheckSpecForTypesEquivalent(Sema &S,
-    unsigned DiagID, unsigned NoteID,
+    const PartialDiagnostic &DiagID, const PartialDiagnostic & NoteID,
     QualType Target, SourceLocation TargetLoc,
     QualType Source, SourceLocation SourceLoc)
 {
@@ -260,21 +261,23 @@ static bool CheckSpecForTypesEquivalent(Sema &S,
 /// assignment and override compatibility check. We do not check the parameters
 /// of parameter function pointers recursively, as no sane programmer would
 /// even be able to write such a function type.
-bool Sema::CheckParamExceptionSpec(unsigned NoteID,
+bool Sema::CheckParamExceptionSpec(const PartialDiagnostic & NoteID,
     const FunctionProtoType *Target, SourceLocation TargetLoc,
     const FunctionProtoType *Source, SourceLocation SourceLoc)
 {
-  if (CheckSpecForTypesEquivalent(*this, diag::err_return_type_specs_differ, 0,
+  if (CheckSpecForTypesEquivalent(*this,
+                           PDiag(diag::err_deep_exception_specs_differ) << 0, 0,
                                   Target->getResultType(), TargetLoc,
                                   Source->getResultType(), SourceLoc))
     return true;
 
-  // We shouldn't even testing this unless the arguments are otherwise
+  // We shouldn't even be testing this unless the arguments are otherwise
   // compatible.
   assert(Target->getNumArgs() == Source->getNumArgs() &&
          "Functions have different argument counts.");
   for (unsigned i = 0, E = Target->getNumArgs(); i != E; ++i) {
-    if (CheckSpecForTypesEquivalent(*this, diag::err_arg_type_specs_differ, 0,
+    if (CheckSpecForTypesEquivalent(*this,
+                           PDiag(diag::err_deep_exception_specs_differ) << 1, 0,
                                     Target->getArgType(i), TargetLoc,
                                     Source->getArgType(i), SourceLoc))
       return true;