From: vmakarov <vmakarov@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 28 Nov 2014 19:33:35 +0000 (+0000)
Subject: 2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c77a06afdf9b2181d0534429c52f465245599d43;p=thirdparty%2Fgcc.git

2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>

	PR target/64061
	* lra.c (lra_substitute_pseudo): Ignore constant with int mode for
	subreg.

2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>

	PR target/64061
	* gcc.target/i386/pr64061.c: New.



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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b8f8dbe8bbed..92e0af5dff72 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR target/64061
+	* lra.c (lra_substitute_pseudo): Ignore constant with int mode for
+	subreg.
+
 2014-11-28  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	PR target/64093
diff --git a/gcc/lra.c b/gcc/lra.c
index ec122c7762fa..653506315012 100644
--- a/gcc/lra.c
+++ b/gcc/lra.c
@@ -1806,7 +1806,8 @@ lra_substitute_pseudo (rtx *loc, int old_regno, rtx new_reg)
       machine_mode mode = GET_MODE (*loc);
       machine_mode inner_mode = GET_MODE (new_reg);
 
-      if (mode != inner_mode)
+      if (mode != inner_mode
+	  && ! (CONST_INT_P (new_reg) && SCALAR_INT_MODE_P (mode)))
 	{
 	  if (GET_MODE_SIZE (mode) >= GET_MODE_SIZE (inner_mode)
 	      || ! SCALAR_INT_MODE_P (inner_mode))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 39aa1789e430..31bcf5cd6837 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR target/64061
+	* gcc.target/i386/pr64061.c: New.
+
 2014-11-28  Marek Polacek  <polacek@redhat.com>
 
 	* c-c++-common/ubsan/shift-8.c: New test.
@@ -5,7 +10,7 @@
 2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR rtl-optimization/64087
-	*  gcc.dg/pr64087.c: New.
+	* gcc.dg/pr64087.c: New.
 
 2014-11-28  H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/gcc/testsuite/gcc.target/i386/pr64061.c b/gcc/testsuite/gcc.target/i386/pr64061.c
new file mode 100644
index 000000000000..5794d06bbda4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr64061.c
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -g -fno-dce -fno-tree-dce" } */
+
+extern void *buf;
+
+extern void bar (void);
+
+int
+foo (int i)
+{
+  int j = 0;
+  if (__builtin_setjmp (buf) == 0)
+    {
+      while (1)
+      {
+        j = 1;
+	  bar ();
+	  }
+    }
+  return j ? i : 0;
+}