re PR c++/92414 (internal compiler error: tree check: expected constructor, have...

	PR c++/92414
	* constexpr.c (cxx_eval_outermost_constant_expr): If DECL_INITIAL
	on object is erroneous, return t without trying to evaluate
	a constexpr dtor.

	* g++.dg/cpp2a/constexpr-dtor4.C: New test.

From-SVN: r278468

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2313a824b488e98d316f2cf7f7de823d7061c2c5..0d78df6db2b853ffd62ea64960b05f0250e3ab7c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-11-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/92414
+       * constexpr.c (cxx_eval_outermost_constant_expr): If DECL_INITIAL
+       on object is erroneous, return t without trying to evaluate
+       a constexpr dtor.
+
 2019-11-12  Jason Merrill  <jason@redhat.com>
 
        * call.c (same_fn_or_template): Change to cand_parms_match.

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 8c79b0484fce444fd1341cd7c0cb9e917bcf7674..9ce768bb2e6882211a760c4196baca84f5a66f92 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -5834,6 +5834,8 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
          gcc_assert (object && VAR_P (object));
          gcc_assert (DECL_DECLARED_CONSTEXPR_P (object));
          gcc_assert (DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (object));
+         if (error_operand_p (DECL_INITIAL (object)))
+           return t;
          ctx.ctor = unshare_expr (DECL_INITIAL (object));
          TREE_READONLY (ctx.ctor) = false;
          /* Temporarily force decl_really_constant_value to return false

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fc275fa0a7ffa02f5a8e56aa5a06dea377a24b7a..2cc8db5717097d61fae4af336afadd9474ff5c76 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,9 +1,14 @@
+2019-11-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/92414
+       * g++.dg/cpp2a/constexpr-dtor4.C: New test.
+
 2019-11-19  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
 
        * gcc.target/mips/msa-ds.c: New test.
 
 2019-11-19  Richard Sandiford  <richard.sandiford@arm.com>
-gcc/
+
        Revert:
        2019-11-18  Richard Sandiford  <richard.sandiford@arm.com>
 

diff --git a/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor4.C b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor4.C
new file mode 100644 (file)
index 0000000..68ad69c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/constexpr-dtor4.C
@@ -0,0 +1,15 @@
+// PR c++/92414
+// { dg-do compile { target c++2a } }
+
+struct A { virtual void foo (); };
+
+struct B : A {
+  constexpr B (int);   // { dg-warning "used but never defined" }
+  constexpr ~B () { }
+};
+
+struct D : B {
+  constexpr D () : B (42) { }  // { dg-error "used before its definition" }
+};
+
+constexpr D d; // { dg-message "in 'constexpr' expansion of" }