re PR tree-optimization/42703 (ICE in generate_subtree_copies with out of bounds...

2010-01-13  Martin Jambor  <mjambor@suse.cz>

	PR tree-optimization/42703
	* tree-sra.c (analyze_access_subtree): Check that we can build a
	reference to the original data within the aggregate.

	* testsuite/gcc.c-torture/compile/pr42703.c: New test.

From-SVN: r155863

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d9105623abbfbcd1c5afdfe70eed6f86d9fa5c3a..b8a4ec0008c04f905c4c37001998d4bc6cd8595d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-13  Martin Jambor  <mjambor@suse.cz>
+
+       PR tree-optimization/42703
+       * tree-sra.c (analyze_access_subtree): Check that we can build a
+       reference to the original data within the aggregate.
+
 2010-01-13  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/42705

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9f3ff54d5e82b607dc2230186a9cd2d1d5699399..148ba87203dffd64f07384f989e51788c9ca7b10 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-13  Martin Jambor  <mjambor@suse.cz>
+
+       PR tree-optimization/42703
+       * testsuite/gcc.c-torture/compile/pr42703.c: New test.
+
 2010-01-13  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/42705

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr42703.c b/gcc/testsuite/gcc.c-torture/compile/pr42703.c
new file mode 100644 (file)
index 0000000..4805b17
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr42703.c
@@ -0,0 +1,12 @@
+__extension__ typedef unsigned long long int uint64_t;
+typedef uint64_t ScmUInt64;
+void swapb64(ScmUInt64 *loc) 
+{
+    union {
+        ScmUInt64 l;
+        unsigned char c[4];
+    } dd;
+    unsigned char t;
+    dd.l = *loc;
+    (t = dd.c[3], dd.c[3] = dd.c[4], dd.c[4] = t);
+}

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index ebb40c4aa1ad95938a5a71e7f4f0f2d6b3bcf0b9..38b3cf507e06ebab5d458b88f2c0c96ef75d58aa 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -1659,7 +1659,13 @@ analyze_access_subtree (struct access *root, bool allow_replacements,
 
   if (allow_replacements && scalar && !root->first_child
       && (root->grp_hint
-         || (direct_read && root->grp_write)))
+         || (direct_read && root->grp_write))
+      /* We must not ICE later on when trying to build an access to the
+        original data within the aggregate even when it is impossible to do in
+        a defined way like in the PR 42703 testcase.  Therefore we check
+        pre-emptively here that we will be able to do that.  */
+      && build_ref_for_offset (NULL, TREE_TYPE (root->base), root->offset,
+                              root->type, false))
     {
       if (dump_file && (dump_flags & TDF_DETAILS))
        {