From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 16 Jan 2011 20:27:54 +0000 (+0100)
Subject: backport: re PR target/47201 (ICE: SIGSEGV in adjust_mems (var-tracking.c:814) with... 
X-Git-Tag: releases/gcc-4.5.3~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e6d734480c6c6d4b5f359a076c782c1d5a0d67e;p=thirdparty%2Fgcc.git

backport: re PR target/47201 (ICE: SIGSEGV in adjust_mems (var-tracking.c:814) with -O -fPIC -g)

	Backport from mainline
	2011-01-07  Jakub Jelinek  <jakub@redhat.com>

	PR target/47201
	* config/i386/i386.c (ix86_delegitimize_address): If
	simplify_gen_subreg fails, return orig_x.

	* gcc.dg/pr47201.c: New test.

From-SVN: r168870
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5caac14b75f9..86e15db5cd91 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2011-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/47201
+	* config/i386/i386.c (ix86_delegitimize_address): If
+	simplify_gen_subreg fails, return orig_x.
+
 	2011-01-06  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/47150
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e60a4c3bf83b..cfb3e22a578c 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -11038,7 +11038,11 @@ ix86_delegitimize_address (rtx x)
 	return orig_x;
       x = XVECEXP (XEXP (x, 0), 0, 0);
       if (GET_MODE (orig_x) != Pmode)
-	return simplify_gen_subreg (GET_MODE (orig_x), x, Pmode, 0);
+	{
+	  x = simplify_gen_subreg (GET_MODE (orig_x), x, Pmode, 0);
+	  if (x == NULL_RTX)
+	    return orig_x;
+	}
       return x;
     }
 
@@ -11107,7 +11111,11 @@ ix86_delegitimize_address (rtx x)
 	return orig_x;
     }
   if (GET_MODE (orig_x) != Pmode && MEM_P (orig_x))
-    return simplify_gen_subreg (GET_MODE (orig_x), result, Pmode, 0);
+    {
+      result = simplify_gen_subreg (GET_MODE (orig_x), result, Pmode, 0);
+      if (result == NULL_RTX)
+	return orig_x;
+    }
   return result;
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 648fa5d0f626..3e9e0a06b81f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2011-01-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/47201
+	* gcc.dg/pr47201.c: New test.
+
 	2011-01-06  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/47150
diff --git a/gcc/testsuite/gcc.dg/pr47201.c b/gcc/testsuite/gcc.dg/pr47201.c
new file mode 100644
index 000000000000..11e1f2ade3a3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr47201.c
@@ -0,0 +1,18 @@
+/* PR target/47201 */
+/* { dg-do compile } */
+/* { dg-options "-O -fpic -g" { target fpic } } */
+
+union U
+{
+  __UINTPTR_TYPE__ m;
+  float d;
+} u;
+
+int
+foo (void)
+{
+  union U v = {
+    (__UINTPTR_TYPE__)&u
+  };
+  return u.d == v.d;
+}