Skip to content

R
riscv-gcc-1
Commit 69e09400 by Jason Merrill Committed by Jason Merrill
Options

* constexpr.c (cxx_eval_outermost_constant_expr): Tweak. 

From-SVN: r216809
parent 3a21b777
Showing with 6 additions and 2 deletions
gcc/cp/ChangeLog
2014-10-28 Jason Merrill <jason@redhat.com>
* constexpr.c (cxx_eval_outermost_constant_expr): Tweak.
2014-10-28 Andrew MacLeod <amacleod@redhat.com>
* call.c: Adjust include files.
......
gcc/cp/constexpr.c
......@@ -2756,8 +2756,6 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
hash_map<tree,tree> map;
ctx.values = &map;
tree type = initialized_type (t);
if (!object && TREE_CODE (t) == TARGET_EXPR)
object = TARGET_EXPR_SLOT (t);
tree r = t;
if (AGGREGATE_TYPE_P (type) || VECTOR_TYPE_P (type))
{
......@@ -2770,6 +2768,8 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant,
initialized. */
ctx.ctor = build_constructor (type, NULL);
CONSTRUCTOR_NO_IMPLICIT_ZERO (ctx.ctor) = true;
if (!object && TREE_CODE (t) == TARGET_EXPR)
object = TARGET_EXPR_SLOT (t);
ctx.object = object;
if (object)
gcc_assert (same_type_ignoring_top_level_qualifiers_p
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment