* loop.c (express_from_1): Fix CONSTANT_P(a) case.

	* gcc.c-torture/compile/20010903-1.c: New test.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 312b2e0..a7ce66e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-03  Jakub Jelinek  <jakub@redhat.com>
+
+       * loop.c (express_from_1): Fix CONSTANT_P(a) case.
+
 2001-09-03  Richard Henderson  <rth@redhat.com>
 
        * function.h (struct function): Add arg_pointer_save_area_init.

diff --git a/gcc/loop.c b/gcc/loop.c
index 5fbe667..e72f421 100644 (file)
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -6371,7 +6371,7 @@ express_from_1 (a, b, mult)
     }
   else if (CONSTANT_P (a))
     {
-      return simplify_gen_binary (MINUS, GET_MODE (b) != VOIDmode ? GET_MODE (b) : GET_MODE (a), const0_rtx, a);
+      return simplify_gen_binary (MINUS, GET_MODE (b) != VOIDmode ? GET_MODE (b) : GET_MODE (a), b, a);
     }
   else if (GET_CODE (b) == PLUS)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 405b0e0..b76142b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-03  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.c-torture/compile/20010903-1.c: New test.
+
 2001-08-31  Roman Zippel  <zippel@linux-m68k.org>
 
        * testsuite/gcc.c-torture/execute/ieee/ieee.exp: Add -ffloat-store

diff --git a/gcc/testsuite/gcc.c-torture/compile/20010903-1.c b/gcc/testsuite/gcc.c-torture/compile/20010903-1.c
new file mode 100644 (file)
index 0000000..8e519f2
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20010903-1.c
@@ -0,0 +1,28 @@
+struct A {
+  long a;
+};
+
+static inline void foo(struct A *x)
+{
+  __asm__ __volatile__("" : "+m"(x->a) : "r"(x) : "memory", "cc");
+}
+
+static inline void bar(struct A *x)
+{
+  foo(x);
+}
+
+struct B { char buf[640]; struct A a; };
+struct B b[32];
+
+int baz(void)
+{
+  int i;
+  struct B *j;
+  for (i = 1; i < 32; i++)
+    {
+      j = &b[i];
+      bar(&j->a);
+    }
+  return 0;
+}