From 96a4ef9d6a40af1df81b3a2ec1574c31bdba2213 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 23 Mar 2016 14:23:04 -0400 Subject: [PATCH] re PR c++/70344 (ICE on invalid code at -O1 and above on x86_64-linux-gnu in record_reference, at cgraphbuild.c:64) PR c++/70344 * constexpr.c (cxx_eval_call_expression): Catch invalid recursion. From-SVN: r234434 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/constexpr.c | 15 +++++++++++++++ .../g++.dg/cpp0x/constexpr-recursion2.C | 17 +++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-recursion2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d36168957ca..01fc2bd7657 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2016-03-23 Jason Merrill + + PR c++/70344 + * constexpr.c (cxx_eval_call_expression): Catch invalid recursion. + 2016-03-23 Marek Polacek PR c++/69884 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 7b136330b3f..d71e488d5e0 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1239,6 +1239,21 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, return t; } + if (fun == current_function_decl) + { + /* A call to the current function, i.e. + constexpr int f (int i) { + constexpr int j = f(i-1); + return j; + } + This would be OK without the constexpr on the declaration of j. */ + if (!ctx->quiet) + error_at (loc, "%qD called in a constant expression before its " + "definition is complete", fun); + *non_constant_p = true; + return t; + } + constexpr_ctx new_ctx = *ctx; if (DECL_CONSTRUCTOR_P (fun) && !ctx->object && TREE_CODE (t) == AGGR_INIT_EXPR) diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion2.C new file mode 100644 index 00000000000..978b998afeb --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-recursion2.C @@ -0,0 +1,17 @@ +// PR c++/70344 +// { dg-do compile { target c++11 } } + +struct Z +{ + Z () = default; + Z (Z const &) = default; + constexpr Z (Z &&) {} +}; + +constexpr int +fn (Z v) +{ + return fn (v); +} + +auto t = fn (Z ()); -- 2.30.2