aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Sema/SemaConcept.cpp
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2024-11-21 12:55:29 +0000
committerDimitry Andric <dim@FreeBSD.org>2024-11-21 12:55:29 +0000
commitf65bf063bcac0dcdca7d3b7b865e29c837566543 (patch)
tree2b5bd79e99c9aeed4082427ad8ae0f70b8852d6c /clang/lib/Sema/SemaConcept.cpp
parentefdccd8358633400f927c74be0f7969bda1b3775 (diff)
Vendor import of llvm-project branch release/19.x llvmorg-19.1.4-0-gaadaa00de76e, a.k.a. 19.1.4 release.vendor/llvm-project/llvmorg-19.1.4-0-gaadaa00de76e
Diffstat (limited to 'clang/lib/Sema/SemaConcept.cpp')
-rw-r--r--clang/lib/Sema/SemaConcept.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaConcept.cpp b/clang/lib/Sema/SemaConcept.cpp
index 244f6ef2f53f..c45443d76e6b 100644
--- a/clang/lib/Sema/SemaConcept.cpp
+++ b/clang/lib/Sema/SemaConcept.cpp
@@ -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()) {