i386.c (ix86_expand_int_movcc): If overlap between out and comparison sequence has...

	* config/i386/i386.c (ix86_expand_int_movcc): If overlap between
	out and comparison sequence has been detected, put result into
	proper temporary pseudo.

	* gcc.c-torture/execute/20010422-1.c: New test.

From-SVN: r41536

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5d310632b7a36a21f208c2f88dff76d1a5315955..e22d747c2cef6809d51f98dab317afa8405517a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-25  Jakub Jelinek  <jakub@redhat.com>
+
+       * config/i386/i386.c (ix86_expand_int_movcc): If overlap between
+       out and comparison sequence has been detected, put result into
+       proper temporary pseudo.
+
 2001-04-24  Zack Weinberg  <zackw@stanford.edu>
 
        * Makefile.in (LIB2FUNCS): Remove _varargs and __dummy.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 163b36e5f4d0790e1d3bdcfff79f915bee49f870..5e5b5a56d78b44f94669bb1f189a9a338632840d 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6279,7 +6279,7 @@ ix86_expand_int_movcc (operands)
               * Size 5 - 8.
               */
              if (ct)
-               emit_insn (gen_addsi3 (out, out, GEN_INT (ct)));
+               emit_insn (gen_addsi3 (tmp, tmp, GEN_INT (ct)));
            }
          else if (cf == -1)
            {
@@ -6290,7 +6290,7 @@ ix86_expand_int_movcc (operands)
               *
               * Size 8.
               */
-             emit_insn (gen_iorsi3 (out, out, GEN_INT (ct)));
+             emit_insn (gen_iorsi3 (tmp, tmp, GEN_INT (ct)));
            }
          else if (diff == -1 && ct)
            {
@@ -6304,7 +6304,7 @@ ix86_expand_int_movcc (operands)
               */
              emit_insn (gen_one_cmplsi2 (tmp, tmp));
              if (cf)
-               emit_insn (gen_addsi3 (out, out, GEN_INT (cf)));
+               emit_insn (gen_addsi3 (tmp, tmp, GEN_INT (cf)));
            }
          else
            {
@@ -6316,10 +6316,10 @@ ix86_expand_int_movcc (operands)
               *
               * Size 8 - 11.
               */
-             emit_insn (gen_andsi3 (out, out, GEN_INT (trunc_int_for_mode
+             emit_insn (gen_andsi3 (tmp, tmp, GEN_INT (trunc_int_for_mode
                                                        (cf - ct, SImode))));
              if (ct)
-               emit_insn (gen_addsi3 (out, out, GEN_INT (ct)));
+               emit_insn (gen_addsi3 (tmp, tmp, GEN_INT (ct)));
            }
 
          if (tmp != out)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0f0f2504d4a939058855814df8a8dad60b125dc..d53a32e1c9d46f3e67d8e4c0801652f4bb231fc8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-25  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.c-torture/execute/20010422-1.c: New test.
+
 2001-04-25  Nathan Sidwell  <nathan@codesourcery.com>
 
        * g++.old-deja/g++.ns/type2.C: New test.

diff --git a/gcc/testsuite/gcc.c-torture/execute/20010422-1.c b/gcc/testsuite/gcc.c-torture/execute/20010422-1.c
new file mode 100644 (file)
index 0000000..5c6bccc
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20010422-1.c
@@ -0,0 +1,15 @@
+unsigned int foo(unsigned int x)
+{
+  if (x < 5)
+    x = 4;
+  else
+    x = 8;
+  return x;
+}
+
+int main(void)
+{
+  if (foo (8) != 8)
+    abort ();
+  exit (0);
+}