aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/expr.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cda3b57..40c7ddc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-03 Eric Botcazou <ebotcazou@adacore.com>
+
+ PR middle-end/47017
+ * expr.c (expand_expr_real_1) <MEM_REF>: Call memory_address_addr_space
+ instead of convert_memory_address_addr_space on the base expression.
+
2011-01-03 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
* config/spu/spu.c (spu_option_override): Update error text
diff --git a/gcc/expr.c b/gcc/expr.c
index cd32f4f..dfcaefb 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -8731,7 +8731,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
align = MAX (TYPE_ALIGN (TREE_TYPE (exp)),
get_object_alignment (exp, BIGGEST_ALIGNMENT));
op0 = expand_expr (base, NULL_RTX, VOIDmode, EXPAND_SUM);
- op0 = convert_memory_address_addr_space (address_mode, op0, as);
+ op0 = memory_address_addr_space (address_mode, op0, as);
if (!integer_zerop (TREE_OPERAND (exp, 1)))
{
rtx off