diff options
| author | Patrick Palka <ppalka@redhat.com> | 2021-01-08 10:11:25 -0500 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2021-01-08 10:11:25 -0500 |
| commit | bb1f0b50abbfa01e0ed720a5225a11aa7af32a89 (patch) | |
| tree | 886628713cacc3c072c090e3b42db7a5f5e5f10d /gcc | |
| parent | 98a1fb705ead9258642f2dec0431f11508a9b13c (diff) | |
| download | gcc-bb1f0b50abbfa01e0ed720a5225a11aa7af32a89.zip gcc-bb1f0b50abbfa01e0ed720a5225a11aa7af32a89.tar.gz gcc-bb1f0b50abbfa01e0ed720a5225a11aa7af32a89.tar.bz2 | |
c++: ICE with constexpr call that returns a PMF [PR98551]
We shouldn't do replace_result_decl after evaluating a call that returns
a PMF because PMF temporaries aren't wrapped in a TARGET_EXPR (and so we
can't trust ctx->object), and PMF initializers can't be self-referential
anyway, so replace_result_decl would always be a no-op.
To that end, this patch changes the relevant AGGREGATE_TYPE_P test to
CLASS_TYPE_P, which should rule out PMFs (as well as arrays, which we
can't return and therefore won't see here). This fixes an ICE from the
sanity check in replace_result_decl in the below testcase during
constexpr evaluation of the call f() in the initializer g(f()).
gcc/cp/ChangeLog:
PR c++/98551
* constexpr.c (cxx_eval_call_expression): Check CLASS_TYPE_P
instead of AGGREGATE_TYPE_P before calling replace_result_decl.
gcc/testsuite/ChangeLog:
PR c++/98551
* g++.dg/cpp0x/constexpr-pmf2.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/constexpr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-pmf2.C | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 4a5e638..9dddc53 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -2790,7 +2790,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, /* Rewrite all occurrences of the function's RESULT_DECL with the current object under construction. */ if (!*non_constant_p && ctx->object - && AGGREGATE_TYPE_P (TREE_TYPE (res)) + && CLASS_TYPE_P (TREE_TYPE (res)) && !is_empty_class (TREE_TYPE (res))) if (replace_result_decl (&result, res, ctx->object)) cacheable = false; diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-pmf2.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-pmf2.C new file mode 100644 index 0000000..a76e712a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-pmf2.C @@ -0,0 +1,9 @@ +// PR c++/98551 +// { dg-do compile { target c++11 } } + +struct A {}; +struct B { int t(); }; +using pmf = decltype(&B::t); +constexpr pmf f() { return &B::t; } +constexpr A g(pmf) { return {}; }; +constexpr A x = g(f()); |