diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6fd14490f2..e293ad04a95 100644
--- 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 54f22468400..fbd301b67d1 100644
--- 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