From 27628c9e7fbdcf862d8e74888a44351495ae108e Mon Sep 17 00:00:00 2001 From: amylaar Date: Wed, 8 Oct 2014 12:33:43 +0000 Subject: [PATCH] * cfgexpand.c (expand_debug_expr) : Get address space from operand 0 (BASE). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216000 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/cfgexpand.c | 6 +----- 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 + Richard Biener + + * cfgexpand.c (expand_debug_expr) : + Get address space from operand 0 (BASE). + 2014-10-07 Iain Sandoe 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) -- 2.7.4