Make sure the SubstitutionDiagnostic alias is used consistently

Author: cor3ntin

clang/include/clang/AST/ASTConcept.h

@@ -33,13 +33,14 @@ class Expr;
 class NamedDecl;
 struct PrintingPolicy;
 
-/// Pairs of unsatisfied atomic constraint expressions along with the
-/// substituted constraint expr, if the template arguments could be
+/// Unsatisfied constraint expressions if the template arguments could be
 /// substituted into them, or a diagnostic if substitution resulted in
 /// an invalid expression.
+///
+using ConstraintSubstitutionDiagnostic = std::pair<SourceLocation, StringRef>;
 using UnsatisfiedConstraintRecord =
     llvm::PointerUnion<const Expr *, const ConceptReference *,
-                       std::pair<SourceLocation, StringRef> *>;
+                       const ConstraintSubstitutionDiagnostic *>;
 
 /// The result of a constraint satisfaction check, containing the necessary
 /// information to diagnose an unsatisfied constraint.
@@ -57,8 +58,6 @@ class ConstraintSatisfaction : public llvm::FoldingSetNode {
                          ArrayRef<TemplateArgument> TemplateArgs)
       : ConstraintOwner(ConstraintOwner), TemplateArgs(TemplateArgs) {}
 
-  using SubstitutionDiagnostic = std::pair<SourceLocation, StringRef>;
-
   bool IsSatisfied = false;
   bool ContainsErrors = false;
 
