expmed.c (emit_store_flag_1): Fix choice of zero vs.

2009-07-11  Paolo Bonzini  <bonzini@gnu.org>

	* expmed.c (emit_store_flag_1): Fix choice of zero vs. sign extension.

2009-07-11  Paolo Bonzini  <bonzini@gnu.org>

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

From-SVN: r149509

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8cf7745a012f98d4b8645fa6b7a3b01532f7df49..3e626352ec126caac5e9cb8ac8f3ee1111198d8a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-11  Paolo Bonzini  <bonzini@gnu.org>
+
+       * expmed.c (emit_store_flag_1): Fix choice of zero vs. sign extension.
+
 2009-07-10  DJ Delorie  <dj@redhat.com>
 
        * config/mep/mep.c (mep_can_inline_p): Correct logic, and simplify.

diff --git a/gcc/expmed.c b/gcc/expmed.c
index aa8d02d0e83a3354f762b1faf6de4d7bae8c3d09..c73bf21f67107a9738b5e9ea330927b3ac6d739f 100644 (file)
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -5343,7 +5343,7 @@ emit_store_flag_1 (rtx target, enum rtx_code code, rtx op0, rtx op1,
            target = gen_reg_rtx (target_mode);
 
          convert_move (target, tem,
-                       0 == (STORE_FLAG_VALUE
+                       0 == ((normalizep ? normalizep : STORE_FLAG_VALUE)
                              & ((HOST_WIDE_INT) 1
                                 << (GET_MODE_BITSIZE (word_mode) -1))));
          return target;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a29bd83b4dc0967f8b7b66843871a728f1673dc6..7a477b3b9b62cbf284877909065787560d4036b1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-11  Paolo Bonzini  <bonzini@gnu.org>
+
+       * gcc.c-torture/execute/20090711-1.c: New test.
+
 2009-07-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
        PR testsuite/40699

diff --git a/gcc/testsuite/gcc.c-torture/execute/20090711-1.c b/gcc/testsuite/gcc.c-torture/execute/20090711-1.c
new file mode 100644 (file)
index 0000000..5c3d93a
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20090711-1.c
@@ -0,0 +1,21 @@
+/* Used to be miscompiled at -O0 due to incorrect choice of sign extension
+   vs. zero extension.  __attribute__ ((noinline)) added to try to make it
+   fail at higher optimization levels too.  */
+
+extern void abort (void);
+
+long long __attribute__ ((noinline))
+div (long long val)
+{
+  return val / 32768;
+}
+
+int main (void)
+{
+  long long d1 = -990000000;
+  long long d2 = div(d1);
+  if (d2 != -30212)
+    abort ();
+  return 0;
+}
+