Fix the non-termplate case

Author: cor3ntin

clang/lib/AST/Decl.cpp

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

clang/test/SemaCXX/cxx2b-consteval-propagate.cpp

@@ -501,19 +501,30 @@ namespace GH112677 {
 
 class ConstEval {
  public:
-  consteval ConstEval(int); // expected-note {{declared here}}
+  consteval ConstEval(int); // expected-note 2{{declared here}}
 };
 
-struct B {
+struct TemplateCtor {
     ConstEval val;
     template <class Anything = int> constexpr
-    B(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
+    TemplateCtor(int arg) : val(arg) {} // expected-note {{undefined constructor 'ConstEval'}}
 };
-struct C : B {
-    using B::B; // expected-note {{in call to 'B<int>(0)'}}
+struct C : TemplateCtor {
+    using TemplateCtor::TemplateCtor; // expected-note {{in call to 'TemplateCtor<int>(0)'}}
 };
 
 C c(0); // expected-note{{in implicit initialization for inherited constructor of 'C'}}
-// expected-error@-1 {{call to immediate function 'GH112677::C::B' is not a constant expression}}
+// expected-error@-1 {{call to immediate function 'GH112677::C::TemplateCtor' is not a constant expression}}
+
+struct SimpleCtor { constexpr SimpleCtor(int) {}};
+struct D : SimpleCtor {
+    int y = 10;
+    ConstEval x = y; // expected-note {{undefined constructor 'ConstEval'}}
+    using SimpleCtor::SimpleCtor;
+    //expected-note@-1 {{'SimpleCtor' is an immediate constructor because the default initializer of 'x' contains a call to a consteval constructor 'ConstEval' and that call is not a constant expression}}
+};
+
+D d(0); // expected-note {{in implicit initialization for inherited constructor of 'D'}}
+// expected-error@-1 {{call to immediate function 'GH112677::D::SimpleCtor' is not a constant expression}}
 
 }