re PR rtl-optimization/51821 (64bit > 32bit conversion produces incorrect results...

	PR rtl-optimization/51821
	* recog.c (peep2_find_free_register): Determine clobbered registers
	from insn pattern.

testsuite/ChangeLog:

	PR rtl-optimization/51821
	* gcc.dg/pr51821.c: New test.

From-SVN: r183200

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2343769cc51c9f15fa82875cce6b1fbb08b651d0..c6f4672e32f21cf50ffd06cc0bcad5550ac3c5f7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,12 @@
+2012-01-15  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR rtl-optimization/51821
+       * recog.c (peep2_find_free_register): Determine clobbered registers
+       from insn pattern.
+
 2012-01-09  Richard Sandiford  <rdsandiford@googlemail.com>
 
-       * config/mips/mips.md (loadgp_newabi_<mode>): Add missing
-       earlyclobber.
+       * config/mips/mips.md (loadgp_newabi_<mode>): Add missing earlyclobber.
 
 2011-12-21  Uros Bizjak  <ubizjak@gmail.com>
 
@@ -16,7 +21,6 @@
 2011-12-09  Kazu Hirata  <kazu@codesourcery.com>
 
        Backport from mainline:
-
        2011-12-05  Kazu Hirata  <kazu@codesourcery.com>
 
        PR target/51408

diff --git a/gcc/recog.c b/gcc/recog.c
index 70370e3ad81619d4cc67c64fc4e1f70f5d80aff3..587ad1b092a6892811ddfda52dd2fd5479165d19 100644 (file)
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -2933,6 +2933,7 @@ peep2_find_free_register (int from, int to, const char *class_str,
   static int search_ofs;
   enum reg_class cl;
   HARD_REG_SET live;
+  df_ref *def_rec;
   int i;
 
   gcc_assert (from < MAX_INSNS_PER_PEEP2 + 1);
@@ -2950,13 +2951,15 @@ peep2_find_free_register (int from, int to, const char *class_str,
 
   while (from != to)
     {
-      HARD_REG_SET this_live;
+      gcc_assert (peep2_insn_data[from].insn != NULL_RTX);
+
+      /* Don't use registers set or clobbered by the insn.  */
+      for (def_rec = DF_INSN_DEFS (peep2_insn_data[from].insn);
+          *def_rec; def_rec++)
+       SET_HARD_REG_BIT (live, DF_REF_REGNO (*def_rec));
 
       if (++from >= MAX_INSNS_PER_PEEP2 + 1)
        from = 0;
-      gcc_assert (peep2_insn_data[from].insn != NULL_RTX);
-      REG_SET_TO_HARD_REG_SET (this_live, peep2_insn_data[from].live_before);
-      IOR_HARD_REG_SET (live, this_live);
     }
 
   cl = (class_str[0] == 'r' ? GENERAL_REGS

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6bcd073a0e58b9ba61cebaaea6ab7d6651985335..088b119e308c90b70fb44b37b397442a597b60d6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,7 +1,11 @@
+2012-01-15  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR rtl-optimization/51821
+       * gcc.dg/pr51821.c: New test.
+
 2011-12-09  Kazu Hirata  <kazu@codesourcery.com>
 
        Backport from mainline:
-
        2011-12-05  Kazu Hirata  <kazu@codesourcery.com>
 
        PR target/51408

diff --git a/gcc/testsuite/gcc.dg/pr51821.c b/gcc/testsuite/gcc.dg/pr51821.c
new file mode 100644 (file)
index 0000000..e7ba409
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr51821.c
@@ -0,0 +1,24 @@
+/* { dg-do run } */
+/* { dg-options "-O2 -msse" { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-require-effective-target sse_runtime { target { i?86-*-* x86_64-*-* } } } */
+
+extern void abort (void);
+
+unsigned int  __attribute__((noinline))
+test (int shift_size)
+{
+  unsigned long long res = ~0;
+
+  return res << shift_size;
+}
+
+int
+main ()
+{
+  int dst = 32;
+
+  if (test (dst) != 0)
+    abort ();
+
+  return 0;
+}