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 17e6ee7..82562db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-08 Josh Conner <jconner@apple.com>
+
+ PR c++/23180
+ * expr.c (expand_expr_addr_expr_1): Don't invoke
+ expand_simple_binop for EXPAND_INITIALIZER.
+
2005-09-08 Richard Henderson <rth@redhat.com>
PR debug/23190
diff --git a/gcc/expr.c b/gcc/expr.c
index ff6adec..50886bc 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -6338,7 +6338,7 @@ expand_expr_addr_expr_1 (tree exp, rtx target, enum machine_mode tmode,
result = convert_memory_address (tmode, result);
tmp = convert_memory_address (tmode, tmp);
- if (modifier == EXPAND_SUM)
+ if (modifier == EXPAND_SUM || modifier == EXPAND_INITIALIZER)
result = gen_rtx_PLUS (tmode, result, tmp);
else
{