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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129052 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db4e33e..4534268 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-06  Alexandre Oliva  <aoliva@redhat.com>
 
+       PR tree-optimization/33655
+       * tree-sra.c (bitfield_overlaps_p): Handle array and complex
+       elements.
+
+2007-10-06  Alexandre Oliva  <aoliva@redhat.com>
+
        PR tree-optimization/33572
        * tree-cfg.c (verify_stmts): Check for missing PHI defs.
        * tree-inline.c (update_ssa_across_eh_edges): Renamed to...

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ce6289..7032624 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2007-10-06  Alexandre Oliva  <aoliva@redhat.com>
 
+       PR tree-optimization/33655
+       * gcc.dg/torture/pr33655.c: New.
+
+2007-10-06  Alexandre Oliva  <aoliva@redhat.com>
+
        PR tree-optimization/33572
        * g++.dg/torture/pr33572.C: New.
 

diff --git a/gcc/testsuite/gcc.dg/torture/pr33655.c b/gcc/testsuite/gcc.dg/torture/pr33655.c
new file mode 100644 (file)
index 0000000..2f9da65
--- /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 ff7a52c..764f70b 100644 (file)
--- 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 ();