PR c++/80077 - error with constexpr and -fno-elide-constructors.

	* constexpr.c (cxx_eval_call_expression): Set ctx->call while
	expanding trivial constructor.

From-SVN: r246272

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7d2a56a0df818d13b625feeb01a0dd4d791fe4b2..a7248d93ca37710f2749f90e2eb8a828086b42df 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-19  Jason Merrill  <jason@redhat.com>
+
+       PR c++/80077 - error with constexpr and -fno-elide-constructors.
+       * constexpr.c (cxx_eval_call_expression): Set ctx->call while
+       expanding trivial constructor.
+
 2017-03-17  Jason Merrill  <jason@redhat.com>
 
        PR c++/78345 - ICE initializing array from lambda.

diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 4136b349282f99481e83a8261e616c18d0d88589..3ca35607181043524f1fe779efc380f4c7d99081 100644 (file)
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1478,7 +1478,8 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
          else
            op = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (op)), op);
          tree set = build2 (MODIFY_EXPR, TREE_TYPE (op), op, init);
-         return cxx_eval_constant_expression (ctx, set, lval,
+         new_ctx.call = &new_call;
+         return cxx_eval_constant_expression (&new_ctx, set, lval,
                                               non_constant_p, overflow_p);
        }
     }
@@ -1496,7 +1497,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
     }
 
   /* If in direct recursive call, optimize definition search.  */
-  if (ctx && ctx->call && ctx->call->fundef->decl == fun)
+  if (ctx && ctx->call && ctx->call->fundef && ctx->call->fundef->decl == fun)
     new_call.fundef = ctx->call->fundef;
   else
     {

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-trivial3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-trivial3.C
new file mode 100644 (file)
index 0000000..6833cd3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-trivial3.C
@@ -0,0 +1,6 @@
+// PR c++/80077
+// { dg-do compile { target c++11 } }
+// { dg-options -fno-elide-constructors }
+
+struct X_t { X_t() = default; };
+constexpr X_t x = X_t();