diff options
| author | Richard Guenther <rguenther@suse.de> | 2010-07-07 12:43:38 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2010-07-07 12:43:38 +0000 |
| commit | 0ee95c437f66aaad025b4a46490ef17e32e729ad (patch) | |
| tree | e95c41a2882b861f19c23029d218aecd8fe899ca /gcc | |
| parent | 86353474a05912dbee5593dd3a90de9d3219a54a (diff) | |
| download | gcc-0ee95c437f66aaad025b4a46490ef17e32e729ad.zip gcc-0ee95c437f66aaad025b4a46490ef17e32e729ad.tar.gz gcc-0ee95c437f66aaad025b4a46490ef17e32e729ad.tar.bz2 | |
re PR middle-end/44790 (Bootstrap fails after MEM-REF merge)
2010-07-07 Richard Guenther <rguenther@suse.de>
PR middle-end/44790
* expr.c (expand_expr_real_1): Go the POINTER_PLUS_EXPR path
for expanding the constant offset for MEM_REFs.
From-SVN: r161907
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/expr.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e6c3f21..3fccd83 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2010-07-07 Richard Guenther <rguenther@suse.de> + PR middle-end/44790 + * expr.c (expand_expr_real_1): Go the POINTER_PLUS_EXPR path + for expanding the constant offset for MEM_REFs. + +2010-07-07 Richard Guenther <rguenther@suse.de> + * tree-ssa-propagate.h (valid_gimple_call_p): Remove. * tree-ssa-propagate.c (valid_gimple_call_p): Make static. Fix. * gimple.h (is_gimple_operand): Remove. @@ -8777,13 +8777,11 @@ 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, address_mode, EXPAND_NORMAL); if (!integer_zerop (TREE_OPERAND (exp, 1))) - { - rtx off; - off = immed_double_int_const (mem_ref_offset (exp), address_mode); - op0 = simplify_gen_binary (PLUS, address_mode, op0, off); - } + 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); op0 = memory_address_addr_space (mode, op0, as); temp = gen_rtx_MEM (mode, op0); set_mem_attributes (temp, exp, 0); |