From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 16 Jan 2011 20:20:21 +0000 (+0100)
Subject: backport: re PR debug/46893 (ICE: in trunc_int_for_mode, at explow.c:56 with -O -g)
X-Git-Tag: releases/gcc-4.5.3~304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf49d272dead4891cbee3864ad56032682084167;p=thirdparty%2Fgcc.git

backport: re PR debug/46893 (ICE: in trunc_int_for_mode, at explow.c:56 with -O -g)

	Backport from mainline
	2010-12-16  Jakub Jelinek  <jakub@redhat.com>

	PR debug/46893
	* cfgexpand.c (expand_debug_expr): If GET_MODE (op0) is VOIDmode,
	use TYPE_MODE (TREE_TYPE (tem)) instead of mode1.

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

From-SVN: r168865
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 109c878484c4..d65bebc20198 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2010-12-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/46893
+	* cfgexpand.c (expand_debug_expr): If GET_MODE (op0) is VOIDmode,
+	use TYPE_MODE (TREE_TYPE (tem)) instead of mode1.
+
 	2010-12-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/46804
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 751bcd41c9e0..9cc0432fd9be 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -2578,7 +2578,7 @@ expand_debug_expr (tree exp)
 	    enum machine_mode opmode = GET_MODE (op0);
 
 	    if (opmode == VOIDmode)
-	      opmode = mode1;
+	      opmode = TYPE_MODE (TREE_TYPE (tem));
 
 	    /* This condition may hold if we're expanding the address
 	       right past the end of an array that turned out not to
@@ -2599,7 +2599,8 @@ expand_debug_expr (tree exp)
 				     ? SIGN_EXTRACT
 				     : ZERO_EXTRACT, mode,
 				     GET_MODE (op0) != VOIDmode
-				     ? GET_MODE (op0) : mode1,
+				     ? GET_MODE (op0)
+				     : TYPE_MODE (TREE_TYPE (tem)),
 				     op0, GEN_INT (bitsize), GEN_INT (bitpos));
       }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 442f44631600..fd8d27dc2a47 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2010-12-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/46893
+	* gcc.dg/pr46893.c: New test.
+
 	2010-12-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/46804
diff --git a/gcc/testsuite/gcc.dg/pr46893.c b/gcc/testsuite/gcc.dg/pr46893.c
new file mode 100644
index 000000000000..ef97e2edfd2a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr46893.c
@@ -0,0 +1,13 @@
+/* PR debug/46893 */
+/* { dg-do compile } */
+/* { dg-options "-O -g" } */
+
+void
+foo (void)
+{
+  union { unsigned long long l; double d; } u = { 0x7ff0000000000000ULL };
+  double v = 0, w = -u.d;
+
+  if (w)
+    w = v;
+}