File tree Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Original file line number Diff line number Diff 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) {
Original file line number Diff line number Diff 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.
You can’t perform that action at this time.
0 commit comments