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

PR c++/79797 - ICE with self-reference in array DMI. 

* constexpr.c (lookup_placeholder): Split out...
	(cxx_eval_constant_expression): ...from here.

From-SVN: r245986
This commit is contained in:
Jason Merrill 2017-03-08 20:01:18 -05:00 committed by Jason Merrill
parent ad807dcbd9
commit 89262ec6bd
3 changed files with 56 additions and 21 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-03-08 Jason Merrill <jason@redhat.com>
PR c++/79797 - ICE with self-reference in array DMI.
* constexpr.c (lookup_placeholder): Split out...
(cxx_eval_constant_expression): ...from here.
2017-03-07 Jakub Jelinek <jakub@redhat.com>
PR c/79834

59
gcc/cp/constexpr.c
View File

@ -3827,6 +3827,35 @@ cxx_eval_switch_expr (const constexpr_ctx *ctx, tree t,
return NULL_TREE;
}
/* Find the object of TYPE under initialization in CTX. */
static tree
lookup_placeholder (const constexpr_ctx *ctx, bool lval, tree type)
{
if (!ctx || !ctx->ctor || (lval && !ctx->object))
return NULL_TREE;
/* We could use ctx->object unconditionally, but using ctx->ctor when we
can is a minor optimization. */
if (!lval && same_type_p (TREE_TYPE (ctx->ctor), type))
return ctx->ctor;
/* Since an object cannot have a field of its own type, we can search outward
from ctx->object to find the unique containing object of TYPE. */
tree ob = ctx->object;
while (ob)
{
if (same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (ob), type))
break;
if (handled_component_p (ob))
ob = TREE_OPERAND (ob, 0);
else
ob = NULL_TREE;
}
return ob;
}
/* Attempt to reduce the expression T to a constant value.
On failure, issue diagnostic and return error_mark_node. */
/* FIXME unify with c_fully_fold */
@ -4468,27 +4497,15 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
break;
case PLACEHOLDER_EXPR:
if (!ctx || !ctx->ctor || (lval && !ctx->object)
|| !(same_type_ignoring_top_level_qualifiers_p
(TREE_TYPE (t), TREE_TYPE (ctx->ctor))))
{
/* A placeholder without a referent. We can get here when
checking whether NSDMIs are noexcept, or in massage_init_elt;
just say it's non-constant for now. */
gcc_assert (ctx->quiet);
*non_constant_p = true;
break;
}
else
{
/* Use of the value or address of the current object. We could
use ctx->object unconditionally, but using ctx->ctor when we
can is a minor optimization. */
tree ctor = lval ? ctx->object : ctx->ctor;
return cxx_eval_constant_expression
(ctx, ctor, lval,
non_constant_p, overflow_p);
}
/* Use of the value or address of the current object. */
if (tree ctor = lookup_placeholder (ctx, lval, TREE_TYPE (t)))
return cxx_eval_constant_expression (ctx, ctor, lval,
non_constant_p, overflow_p);
/* A placeholder without a referent. We can get here when
checking whether NSDMIs are noexcept, or in massage_init_elt;
just say it's non-constant for now. */
gcc_assert (ctx->quiet);
*non_constant_p = true;
break;
case EXIT_EXPR:

12
gcc/testsuite/g++.dg/cpp1y/nsdmi-aggr7.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/79797
// { dg-do compile { target c++14 } }
struct A
{
A* x[1]{(A*)this};
};
extern constexpr A a{};
#define SA(X) static_assert ((X), #X)
SA (a.x[0] == &a);