From: amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 8 Oct 2014 12:33:43 +0000 (+0000)
Subject:         * cfgexpand.c (expand_debug_expr) <TARGET_MEM_REF>:
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27628c9e7fbdcf862d8e74888a44351495ae108e;p=thirdparty%2Fgcc.git

    * cfgexpand.c (expand_debug_expr) <TARGET_MEM_REF>:
        Get address space from operand 0 (BASE).


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216000 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e198b2bf30cf..f577bf0ae98c 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 f95981be6b66..5cb96df037fb 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)