From 835b616d29442abde09ffe9f5899189ccb50e87e Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Sat, 6 Oct 2007 11:47:51 +0000 Subject: [PATCH] re PR tree-optimization/33655 (ICE in bitfield_overlaps_p, at tree-sra.c:2901) gcc/ChangeLog: PR tree-optimization/33655 * tree-sra.c (bitfield_overlaps_p): Handle array and complex elements. gcc/testsuite/ChangeLog: PR tree-optimization/33655 * gcc.dg/torture/pr33655.c: New. From-SVN: r129052 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr33655.c | 14 ++++++++++++++ gcc/tree-sra.c | 5 +++++ 4 files changed, 30 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr33655.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index db4e33e8873..4534268ebd6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-10-06 Alexandre Oliva + + PR tree-optimization/33655 + * tree-sra.c (bitfield_overlaps_p): Handle array and complex + elements. + 2007-10-06 Alexandre Oliva PR tree-optimization/33572 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5ce628947e5..70326245c70 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-10-06 Alexandre Oliva + + PR tree-optimization/33655 + * gcc.dg/torture/pr33655.c: New. + 2007-10-06 Alexandre Oliva PR tree-optimization/33572 diff --git a/gcc/testsuite/gcc.dg/torture/pr33655.c b/gcc/testsuite/gcc.dg/torture/pr33655.c new file mode 100644 index 00000000000..2f9da65aec4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr33655.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +typedef struct { + unsigned long attr; + int chars[2]; +} cchar_t; +typedef struct _win_st { + cchar_t _bkgrnd; +} WINDOW; +void render_char(WINDOW *win, cchar_t ch) +{ + if ((ch).chars[0] == L' ' + && (ch).chars[1] == L'\0') + win->_bkgrnd = ch; +} diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index ff7a52c1a76..764f70b0631 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -2897,6 +2897,11 @@ bitfield_overlaps_p (tree blen, tree bpos, struct sra_elt *fld, flen = fold_convert (bitsizetype, TREE_OPERAND (fld->element, 1)); fpos = fold_convert (bitsizetype, TREE_OPERAND (fld->element, 2)); } + else if (TREE_CODE (fld->element) == INTEGER_CST) + { + flen = fold_convert (bitsizetype, TYPE_SIZE (fld->type)); + fpos = size_binop (MULT_EXPR, flen, fld->element); + } else gcc_unreachable (); -- 2.30.2