From: James E Wilson <wilson@specifixinc.com>
Date: Tue, 9 Oct 2007 04:55:17 +0000 (+0000)
Subject: re PR tree-optimization/33655 (ICE in bitfield_overlaps_p, at tree-sra.c:2901)
X-Git-Tag: releases/gcc-4.3.0~2148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8df9c702e68f7d493e39883145e03f947ce6e437;p=thirdparty%2Fgcc.git

re PR tree-optimization/33655 (ICE in bitfield_overlaps_p, at tree-sra.c:2901)

PR tree-optimization/33655
PR middle-end/22156
* tree-sra.c (bitfield_overlaps_p): When fld->element is INTEGER_CST,
convert it to bitsizetype before size_binop call.

From-SVN: r129152
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d275fbb437df..03230d1eebe3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-09  James E. Wilson  <wilson@specifix.com>
+
+	PR tree-optimization/33655
+	PR middle-end/22156
+	* tree-sra.c (bitfield_overlaps_p): When fld->element is INTEGER_CST,
+	convert it to bitsizetype before size_binop call.
+
 2007-10-09  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR tree-optimization/33572
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index f8b4470562e4..21da0c0a2980 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2906,7 +2906,8 @@ bitfield_overlaps_p (tree blen, tree bpos, struct sra_elt *fld,
   else if (TREE_CODE (fld->element) == INTEGER_CST)
     {
       flen = fold_convert (bitsizetype, TYPE_SIZE (fld->type));
-      fpos = size_binop (MULT_EXPR, flen, fld->element);
+      fpos = fold_convert (bitsizetype, fld->element);
+      fpos = size_binop (MULT_EXPR, flen, fpos);
     }
   else
     gcc_unreachable ();