Skip to content

release/19.x: [Clang] Consider outer instantiation scopes for constraint normalization #114951

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
Nov 15, 2024
Merged

release/19.x: [Clang] Consider outer instantiation scopes for constraint normalization #114951

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
2 changes: 1 addition & 1 deletion clang/lib/Sema/SemaConcept.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ static const Expr *SubstituteConstraintExpressionWithoutSatisfaction(
// parameters that the surrounding function hasn't been instantiated yet. Note
// this may happen while we're comparing two templates' constraint
// equivalence.
LocalInstantiationScope ScopeForParameters(S);
LocalInstantiationScope ScopeForParameters(S, /*CombineWithOuterScope=*/true);
if (auto *FD = DeclInfo.getDecl()->getAsFunction())
for (auto *PVD : FD->parameters()) {
if (!PVD->isParameterPack()) {
Expand Down
16 changes: 16 additions & 0 deletions clang/test/SemaTemplate/concepts-out-of-line-def.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,3 +622,19 @@ void A<T>::method(Ts&... ts)
} {}

}

namespace GH114685 {

template <typename T> struct ptr {
template <typename U>
friend ptr<U> make_item(auto &&args)
requires(sizeof(args) > 1);
};

template <typename U>
ptr<U> make_item(auto &&args)
requires(sizeof(args) > 1) {}

ptr<char> p;

} // namespace GH114685
Loading