aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2008-02-04 21:18:32 +0000
committerRichard Guenther <rguenther@suse.de>2008-02-04 21:18:32 +0000
commit7c4113f9e001d8bcfb596dd200e1a42456caa0a4 (patch)
tree1c4ad7aecc9a52bcd5edd2acbe583dacca7ff081 /gcc
parent54d9b64511e2bd488dd4af44b902a1093db36599 (diff)
2008-02-04 Richard Guenther <rguenther@suse.de>
PR middle-end/33631 * expr.c (count_type_elements): Give for unions instead of guessing. * gcc.c-torture/execute/pr33631.c: New testcase. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@132096 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/expr.c9
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/execute/pr33631.c14
4 files changed, 26 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1665f9e1afa..4f81c248b22 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2008-02-04 Richard Guenther <rguenther@suse.de>
+ PR middle-end/33631
+ * expr.c (count_type_elements): Give for unions instead of
+ guessing.
+
+2008-02-04 Richard Guenther <rguenther@suse.de>
+
PR middle-end/35043
* gimplify.c (gimplify_init_ctor_eval): Convert array indices
to TYPE_DOMAINs base type instead of using bitsizetype here.
diff --git a/gcc/expr.c b/gcc/expr.c
index 53cb3eb9d2c..ade0396f817 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -4975,14 +4975,7 @@ count_type_elements (const_tree type, bool allow_flexarr)
case UNION_TYPE:
case QUAL_UNION_TYPE:
- {
- /* Ho hum. How in the world do we guess here? Clearly it isn't
- right to count the fields. Guess based on the number of words. */
- HOST_WIDE_INT n = int_size_in_bytes (type);
- if (n < 0)
- return -1;
- return n / UNITS_PER_WORD;
- }
+ return -1;
case COMPLEX_TYPE:
return 2;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1be9baf30c6..d1b8a5d0ee8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2008-02-04 Richard Guenther <rguenther@suse.de>
+ PR middle-end/33631
+ * gcc.c-torture/execute/pr33631.c: New testcase.
+
+2008-02-04 Richard Guenther <rguenther@suse.de>
+
PR middle-end/35043
* gcc.c-torture/compile/pr35043.c: New testcase.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr33631.c b/gcc/testsuite/gcc.c-torture/execute/pr33631.c
new file mode 100644
index 00000000000..840fd0dc482
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr33631.c
@@ -0,0 +1,14 @@
+typedef union
+{
+ int __lock;
+} pthread_mutex_t;
+
+extern void abort (void);
+
+int main()
+{
+ struct { int c; pthread_mutex_t m; } r = { .m = 0 };
+ if (r.c != 0)
+ abort ();
+ return 0;
+}