@@ -77,7 +76,7 @@ class ConstraintSatisfaction : public llvm::FoldingSetNode {
 
   bool HasSubstitutionFailure() {
     for (const auto &Detail : Details)
-      if (Detail.dyn_cast<SubstitutionDiagnostic *>())
+      if (Detail.dyn_cast<const ConstraintSubstitutionDiagnostic *>())
         return true;
     return false;
   }

clang/lib/AST/ASTConcept.cpp

@@ -33,9 +33,9 @@ CreateUnsatisfiedConstraintRecord(const ASTContext &C,
     new (TrailingObject) UnsatisfiedConstraintRecord(Concept);
   else {
     auto &SubstitutionDiagnostic =
-        *cast<std::pair<SourceLocation, StringRef> *>(Detail);
+        *cast<const clang::ConstraintSubstitutionDiagnostic *>(Detail);
     StringRef Message = C.backupStr(SubstitutionDiagnostic.second);
-    auto *NewSubstDiag = new (C) std::pair<SourceLocation, StringRef>(
+    auto *NewSubstDiag = new (C) clang::ConstraintSubstitutionDiagnostic(
         SubstitutionDiagnostic.first, Message);
     new (TrailingObject) UnsatisfiedConstraintRecord(NewSubstDiag);
   }

clang/lib/AST/ASTImporter.cpp

@@ -1075,16 +1075,16 @@ Error ASTNodeImporter::ImportConstraintSatisfaction(
           return ToSecondExpr.takeError();
         ToSat.Details.emplace_back(ToSecondExpr.get());
       } else {
-        auto Pair = Record->dyn_cast<std::pair<SourceLocation, StringRef> *>();
+        auto Pair =
+            Record->dyn_cast<const ConstraintSubstitutionDiagnostic *>();
 
         ExpectedSLoc ToPairFirst = import(Pair->first);
         if (!ToPairFirst)
           return ToPairFirst.takeError();
         StringRef ToPairSecond = ImportASTStringRef(Pair->second);
-        ToSat.Details.emplace_back(
-            new (Importer.getToContext())
-                ConstraintSatisfaction::SubstitutionDiagnostic{
-                    ToPairFirst.get(), ToPairSecond});
+        ToSat.Details.emplace_back(new (Importer.getToContext())
+                                       ConstraintSubstitutionDiagnostic{
+                                           ToPairFirst.get(), ToPairSecond});
       }
     }
   }

clang/lib/Sema/SemaConcept.cpp

@@ -509,7 +509,7 @@ ExprResult ConstraintSatisfactionChecker::EvaluateAtomicConstraint(
       //  future, to serialize the proper PartialDiagnostic as serializing
       //  it as a string defeats the purpose of the diagnostic mechanism.
       Satisfaction.Details.emplace_back(
-          new (S.Context) ConstraintSatisfaction::SubstitutionDiagnostic{
+          new (S.Context) ConstraintSubstitutionDiagnostic{
               SubstDiag.first,
               allocateStringFromConceptDiagnostic(S, SubstDiag.second)});
       Satisfaction.IsSatisfied = false;
@@ -641,7 +641,7 @@ ExprResult ConstraintSatisfactionChecker::EvaluateSlow(
 
     PartialDiagnostic Msg = S.PDiag(diag::note_constraint_references_error);
     Satisfaction.Details.emplace_back(
-        new (S.Context) ConstraintSatisfaction::SubstitutionDiagnostic{
+        new (S.Context) ConstraintSubstitutionDiagnostic{
             SubstitutedAtomicExpr.get()->getBeginLoc(),
             allocateStringFromConceptDiagnostic(S, Msg)});
     return SubstitutedAtomicExpr;
@@ -897,7 +897,7 @@ ExprResult ConstraintSatisfactionChecker::EvaluateSlow(
     //  it as a string defeats the purpose of the diagnostic mechanism.
     Satisfaction.Details.insert(
         Satisfaction.Details.begin() + Size,
-        new (S.Context) ConstraintSatisfaction::SubstitutionDiagnostic{
+        new (S.Context) ConstraintSubstitutionDiagnostic{
             SubstDiag.first,
             allocateStringFromConceptDiagnostic(S, SubstDiag.second)});
     return ExprError();
@@ -1839,8 +1839,9 @@ static void diagnoseWellFormedUnsatisfiedConstraintExpr(Sema &S,
 static void diagnoseUnsatisfiedConstraintExpr(
     Sema &S, const UnsatisfiedConstraintRecord &Record, SourceLocation Loc,
     bool First, concepts::NestedRequirement *Req) {
-  if (auto *Diag = Record.template dyn_cast<
-                   ConstraintSatisfaction::SubstitutionDiagnostic *>()) {
+  if (auto *Diag =
+          Record
+              .template dyn_cast<const ConstraintSubstitutionDiagnostic *>()) {
     if (Req)
       S.Diag(Diag->first, diag::note_nested_requirement_substitution_error)
           << (int)First << Req->getInvalidConstraintEntity() << Diag->second;

clang/lib/Serialization/ASTReaderStmt.cpp

@@ -812,9 +812,8 @@ readConstraintSatisfaction(ASTRecordReader &Record) {
         SourceLocation DiagLocation = Record.readSourceLocation();
         StringRef DiagMessage = C.backupStr(Record.readString());
 
-        Satisfaction.Details.emplace_back(
-            new (C) ConstraintSatisfaction::SubstitutionDiagnostic(
-                DiagLocation, DiagMessage));
+        Satisfaction.Details.emplace_back(new (
+            C) ConstraintSubstitutionDiagnostic(DiagLocation, DiagMessage));
       } else if (Kind == 1) {
         Satisfaction.Details.emplace_back(Record.readExpr());
       } else {

clang/lib/Serialization/ASTWriterStmt.cpp

@@ -482,8 +482,8 @@ addConstraintSatisfaction(ASTRecordWriter &Record,
   if (!Satisfaction.IsSatisfied) {
     Record.push_back(Satisfaction.NumRecords);
     for (const auto &DetailRecord : Satisfaction) {
-      if (auto *Diag =
-              dyn_cast<std::pair<SourceLocation, StringRef> *>(DetailRecord)) {
+      if (auto *Diag = dyn_cast<const ConstraintSubstitutionDiagnostic *>(
+              DetailRecord)) {
         Record.push_back(/*Kind=*/0);
         Record.AddSourceLocation(Diag->first);
         Record.AddString(Diag->second);