OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/79639 (ICE with -O and constexpr)

Browse Source 
PR c++/79639
	* constexpr.c (cxx_eval_store_expression): If *valp is a PTRMEM_CST,
	call cplus_expand_constant on it first.

	* g++.dg/cpp1y/constexpr-79639.C: New test.

From-SVN: r245635
This commit is contained in:
Jakub Jelinek 2017-02-21 18:48:57 +01:00 committed by Jakub Jelinek
parent 956d3e61a0
commit 664beaf2c1
4 changed files with 41 additions and 4 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 @@
2017-02-21 Jakub Jelinek <jakub@redhat.com>
PR c++/79639
* constexpr.c (cxx_eval_store_expression): If *valp is a PTRMEM_CST,
call cplus_expand_constant on it first.
2017-02-19 Jason Merrill <jason@redhat.com> 2017-02-19 Jason Merrill <jason@redhat.com>
PR c++/78139 - destructor needed by new-expression PR c++/78139 - destructor needed by new-expression

7
gcc/cp/constexpr.c
View File

@ -3517,10 +3517,11 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t,
wants to modify it. */ wants to modify it. */
if (*valp == NULL_TREE) if (*valp == NULL_TREE)
{ {
*valp = new_ctx.ctor = build_constructor (type, NULL); *valp = build_constructor (type, NULL);
CONSTRUCTOR_NO_IMPLICIT_ZERO (new_ctx.ctor) = no_zero_init; CONSTRUCTOR_NO_IMPLICIT_ZERO (*valp) = no_zero_init;
} }
else else if (TREE_CODE (*valp) == PTRMEM_CST)
*valp = cplus_expand_constant (*valp);
new_ctx.ctor = *valp; new_ctx.ctor = *valp;
new_ctx.object = target; new_ctx.object = target;
} }

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2017-02-21 Jakub Jelinek <jakub@redhat.com> 2017-02-21 Jakub Jelinek <jakub@redhat.com>
PR c++/79639
* g++.dg/cpp1y/constexpr-79639.C: New test.
PR target/79633 PR target/79633
* gcc.target/i386/mpx/pr79633.c: New test. * gcc.target/i386/mpx/pr79633.c: New test.

27
gcc/testsuite/g++.dg/cpp1y/constexpr-79639.C Normal file
View File

@ -0,0 +1,27 @@
// PR c++/79639
// { dg-do compile { target c++14 } }
struct A
{
void foo () {}
void bar () {}
};
typedef void (A::*T) ();
constexpr T
foo (T f)
{
f = 0;
return f;
}
constexpr T
bar (T f)
{
f = &A::bar;
return f;
}
constexpr T a = foo (&A::foo);
constexpr T b = foo (&A::foo);
static_assert (a == nullptr, "");