diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gimplify.c | 17 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/zero-strct-3.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/zero-strct-4.c | 14 |
5 files changed, 56 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1f447375cb..4b77bfd1c3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2005-08-16 Andrew Pinski <pinskia@physics.uc.edu> + + PR tree-opt/23402 + * gimplify.c (zero_sized_type): New function. + (gimplify_modify_expr_rhs): If we have a zero sized type, + replace the statement with an empty statement. + 2005-08-16 H.J. Lu <hongjiu.lu@intel.com> * config/i386/crtfastmath.c (set_fast_math): Add "=m" for diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 41ca3b3bbb2..a4ff3d23a2c 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -2533,6 +2533,17 @@ zero_sized_field_decl (tree fdecl) return false; } +/* Return true if TYPE is zero sized. */ + +static bool +zero_sized_type (tree type) +{ + if (AGGREGATE_TYPE_P (type) && TYPE_SIZE (type) + && integer_zerop (TYPE_SIZE (type))) + return true; + return false; +} + /* A subroutine of gimplify_init_constructor. Generate individual MODIFY_EXPRs for a CONSTRUCTOR. OBJECT is the LHS against which the assignments should happen. ELTS is the CONSTRUCTOR_ELTS of the @@ -2949,6 +2960,12 @@ gimplify_modify_expr_rhs (tree *expr_p, tree *from_p, tree *to_p, tree *pre_p, tree *post_p, bool want_value) { enum gimplify_status ret = GS_OK; + tree type = TREE_TYPE (*from_p); + if (zero_sized_type (type)) + { + *expr_p = NULL_TREE; + return GS_ALL_DONE; + } while (ret != GS_UNHANDLED) switch (TREE_CODE (*from_p)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 96be244e0c2..b7e41c6487d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2005-08-16 Andrew Pinski <pinskia@physics.uc.edu> + + PR tree-opt/23402 + * gcc.c-torture/compile/zero-strct-3.c: New test. + * gcc.c-torture/compile/zero-strct-4.c: New test. + 2005-08-16 Steven Bosscher <stevenb@suse.de> PR target/23376 diff --git a/gcc/testsuite/gcc.c-torture/compile/zero-strct-3.c b/gcc/testsuite/gcc.c-torture/compile/zero-strct-3.c new file mode 100644 index 00000000000..31bc328d06c --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/zero-strct-3.c @@ -0,0 +1,12 @@ +typedef struct {} spinlock_t; +struct sk_buff_head { + int i; + spinlock_t lock; +}; +struct sk_buff_head audit_skb_queue; +void audit_init(void) +{ + struct sk_buff_head *list = &audit_skb_queue; + spinlock_t a = {}; + audit_skb_queue.lock = a; +} diff --git a/gcc/testsuite/gcc.c-torture/compile/zero-strct-4.c b/gcc/testsuite/gcc.c-torture/compile/zero-strct-4.c new file mode 100644 index 00000000000..4a5889f80f3 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/zero-strct-4.c @@ -0,0 +1,14 @@ +typedef struct {} raw_spinlock_t; +typedef struct { + raw_spinlock_t raw_lock; +} spinlock_t; +struct sk_buff_head { + int i; + spinlock_t lock; +}; +struct sk_buff_head audit_skb_queue; +void audit_init(void) +{ + struct sk_buff_head *list = &audit_skb_queue; + audit_skb_queue.lock = (spinlock_t) { .raw_lock = { } }; +} |