mirror of
https://github.com/llvm/llvm-project.git
synced 2025-05-06 15:26:08 +00:00
b3ce872851
Fixes: https://github.com/llvm/llvm-project/issues/45563 ``` template<class T> concept True = true; template <class T> concept C1 = requires (T) { requires True<typename T::value> || True<T>; }; template <class T> constexpr bool foo() requires True<typename T::value> || True<T> { return true; } static_assert(C1<double>); // Previously failed due to SFINAE error static_assert(foo<int>()); // but this works fine. ``` The issue here is the discrepancy between how a [nested requirement is evaluated](https://github.com/llvm/llvm-project/blob/main/clang/lib/Sema/SemaTemplateInstantiate.cpp#L2331) Vs how a [non-nested requirement is evaluated](https://github.com/llvm/llvm-project/blob/main/clang/lib/Sema/SemaConcept.cpp#L167-L200). This patch makes constraint checking consistent for nested requirement and trailing requires expressions by reusing the same evaluator. Differential Revision: https://reviews.llvm.org/D138914
92 lines
3.7 KiB
C++
92 lines
3.7 KiB
C++
//===--- ASTConcept.cpp - Concepts Related AST Data Structures --*- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
///
|
|
/// \file
|
|
/// \brief This file defines AST data structures related to concepts.
|
|
///
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "clang/AST/ASTConcept.h"
|
|
#include "clang/AST/ASTContext.h"
|
|
#include "clang/AST/Decl.h"
|
|
#include "clang/AST/TemplateBase.h"
|
|
#include "llvm/ADT/ArrayRef.h"
|
|
#include "llvm/ADT/FoldingSet.h"
|
|
using namespace clang;
|
|
|
|
namespace {
|
|
void CreatUnsatisfiedConstraintRecord(
|
|
const ASTContext &C, const UnsatisfiedConstraintRecord &Detail,
|
|
UnsatisfiedConstraintRecord *TrailingObject) {
|
|
if (Detail.second.is<Expr *>())
|
|
new (TrailingObject) UnsatisfiedConstraintRecord{
|
|
Detail.first,
|
|
UnsatisfiedConstraintRecord::second_type(Detail.second.get<Expr *>())};
|
|
else {
|
|
auto &SubstitutionDiagnostic =
|
|
*Detail.second.get<std::pair<SourceLocation, StringRef> *>();
|
|
unsigned MessageSize = SubstitutionDiagnostic.second.size();
|
|
char *Mem = new (C) char[MessageSize];
|
|
memcpy(Mem, SubstitutionDiagnostic.second.data(), MessageSize);
|
|
auto *NewSubstDiag = new (C) std::pair<SourceLocation, StringRef>(
|
|
SubstitutionDiagnostic.first, StringRef(Mem, MessageSize));
|
|
new (TrailingObject) UnsatisfiedConstraintRecord{
|
|
Detail.first, UnsatisfiedConstraintRecord::second_type(NewSubstDiag)};
|
|
}
|
|
}
|
|
} // namespace
|
|
|
|
ASTConstraintSatisfaction::ASTConstraintSatisfaction(
|
|
const ASTContext &C, const ConstraintSatisfaction &Satisfaction)
|
|
: NumRecords{Satisfaction.Details.size()},
|
|
IsSatisfied{Satisfaction.IsSatisfied}, ContainsErrors{
|
|
Satisfaction.ContainsErrors} {
|
|
for (unsigned I = 0; I < NumRecords; ++I)
|
|
CreatUnsatisfiedConstraintRecord(
|
|
C, Satisfaction.Details[I],
|
|
getTrailingObjects<UnsatisfiedConstraintRecord>() + I);
|
|
}
|
|
|
|
ASTConstraintSatisfaction::ASTConstraintSatisfaction(
|
|
const ASTContext &C, const ASTConstraintSatisfaction &Satisfaction)
|
|
: NumRecords{Satisfaction.NumRecords},
|
|
IsSatisfied{Satisfaction.IsSatisfied},
|
|
ContainsErrors{Satisfaction.ContainsErrors} {
|
|
for (unsigned I = 0; I < NumRecords; ++I)
|
|
CreatUnsatisfiedConstraintRecord(
|
|
C, *(Satisfaction.begin() + I),
|
|
getTrailingObjects<UnsatisfiedConstraintRecord>() + I);
|
|
}
|
|
|
|
ASTConstraintSatisfaction *
|
|
ASTConstraintSatisfaction::Create(const ASTContext &C,
|
|
const ConstraintSatisfaction &Satisfaction) {
|
|
std::size_t size =
|
|
totalSizeToAlloc<UnsatisfiedConstraintRecord>(
|
|
Satisfaction.Details.size());
|
|
void *Mem = C.Allocate(size, alignof(ASTConstraintSatisfaction));
|
|
return new (Mem) ASTConstraintSatisfaction(C, Satisfaction);
|
|
}
|
|
|
|
ASTConstraintSatisfaction *ASTConstraintSatisfaction::Rebuild(
|
|
const ASTContext &C, const ASTConstraintSatisfaction &Satisfaction) {
|
|
std::size_t size =
|
|
totalSizeToAlloc<UnsatisfiedConstraintRecord>(Satisfaction.NumRecords);
|
|
void *Mem = C.Allocate(size, alignof(ASTConstraintSatisfaction));
|
|
return new (Mem) ASTConstraintSatisfaction(C, Satisfaction);
|
|
}
|
|
|
|
void ConstraintSatisfaction::Profile(
|
|
llvm::FoldingSetNodeID &ID, const ASTContext &C,
|
|
const NamedDecl *ConstraintOwner, ArrayRef<TemplateArgument> TemplateArgs) {
|
|
ID.AddPointer(ConstraintOwner);
|
|
ID.AddInteger(TemplateArgs.size());
|
|
for (auto &Arg : TemplateArgs)
|
|
Arg.Profile(ID, C);
|
|
}
|