diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2010-07-28 07:44:34 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2010-07-28 07:44:34 +0000 |
| commit | b4351367ce259b2ce74ba16a7c2437641a7d8d2a (patch) | |
| tree | ba48970086fccf74bc08fdd978c74b3120c72141 /gcc | |
| parent | 51680dfb0286dbacb62c112f8c09f3ebea4b2750 (diff) | |
| download | gcc-b4351367ce259b2ce74ba16a7c2437641a7d8d2a.zip gcc-b4351367ce259b2ce74ba16a7c2437641a7d8d2a.tar.gz gcc-b4351367ce259b2ce74ba16a7c2437641a7d8d2a.tar.bz2 | |
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) <MEM_REF>: Revert latest change. Make
sure the base has address_mode before adding the offset.
From-SVN: r162618
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/expr.c | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1d0b535..2ec4403 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,12 @@ +2010-07-28 Eric Botcazou <ebotcazou@adacore.com> + + PR middle-end/44790 + PR middle-end/44993 + * expr.c (expand_expr_real_1) <MEM_REF>: Revert latest change. Make + sure the base has address_mode before adding the offset. + 2010-07-27 Xinliang David Li <davidxl@google.com> + * tree-flow.h (create_mem_ref): Add one new parameter. * tree-ssa-address.c (create_mem_ref): New parameter. (addr_to_parts): Ditto. @@ -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); |