mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 20:01:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/92695 (P1064R0 - virtual constexpr fails if object taken from array)

Browse Source 
PR c++/92695
	* constexpr.c (cxx_eval_constant_expression) <case OBJ_TYPE_REF>: Use
	STRIP_NOPS before checking for ADDR_EXPR.

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

From-SVN: r278912
This commit is contained in:
Jakub Jelinek 2019-12-02 22:33:06 +01:00 committed by Jakub Jelinek
parent 871a8fab25
commit 3a0bd58fac
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2019-12-02 Jakub Jelinek <jakub@redhat.com>
PR c++/92695
* constexpr.c (cxx_eval_constant_expression) <case OBJ_TYPE_REF>: Use
STRIP_NOPS before checking for ADDR_EXPR.
2019-11-29 Jakub Jelinek <jakub@redhat.com>
PR c++/60228

1
gcc/cp/constexpr.c
View File

@ -5548,6 +5548,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
tree obj = OBJ_TYPE_REF_OBJECT (t);
obj = cxx_eval_constant_expression (ctx, obj, lval, non_constant_p,
overflow_p);
STRIP_NOPS (obj);
/* We expect something in the form of &x.D.2103.D.2094; get x. */
if (TREE_CODE (obj) != ADDR_EXPR
|| !DECL_P (get_base_address (TREE_OPERAND (obj, 0))))

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2019-12-02 Jakub Jelinek <jakub@redhat.com>
PR c++/92695
* g++.dg/cpp2a/constexpr-virtual15.C: New test.
2019-12-02 Richard Sandiford <richard.sandiford@arm.com>
PR middle-end/92741

7
gcc/testsuite/g++.dg/cpp2a/constexpr-virtual15.C Normal file
View File

@ -0,0 +1,7 @@
// PR c++/92695
// { dg-do compile { target c++2a } }
struct A { virtual int get() = 0; };
struct B : A { constexpr int get() override { return 10; } };
struct D { B b[2]; A* c{&(b[0])}; };
static_assert(D{}.c->get() == 10);