From: DJ Delorie <dj@redhat.com>
Date: Thu, 12 Jan 2012 21:37:03 +0000 (-0500)
Subject: cfgexpand.c (convert_debug_memory_address): Allow any valid pointer type, not just... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=639d4bb87cd62a6b136ba653cc3e8fddec4f0fd6;p=gcc.git

cfgexpand.c (convert_debug_memory_address): Allow any valid pointer type, not just the default pointer type.

* cfgexpand.c (convert_debug_memory_address): Allow any valid
pointer type, not just the default pointer type.

From-SVN: r183141
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 837387da832..60830ae9436 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12  DJ Delorie  <dj@redhat.com>
+
+	* cfgexpand.c (convert_debug_memory_address): Allow any valid
+	pointer type, not just the default pointer type.
+
 2012-01-09  Richard Henderson  <rth@redhat.com>
 	    Denis Chertykov  <chertykov@gmail.com>
 
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 2b2e464791c..579c3cde011 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -2493,10 +2493,8 @@ convert_debug_memory_address (enum machine_mode mode, rtx x,
   gcc_assert (xmode == mode || xmode == VOIDmode);
 #else
   rtx temp;
-  enum machine_mode address_mode = targetm.addr_space.address_mode (as);
-  enum machine_mode pointer_mode = targetm.addr_space.pointer_mode (as);
 
-  gcc_assert (mode == address_mode || mode == pointer_mode);
+  gcc_assert (targetm.addr_space.valid_pointer_mode (mode, as));
 
   if (GET_MODE (x) == mode || GET_MODE (x) == VOIDmode)
     return x;