fix compouund constraint checking

Author: cor3ntin

clang/lib/Sema/SemaConcept.cpp

@@ -550,9 +550,7 @@ static bool calculateConstraintSatisfaction(
     if (!Success)
       return false;
     if (!Conjunction && Satisfaction.IsSatisfied) {
-      auto EffectiveDetailEnd = Satisfaction.Details.begin();
-      std::advance(EffectiveDetailEnd, EffectiveDetailEndIndex);
-      Satisfaction.Details.erase(EffectiveDetailEnd,
+      Satisfaction.Details.erase(Satisfaction.Details.begin() + EffectiveDetailEndIndex,
                                  Satisfaction.Details.end());
       break;
     }
@@ -635,24 +633,34 @@ static bool calculateConstraintSatisfaction(
     ConstraintSatisfaction &Satisfaction,
     UnsignedOrNone PackSubstitutionIndex) {
 
+  auto EffectiveDetailEndIndex = Satisfaction.Details.size();
+
   bool Ok = calculateConstraintSatisfaction(
       S, Constraint.getLHS(), Template, TemplateNameLoc, MLTAL, Satisfaction,
       PackSubstitutionIndex);
 
   if (!Ok || Satisfaction.ContainsErrors)
-    return false;
+    return Ok;
 
   if (Satisfaction.IsSatisfied &&
       Constraint.getCompoundKind() == NormalizedConstraint::CCK_Disjunction) {
     return true;
   }
   if (!Satisfaction.IsSatisfied &&
-      Constraint.getCompoundKind() == NormalizedConstraint::CCK_Conjunction)
+      Constraint.getCompoundKind() == NormalizedConstraint::CCK_Conjunction) {
     return true;
+  }
 
-  return calculateConstraintSatisfaction(S, Constraint.getRHS(), Template,
+  Satisfaction.ContainsErrors = false;
+  Satisfaction.IsSatisfied = false;
+
+  Ok = calculateConstraintSatisfaction(S, Constraint.getRHS(), Template,
                                          TemplateNameLoc, MLTAL, Satisfaction,
                                          PackSubstitutionIndex);
+  if(Ok && Satisfaction.IsSatisfied && !Satisfaction.ContainsErrors)
+    Satisfaction.Details.erase(Satisfaction.Details.begin() + EffectiveDetailEndIndex,
+                               Satisfaction.Details.end());
+  return Ok;
 }
 
 static bool calculateConstraintSatisfaction(
@@ -1349,6 +1357,7 @@ static void diagnoseUnsatisfiedRequirement(Sema &S,
                                            concepts::NestedRequirement *Req,
                                            bool First) {
   DiagnoseUnsatisfiedConstraint(S, Req->getConstraintSatisfaction().records(),
+                                Req->hasInvalidConstraint() ? SourceLocation() :
                                 Req->getConstraintExpr()->getExprLoc(), First,
                                 Req);
 }

clang/test/CXX/expr/expr.prim/expr.prim.id/p3.cpp

@@ -141,7 +141,6 @@ concept C7 = sizeof(T) == 1 || sizeof(
 
 static_assert(!C6<short>);
 static_assert(!C6<char>);
-// expected-error@-1 {{static assertion failed due to requirement '!C6<char>'}} \
 // expected-note@-1 {{while checking the satisfaction of concept 'C6<char>' requested here}}
 static_assert(C7<char>);
 static_assert(!C7<short>); // expected-note{{while checking the satisfaction of concept 'C7<short>' requested here}}

clang/test/SemaTemplate/concepts.cpp

@@ -1000,13 +1000,13 @@ template<class>
 concept True = true;
 
 template<class>
-concept False = false; // expected-note 9 {{'false' evaluated to false}}
+concept False = false; // expected-note 8 {{'false' evaluated to false}}
 
 template<class>
 concept Irrelevant = false;
 
 template <typename T>
-concept ErrorRequires = requires(ErrorRequires auto x) { x; };
+concept ErrorRequires = requires(ErrorRequires auto x) { x; }; //#GH54678-ill-formed-concept
 // expected-error@-1 {{a concept definition cannot refer to itself}} \
 // expected-error@-1 {{'auto' not allowed in requires expression parameter}} \
 // expected-note@-1 {{declared here}}
@@ -1027,7 +1027,8 @@ template<class T> void eee(T t) // expected-note {{candidate template ignored: c
 requires (Irrelevant<T> || Irrelevant<T> || True<T>) && False<T> {} // expected-note {{'long' does not satisfy 'False'}}
 
 template<class T> void fff(T t) // expected-note {{candidate template ignored: constraints not satisfied}}
-requires((ErrorRequires<T> || False<T> || True<T>) && False<T>) {} // expected-note {{'unsigned long' does not satisfy 'False'}}
+requires((ErrorRequires<T> || False<T> || True<T>) && False<T>) {} // expected-note {{because 'unsigned long' does not satisfy 'ErrorRequires'}}
+// // expected-note@#GH54678-ill-formed-concept {{because substituted constraint expression is ill-formed: constraint depends on a previously diagnosed expression}}
 
 void test() {
     aaa(42); // expected-error {{no matching function}}