expr.c (expand_expr_real_1): Use mode of memory reference rather than mode of address...

        * expr.c (expand_expr_real_1): Use mode of memory reference rather
        than mode of address computation when calling memory_address_addr_space.

From-SVN: r204044

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6fd14490f2e629b94c80c7945513dc75bf8e10a..e293ad04a9535fab6065b329d9a09cb2ec0fab35 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-24  Igor Shevlyakov  <igor.shevlyakov@gmail.com>
+
+       * expr.c (expand_expr_real_1): Use mode of memory reference rather
+       than mode of address computation when calling memory_address_addr_space.
+
 2013-08-24  Richard Henderson  <rth@twiddle.net>
 
        PR rtl/58542

diff --git a/gcc/expr.c b/gcc/expr.c
index 54f22468400a7dd89bca29869311feb2f882ca2d..fbd301b67d1d61c2900e66846d44dac88cc2ac2d 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -9642,7 +9642,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
          }
        align = get_object_alignment (exp);
        op0 = expand_expr (base, NULL_RTX, VOIDmode, EXPAND_SUM);
-       op0 = memory_address_addr_space (address_mode, op0, as);
+       op0 = memory_address_addr_space (mode, op0, as);
        if (!integer_zerop (TREE_OPERAND (exp, 1)))
          {
            rtx off