aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/cfgexpand.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e198b2b..f577bf0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-08 Joern Rennecke <joern.rennecke@embecosm.com>
+ Richard Biener <rguenther@suse.de>
+
+ * cfgexpand.c (expand_debug_expr) <TARGET_MEM_REF>:
+ Get address space from operand 0 (BASE).
+
2014-10-07 Iain Sandoe <iain@codesourcery.com>
PR target/61387
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index f95981b..5cb96df 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -3983,11 +3983,7 @@ expand_debug_expr (tree exp)
if (!op0)
return NULL;
- if (POINTER_TYPE_P (TREE_TYPE (exp)))
- as = TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (exp)));
- else
- as = ADDR_SPACE_GENERIC;
-
+ as = TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (TREE_OPERAND (exp, 0))));
op0 = convert_debug_memory_address (targetm.addr_space.address_mode (as),
op0, as);
if (op0 == NULL_RTX)