re PR rtl-optimization/23585 (mem_fun* code fine with -O1, bus error with -O2)

	PR rtl-optimization/23585
	* rtlanal.c (rtx_addr_can_trap_p_1) <PLUS>: Return 0 for an address
	that can't trap plus a constant integer, if the mode has zero size.

From-SVN: r106427

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc17cb4da4355a59ac2dc8d5c93ca27ada97b6cf..2e537361359f8a8b782947fb145ab8ff3c838238 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-03  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       PR rtl-optimization/23585
+       * rtlanal.c (rtx_addr_can_trap_p_1) <PLUS>: Return 0 for an address
+       that can't trap plus a constant integer, if the mode has zero size.
+
 2005-11-03  Ulrich Weigand  <uweigand@de.ibm.com>
 
        PR target/24620

diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 594b2e47f64308d43b14fadfe69e128d62bcf403..69488512f49320f25720208555a6ea6c1598f7ae 100644 (file)
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -267,7 +267,9 @@ rtx_addr_can_trap_p_1 (rtx x, enum machine_mode mode, bool unaligned_mems)
        {
          HOST_WIDE_INT offset;
 
-         if (!STRICT_ALIGNMENT || !unaligned_mems)
+         if (!STRICT_ALIGNMENT
+             || !unaligned_mems
+             || GET_MODE_SIZE (mode) == 0)
            return 0;
 
          offset = INTVAL (XEXP (x, 1));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e35fcef8b80a2f3e92e0f3c13ef9b0c3fdab95d4..3be28a7f91ed39c32c52fa441af83d5cd08d59f5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-03  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * gcc.dg/delay-slot-1.c: New test.
+
 2005-11-03  Ulrich Weigand  <uweigand@de.ibm.com>
 
        PR target/24620

diff --git a/gcc/testsuite/gcc.dg/delay-slot-1.c b/gcc/testsuite/gcc.dg/delay-slot-1.c
new file mode 100644 (file)
index 0000000..2603755
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/delay-slot-1.c
@@ -0,0 +1,59 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-options "-O2 -mabi=64" { target mips-*-linux } } */
+
+struct offset_v1 {
+    int k_uniqueness;
+};
+
+struct offset_v2 {
+ long v;
+} __attribute__ ((__packed__));
+
+struct reiserfs_key {
+    int k_objectid;
+    union {
+ struct offset_v1 k_offset_v1;
+ struct offset_v2 k_offset_v2;
+    } u;
+};
+
+struct item_head
+{
+ struct reiserfs_key ih_key;
+ int ih_version;
+};
+
+static void set_offset_v2_k_type(struct offset_v2 *v2)
+{
+    v2->v &= 1;
+}
+
+static void set_le_key_k_type (int version, struct reiserfs_key * key)
+{
+    version ? (key->u.k_offset_v1.k_uniqueness = 1)
+           : set_offset_v2_k_type(&(key->u.k_offset_v2));
+}
+
+static void set_le_ih_k_type (struct item_head * ih)
+{
+    set_le_key_k_type((__builtin_constant_p((ih)->ih_version) ? (ih)->ih_version : (ih)->ih_version), &(ih->ih_key));
+}
+
+void boo(struct item_head *ih, const char *body);
+
+void direct2indirect(void)
+{
+    struct item_head *p_le_ih;
+    struct item_head ind_ih;
+    unsigned int unfm_ptr;
+
+    if (__builtin_expect(32, 0)) __asm__ ("break");
+
+    set_le_ih_k_type (&ind_ih);
+
+    if (__builtin_constant_p(p_le_ih) ? 1 : 2) {
+        (__builtin_constant_p(__builtin_constant_p(1) == 1));
+      boo(&ind_ih, (char *)&unfm_ptr);
+    }
+}