From b4351367ce259b2ce74ba16a7c2437641a7d8d2a Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 28 Jul 2010 07:44:34 +0000 Subject: [PATCH] re PR middle-end/44790 (Bootstrap fails after MEM-REF merge) PR middle-end/44790 PR middle-end/44993 * expr.c (expand_expr_real_1) : Revert latest change. Make sure the base has address_mode before adding the offset. From-SVN: r162618 --- gcc/ChangeLog | 8 ++++++++ gcc/expr.c | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1d0b5356c66..2ec44035826 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,12 @@ +2010-07-28 Eric Botcazou + + PR middle-end/44790 + PR middle-end/44993 + * expr.c (expand_expr_real_1) : Revert latest change. Make + sure the base has address_mode before adding the offset. + 2010-07-27 Xinliang David Li + * tree-flow.h (create_mem_ref): Add one new parameter. * tree-ssa-address.c (create_mem_ref): New parameter. (addr_to_parts): Ditto. diff --git a/gcc/expr.c b/gcc/expr.c index 57f9eff859b..a27dfd8e4ab 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -8730,11 +8730,14 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode, base = build2 (BIT_AND_EXPR, TREE_TYPE (base), gimple_assign_rhs1 (def_stmt), gimple_assign_rhs2 (def_stmt)); + op0 = expand_expr (base, NULL_RTX, VOIDmode, EXPAND_NORMAL); + op0 = convert_memory_address_addr_space (address_mode, op0, as); if (!integer_zerop (TREE_OPERAND (exp, 1))) - base = build2 (POINTER_PLUS_EXPR, TREE_TYPE (base), - base, double_int_to_tree (sizetype, - mem_ref_offset (exp))); - op0 = expand_expr (base, NULL_RTX, address_mode, EXPAND_SUM); + { + rtx off + = immed_double_int_const (mem_ref_offset (exp), address_mode); + op0 = simplify_gen_binary (PLUS, address_mode, op0, off); + } op0 = memory_address_addr_space (mode, op0, as); temp = gen_rtx_MEM (mode, op0); set_mem_attributes (temp, exp, 0);