wip

Author: cor3ntin

clang/include/clang/Sema/Sema.h

@@ -13074,7 +13074,7 @@ class Sema final : public SemaBase {
       auto *FD = dyn_cast<FunctionDecl>(DC);
       S.PushFunctionScope();
       S.PushExpressionEvaluationContext(
-          (FD && FD->isConsteval())
+          (FD && FD->isImmediateFunction())
               ? ExpressionEvaluationContext::ImmediateFunctionContext
               : ExpressionEvaluationContext::PotentiallyEvaluated);
       if (FD) {

clang/lib/AST/Decl.cpp

@@ -3285,10 +3285,10 @@ bool FunctionDecl::isImmediateEscalating() const {
     return true;
 
   if (auto *CD = dyn_cast<CXXConstructorDecl>(this);
-      CD && CD->isInheritingConstructor())
-    return CD->getInheritedConstructor()
+      CD && CD->isInheritingConstructor() && CD->getInheritedConstructor()
         .getConstructor()
-        ->isImmediateEscalating();
+        ->isImmediateEscalating())
+      return true;
 
   // - a function that results from the instantiation of a templated entity
   // defined with the constexpr specifier.

clang/lib/AST/TextNodeDumper.cpp

@@ -306,8 +306,8 @@ void TextNodeDumper::Visit(const Decl *D) {
       OS << " constexpr";
     if (FD->isConsteval())
       OS << " consteval";
-    else if (FD->isImmediateFunction())
-      OS << " immediate";
+    //else if (FD->isImmediateFunction())
+    //  OS << " immediate";
     if (FD->isMultiVersion())
       OS << " multiversion";
   }