re PR c++/83734 (ice in cxx_eval _statement_list, at cp/constexpr.c:3869)

	PR c++/83734
	* constexpr.c (cxx_eval_statement_list): Ignore DEBUG_BEGIN_STMTs
	in STATEMENT_LIST.  Remove unneeded assert.

	* g++.dg/cpp0x/pr83734.C: New test.

From-SVN: r256397

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 73a31dfcf75cf322311065ce204ac2eea659962f..54860dc278eaea0d60499fcc103748a81d2c49af 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/83734
+       * constexpr.c (cxx_eval_statement_list): Ignore DEBUG_BEGIN_STMTs
+       in STATEMENT_LIST.  Remove unneeded assert.
+
 2018-01-03  Richard Sandiford  <richard.sandiford@linaro.org>
            Alan Hayward  <alan.hayward@arm.com>
            David Sherwood  <david.sherwood@arm.com>

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index c91ca960df4fdc62deef45876e9979b48279ba44..b216e090b45386d961f5303a35dd04a01d320f7f 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -3851,6 +3851,8 @@ cxx_eval_statement_list (const constexpr_ctx *ctx, tree t,
   for (i = tsi_start (t); !tsi_end_p (i); tsi_next (&i))
     {
       tree stmt = tsi_stmt (i);
+      if (TREE_CODE (stmt) == DEBUG_BEGIN_STMT)
+       continue;
       r = cxx_eval_constant_expression (ctx, stmt, false,
                                        non_constant_p, overflow_p,
                                        jump_target);
@@ -3859,14 +3861,6 @@ cxx_eval_statement_list (const constexpr_ctx *ctx, tree t,
       if (returns (jump_target) || breaks (jump_target))
        break;
     }
-  /* Make sure we don't use the "result" of a debug-only marker.  That
-     would be wrong.  We should be using the result of the previous
-     statement, or NULL if there isn't one.  In practice, this should
-     never happen: the statement after the marker should override the
-     result of the marker, so its value shouldn't survive in R.  Now,
-     should that ever change, we'll need some fixing here to stop
-     markers from modifying the generated executable code.  */
-  gcc_checking_assert (!r || TREE_CODE (r) != DEBUG_BEGIN_STMT);
   return r;
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4515cfa1f896a8473aae937dcac639e63f2b038b..7d148177c2939834ebabe399d99041bb15112327 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/83734
+       * g++.dg/cpp0x/pr83734.C: New test.
+
 2017-01-09 Carl Love  <cel@us.ibm.com>
 
        * gcc.target/powerpc/builtins-1.c (main): Add tests for vec_mergee and

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr83734.C b/gcc/testsuite/g++.dg/cpp0x/pr83734.C
new file mode 100644 (file)
index 0000000..958c2e9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr83734.C
@@ -0,0 +1,6 @@
+// PR c++/83734
+// { dg-do compile { target c++11 } }
+// { dg-options "-g -O2" }
+
+struct A { constexpr A () { typedef int T; } };
+A a;