Skip to content

Commit 620a853

Browse files
committed
wip
1 parent 7eaab85 commit 620a853

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

clang/include/clang/Sema/Sema.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13074,7 +13074,7 @@ class Sema final : public SemaBase {
1307413074
auto *FD = dyn_cast<FunctionDecl>(DC);
1307513075
S.PushFunctionScope();
1307613076
S.PushExpressionEvaluationContext(
13077-
(FD && FD->isConsteval())
13077+
(FD && FD->isImmediateFunction())
1307813078
? ExpressionEvaluationContext::ImmediateFunctionContext
1307913079
: ExpressionEvaluationContext::PotentiallyEvaluated);
1308013080
if (FD) {

clang/lib/AST/Decl.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3285,10 +3285,9 @@ bool FunctionDecl::isImmediateEscalating() const {
32853285
return true;
32863286

32873287
if (auto *CD = dyn_cast<CXXConstructorDecl>(this);
3288-
CD && CD->isInheritingConstructor())
3289-
return CD->getInheritedConstructor()
3290-
.getConstructor()
3291-
->isImmediateEscalating();
3288+
CD && CD->isInheritingConstructor() &&
3289+
CD->getInheritedConstructor().getConstructor()->isImmediateEscalating())
3290+
return true;
32923291

32933292
// - a function that results from the instantiation of a templated entity
32943293
// defined with the constexpr specifier.

0 commit comments

Comments
 (0)