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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6c3f21d5c59fd9a9c08afae2a9481cc1a15ce50..3fccd832d2aa95d8992df8842511e2fe777e4c7b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/expr.c b/gcc/expr.c
index a43d708f2735f6cad2935db72e792916fbca1f85..00ebfdc6429221955ae4d124d44c90895b9bbc60 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -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);