From bb11103a968f860541e589de3d62bd4e8ef7e084 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 3 Nov 2005 12:31:46 +0100 Subject: [PATCH] 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) : Return 0 for an address that can't trap plus a constant integer, if the mode has zero size. From-SVN: r106427 --- gcc/ChangeLog | 6 +++ gcc/rtlanal.c | 4 +- gcc/testsuite/ChangeLog | 4 ++ gcc/testsuite/gcc.dg/delay-slot-1.c | 59 +++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/delay-slot-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fc17cb4da43..2e537361359 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-11-03 Eric Botcazou + + PR rtl-optimization/23585 + * rtlanal.c (rtx_addr_can_trap_p_1) : Return 0 for an address + that can't trap plus a constant integer, if the mode has zero size. + 2005-11-03 Ulrich Weigand PR target/24620 diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index 594b2e47f64..69488512f49 100644 --- 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 e35fcef8b80..3be28a7f91e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-11-03 Eric Botcazou + + * gcc.dg/delay-slot-1.c: New test. + 2005-11-03 Ulrich Weigand 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 index 00000000000..26037551696 --- /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); + } +}