This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG342e64979afe: [Sema] Fix assertion failure when
instantiating requires expression (authored by ilya-biryukov).
Changed prior to commit:
https://reviews.llvm.org/D127487?vs=438977&id=439387#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D127487/new/
https://reviews.llvm.org/D127487
Files:
clang/lib/Sema/SemaConcept.cpp
clang/lib/Sema/SemaTemplateInstantiate.cpp
clang/test/SemaTemplate/concepts-PR54629.cpp
Index: clang/test/SemaTemplate/concepts-PR54629.cpp
===================================================================
--- /dev/null
+++ clang/test/SemaTemplate/concepts-PR54629.cpp
@@ -0,0 +1,58 @@
+// RUN: %clang_cc1 -std=c++20 -verify %s
+
+template <class T>
+struct A {
+ void primary();
+};
+
+template <class T>
+ requires requires(T &t) { requires sizeof(t) > 4; }
+struct A<T> {
+ void specialization1();
+};
+
+template <class T>
+ requires requires(T &t) { requires sizeof(t) > 8; }
+struct A<T> {
+ void specialization2();
+};
+
+int main() {
+ A<char>().primary();
+ A<char[5]>().specialization1();
+ A<char[16]>(); // expected-error {{ambiguous partial specialization}}
+ // expected-note@10 {{partial specialization matches [with T = char[16]}}
+ // expected-note@16 {{partial specialization matches [with T = char[16]}}
+}
+
+// Check error messages when no overload with constraints matches.
+template <class T>
+void foo()
+ requires requires(T &t) { requires sizeof(t) < 4; }
+{}
+
+template <class T>
+void foo()
+ requires requires(T &t) { requires sizeof(t) > 4; }
+{}
+
+template <class T>
+void foo()
+ requires requires(T &t) { requires sizeof(t) > 8; }
+{}
+
+void test() {
+ foo<char[4]>();
+ // expected-error@-1 {{no matching function for call to 'foo'}}
+ // expected-note@30 {{candidate template ignored: constraints not satisfied}}
+ // expected-note@31 {{because 'sizeof (t) < 4' (4 < 4) evaluated to false}}
+ // expected-note@35 {{candidate template ignored: constraints not satisfied}}
+ // expected-note@36 {{because 'sizeof (t) > 4' (4 > 4) evaluated to false}}
+ // expected-note@40 {{candidate template ignored: constraints not satisfied}}
+ // expected-note@41 {{because 'sizeof (t) > 8' (4 > 8) evaluated to false}}
+
+ foo<char[16]>();
+ // expected-error@-1 {{call to 'foo' is ambiguous}}
+ // expected-note@35 {{candidate function}}
+ // expected-note@40 {{candidate function}}
+}
Index: clang/lib/Sema/SemaTemplateInstantiate.cpp
===================================================================
--- clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -10,12 +10,14 @@
//===----------------------------------------------------------------------===/
#include "TreeTransform.h"
+#include "clang/AST/ASTConcept.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/ASTLambda.h"
#include "clang/AST/ASTMutationListener.h"
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/Expr.h"
+#include "clang/AST/ExprConcepts.h"
#include "clang/AST/PrettyDeclStackTrace.h"
#include "clang/AST/TypeVisitor.h"
#include "clang/Basic/LangOptions.h"
@@ -2022,6 +2024,7 @@
Req->getConstraintExpr()->getSourceRange());
ExprResult TransConstraint;
+ ConstraintSatisfaction Satisfaction;
TemplateDeductionInfo Info(Req->getConstraintExpr()->getBeginLoc());
{
EnterExpressionEvaluationContext ContextRAII(
@@ -2033,6 +2036,25 @@
if (ConstrInst.isInvalid())
return nullptr;
TransConstraint = TransformExpr(Req->getConstraintExpr());
+ if (!TransConstraint.isInvalid()) {
+ bool CheckSucceeded =
+ SemaRef.CheckConstraintExpression(TransConstraint.get());
+ (void)CheckSucceeded;
+ assert(CheckSucceeded || Trap.hasErrorOccurred() &&
+ "CheckConstraintExpression failed, but "
+ "did not produce a SFINAE error");
+ }
+ // Use version of CheckConstraintSatisfaction that does no substitutions.
+ if (!TransConstraint.isInvalid() &&
+ !TransConstraint.get()->isInstantiationDependent() &&
+ !Trap.hasErrorOccurred()) {
+ bool CheckFailed = SemaRef.CheckConstraintSatisfaction(
+ TransConstraint.get(), Satisfaction);
+ (void)CheckFailed;
+ assert(!CheckFailed || Trap.hasErrorOccurred() &&
+ "CheckConstraintSatisfaction failed, "
+ "but did not produce a SFINAE error");
+ }
if (TransConstraint.isInvalid() || Trap.hasErrorOccurred())
return RebuildNestedRequirement(createSubstDiag(SemaRef, Info,
[&] (llvm::raw_ostream& OS) {
@@ -2040,7 +2062,11 @@
SemaRef.getPrintingPolicy());
}));
}
- return RebuildNestedRequirement(TransConstraint.get());
+ if (TransConstraint.get()->isInstantiationDependent())
+ return new (SemaRef.Context)
+ concepts::NestedRequirement(TransConstraint.get());
+ return new (SemaRef.Context) concepts::NestedRequirement(
+ SemaRef.Context, TransConstraint.get(), Satisfaction);
}
Index: clang/lib/Sema/SemaConcept.cpp
===================================================================
--- clang/lib/Sema/SemaConcept.cpp
+++ clang/lib/Sema/SemaConcept.cpp
@@ -348,8 +348,9 @@
ConstraintSatisfaction &Satisfaction) {
return calculateConstraintSatisfaction(
*this, ConstraintExpr, Satisfaction,
- [](const Expr *AtomicExpr) -> ExprResult {
- return ExprResult(const_cast<Expr *>(AtomicExpr));
+ [this](const Expr *AtomicExpr) -> ExprResult {
+ // We only do this to immitate lvalue-to-rvalue conversion.
+ return PerformContextuallyConvertToBool(const_cast<Expr *>(AtomicExpr));
});
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
