aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/stor-layout.c7
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr50009.c6
4 files changed, 17 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b5bc6c..0c3c5af 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2011-08-18 Jakub Jelinek <jakub@redhat.com>
+ PR target/50009
+ * stor-layout.c (update_alignment_for_field): Don't ICE on
+ packed flexible array members if ms_bitfield_layout_p.
+
PR target/50092
* config/i386/i386.c (assign_386_stack_local): Call validize_mem
on the result before returning it.
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index e488741..f15da0c 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -1,7 +1,7 @@
/* C-compiler utilities for types and variables storage layout
Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1996, 1998,
- 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011 Free Software Foundation, Inc.
This file is part of GCC.
@@ -935,7 +935,8 @@ update_alignment_for_field (record_layout_info rli, tree field,
applies if there was an immediately prior, nonzero-size
bitfield. (That's the way it is, experimentally.) */
if ((!is_bitfield && !DECL_PACKED (field))
- || (!integer_zerop (DECL_SIZE (field))
+ || ((DECL_SIZE (field) == NULL_TREE
+ || !integer_zerop (DECL_SIZE (field)))
? !DECL_PACKED (field)
: (rli->prev_field
&& DECL_BIT_FIELD_TYPE (rli->prev_field)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 76e8554..99345f3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2011-08-18 Jakub Jelinek <jakub@redhat.com>
+ PR target/50009
+ * gcc.c-torture/compile/pr50009.c: New test.
+
PR target/50092
* gcc.dg/torture/pr50092.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr50009.c b/gcc/testsuite/gcc.c-torture/compile/pr50009.c
new file mode 100644
index 0000000..ade170c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr50009.c
@@ -0,0 +1,6 @@
+/* PR target/50009 */
+
+struct S {
+ short a;
+ short b[];
+} __attribute__((packed));