2014-06-24 Richard Biener <rguenther@suse.de>

	PR tree-optimization/61572
	* tree-ssa-sink.c (statement_sink_location): Do not sink
	loads from hard registers.

	* gcc.target/i386/pr61572.c: New testcase.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b82e84021fb155d443342d6a2dedbb0a07c6aee0..15e16bf877fdd42b60e4059da1e29e23770bdb3c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-24  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/61572
+       * tree-ssa-sink.c (statement_sink_location): Do not sink
+       loads from hard registers.
+
 2014-06-24  Jakub Jelinek  <jakub@redhat.com>
 
        * gimplify.c (gimplify_omp_for): For #pragma omp for simd iterator

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 279d4ee29cede607da669b8fb24d7e1f2069d04e..9bd9a21da43ca7d1a5e7b4a294409f6095e0e524 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-24  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/61572
+       * gcc.target/i386/pr61572.c: New testcase.
+
 2014-06-24  Jakub Jelinek  <jakub@redhat.com>
 
        * gfortran.dg/gomp/udr2.f90 (f7, f9): Add !$omp parallel with

diff --git a/gcc/testsuite/gcc.target/i386/pr61572.c b/gcc/testsuite/gcc.target/i386/pr61572.c
new file mode 100644 (file)
index 0000000..3456333
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr61572.c
@@ -0,0 +1,46 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+struct autofs_sb_info
+{
+  int exp_timeout;
+};
+void *f;
+int g;
+static int fn1 (struct autofs_sb_info *p1)
+{
+  int a, b;
+  a = (
+       {
+       register __typeof__(0) c
+#if defined __x86_64__
+       asm("rdx")
+#endif
+       ;
+       b = c;
+       int d;
+       __typeof__(0) e;
+       e = p1->exp_timeout / 1000;
+       switch (0)
+       default:
+       asm("" : "=a"(d) : "0"(e), ""(0));
+       d;
+       });
+  if (a)
+    return 1;
+  if (b)
+    p1->exp_timeout = 0;
+  return 0;
+}
+
+int fn2 ()
+{
+  struct autofs_sb_info *h = f;
+  switch (g)
+    {
+      case 0 ?:
+0 : return fn1 (h);
+      default:
+    return 0;
+    }
+}

diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c
index f7485ef0efa1554501a99f31b4553f50c8cb3156..fb7310dd11433bcac0712c01482b7dd25d03eb79 100644 (file)
--- a/gcc/tree-ssa-sink.c
+++ b/gcc/tree-ssa-sink.c
@@ -374,6 +374,12 @@ statement_sink_location (gimple stmt, basic_block frombb,
         nearest to commondom.  */
       if (gimple_vuse (stmt))
        {
+         /* Do not sink loads from hard registers.  */
+         if (gimple_assign_single_p (stmt)
+             && TREE_CODE (gimple_assign_rhs1 (stmt)) == VAR_DECL
+             && DECL_HARD_REGISTER (gimple_assign_rhs1 (stmt)))
+           return false;
+
          imm_use_iterator imm_iter;
          use_operand_p use_p;
          basic_block found = NULL;