From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 20 Oct 2010 21:17:30 +0000 (+0000)
Subject: 	PR tree-optimization/45919
X-Git-Tag: upstream/4.9.2~25592
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4938e520e063b0f1274dc118b2ee07fd9a7e605d;p=platform%2Fupstream%2Flinaro-gcc.git

	PR tree-optimization/45919
	* tree-ssa-ccp.c (fold_nonarray_ctor_reference): Handle flexible
	array members.

	* gcc.c-torture/compile/pr45919.c: New test.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 352be15..5fc321d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-20  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/45919
+	* tree-ssa-ccp.c (fold_nonarray_ctor_reference): Handle flexible
+	array members.
+
 	PR tree-optimization/46066
 	* tree-parloops.c (create_parallel_loop): Use gsi_last_nondebug_bb
 	instead of gsi_last_bb.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 665f8a5..5abf927 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-20  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/45919
+	* gcc.c-torture/compile/pr45919.c: New test.
+
 	PR tree-optimization/46066
 	* gcc.dg/autopar/pr46066.c: New test.
 
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr45919.c b/gcc/testsuite/gcc.c-torture/compile/pr45919.c
new file mode 100644
index 0000000..caf518d
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr45919.c
@@ -0,0 +1,9 @@
+/* PR tree-optimization/45919 */
+
+const struct S { int a; int b[]; } s = { 0, { 0 }};
+
+int
+foo (void)
+{
+  return s.b[0];
+}
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 6504941..2d9c123 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -1523,23 +1523,30 @@ fold_nonarray_ctor_reference (tree type, tree ctor,
       double_int bits_per_unit_cst = uhwi_to_double_int (BITS_PER_UNIT);
       double_int bitoffset_end;
 
-      /* Variable sized objects in static constructors makes no sense.  */
+      /* Variable sized objects in static constructors makes no sense,
+	 but field_size can be NULL for flexible array members.  */
       gcc_assert (TREE_CODE (field_offset) == INTEGER_CST
 		  && TREE_CODE (byte_offset) == INTEGER_CST
-		  && TREE_CODE (field_size) == INTEGER_CST);
+		  && (field_size != NULL_TREE
+		      ? TREE_CODE (field_size) == INTEGER_CST
+		      : TREE_CODE (TREE_TYPE (cfield)) == ARRAY_TYPE));
 
       /* Compute bit offset of the field.  */
       bitoffset = double_int_add (tree_to_double_int (field_offset),
 				  double_int_mul (byte_offset_cst,
 						  bits_per_unit_cst));
       /* Compute bit offset where the field ends.  */
-      bitoffset_end = double_int_add (bitoffset,
-				      tree_to_double_int (field_size));
+      if (field_size != NULL_TREE)
+	bitoffset_end = double_int_add (bitoffset,
+					tree_to_double_int (field_size));
+      else
+	bitoffset_end = double_int_zero;
 
       /* Is OFFSET in the range (BITOFFSET, BITOFFSET_END)? */
       if (double_int_cmp (uhwi_to_double_int (offset), bitoffset, 0) >= 0
-	  && double_int_cmp (uhwi_to_double_int (offset),
-			     bitoffset_end, 0) < 0)
+	  && (field_size == NULL_TREE
+	      || double_int_cmp (uhwi_to_double_int (offset),
+				 bitoffset_end, 0) < 0))
 	{
 	  double_int access_end = double_int_add (uhwi_to_double_int (offset),
 						  uhwi_to_double_int (size));