Skip to content

Fix Modules/pr62943.cppm #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2025
Merged

Fix Modules/pr62943.cppm #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions clang/lib/Sema/SemaConcept.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1540,22 +1540,15 @@ void Sema::DiagnoseUnsatisfiedConstraint(
const NormalizedConstraint *Sema::getNormalizedAssociatedConstraints(
ConstrainedDeclOrNestedRequirement ConstrainedDeclOrNestedReq,
ArrayRef<AssociatedConstraint> AssociatedConstraints) {
// In case the ConstrainedDecl comes from modules, it is necessary to use
// the canonical decl to avoid different atomic constraints with the 'same'
// declarations.

if (!ConstrainedDeclOrNestedReq)
return NormalizedConstraint::fromAssociatedConstraints(
*this, nullptr, AssociatedConstraints);

const NamedDecl *ND =
ConstrainedDeclOrNestedReq.dyn_cast<const NamedDecl *>();
if (ND)
ND = cast<NamedDecl>(ND->getCanonicalDecl());

auto CacheEntry = NormalizationCache.find(ConstrainedDeclOrNestedReq);
if (CacheEntry == NormalizationCache.end()) {
auto Normalized = NormalizedConstraint::fromAssociatedConstraints(
auto *Normalized = NormalizedConstraint::fromAssociatedConstraints(
*this, ND, AssociatedConstraints);
CacheEntry =
NormalizationCache.try_emplace(ConstrainedDeclOrNestedReq, Normalized)
Expand Down Expand Up @@ -1795,10 +1788,12 @@ NormalizedConstraint *NormalizedConstraint::fromConstraintExpr(
// constraint. If any such substitution results in an invalid type or
// expression, the program is ill-formed; no diagnostic is required.
// [...]
ConceptDecl *CD = CSE->getNamedConcept();

// Use canonical declarations to merge ConceptDecls across
// different modules.
ConceptDecl *CD = CSE->getNamedConcept()->getCanonicalDecl();
SubNF = NormalizedConstraint::fromAssociatedConstraints(
S, CSE->getNamedConcept(),
AssociatedConstraint(CD->getConstraintExpr(), SubstIndex));
S, CD, AssociatedConstraint(CD->getConstraintExpr(), SubstIndex));

if (!SubNF)
return nullptr;
Expand Down
9 changes: 7 additions & 2 deletions clang/lib/Serialization/ASTReaderStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,15 +802,20 @@ readConstraintSatisfaction(ASTRecordReader &Record) {
if (!Satisfaction.IsSatisfied) {
unsigned NumDetailRecords = Record.readInt();
for (unsigned i = 0; i != NumDetailRecords; ++i) {
if (/* IsDiagnostic */Record.readInt()) {
auto Kind = Record.readInt();
if (Kind == 0) {
SourceLocation DiagLocation = Record.readSourceLocation();
StringRef DiagMessage = C.backupStr(Record.readString());

Satisfaction.Details.emplace_back(
new (C) ConstraintSatisfaction::SubstitutionDiagnostic(
DiagLocation, DiagMessage));
} else
} else if (Kind == 1) {
Satisfaction.Details.emplace_back(Record.readExpr());
} else {
assert(Kind == 2);
Satisfaction.Details.emplace_back(Record.readConceptReference());
}
}
}
return Satisfaction;
Expand Down
18 changes: 12 additions & 6 deletions clang/lib/Serialization/ASTWriterStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,14 +475,20 @@ addConstraintSatisfaction(ASTRecordWriter &Record,
if (!Satisfaction.IsSatisfied) {
Record.push_back(Satisfaction.NumRecords);
for (const auto &DetailRecord : Satisfaction) {
auto *E = dyn_cast<const Expr *>(DetailRecord);
Record.push_back(/* IsDiagnostic */ E == nullptr);
if (E)
Record.AddStmt(const_cast<Expr *>(E));
else {
auto *Diag = cast<std::pair<SourceLocation, StringRef> *>(DetailRecord);
if (auto *Diag =
dyn_cast<std::pair<SourceLocation, StringRef> *>(DetailRecord)) {
Record.push_back(/*Kind=*/0);
Record.AddSourceLocation(Diag->first);
Record.AddString(Diag->second);
continue;
}
if (auto *E = dyn_cast<const Expr *>(DetailRecord)) {
Record.push_back(/*Kind=*/1);
Record.AddStmt(const_cast<Expr *>(E));
} else {
Record.push_back(/*Kind=*/2);
auto *CR = cast<const ConceptReference *>(DetailRecord);
Record.AddConceptReference(CR);
}
}
}
Expand Down