re PR tree-optimization/55920 (ICE in expand_debug_locations, at cfgexpand.c:3753)

2013-01-15  Martin Jambor  <mjambor@suse.cz>

	PR tree-optimization/55920
	* tree-sra.c (analyze_access_subtree): Do not mark non-removable
	accesses as grp_to_be_debug_replaced.

From-SVN: r195210

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8323062459da7528611c911b7ea5841af13b17e4..15b15032d8b595e1a26350cbd09b71ede07bd8dd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-15  Martin Jambor  <mjambor@suse.cz>
+
+       PR tree-optimization/55920
+       * tree-sra.c (analyze_access_subtree): Do not mark non-removable
+       accesses as grp_to_be_debug_replaced.
+
 2013-01-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/55920

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index e5fbcf2c5c5ffb352e295763059e6d12191fa243..234dde22da16766e403453480f344dfaae82d2b0 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2199,7 +2199,9 @@ analyze_access_subtree (struct access *root, struct access *parent,
     {
       if (allow_replacements
          && scalar && !root->first_child
-         && (root->grp_scalar_write || root->grp_assignment_write))
+         && (root->grp_scalar_write || root->grp_assignment_write)
+         && !bitmap_bit_p (cannot_scalarize_away_bitmap,
+                           DECL_UID (root->base)))
        {
          gcc_checking_assert (!root->grp_scalar_read
                               && !root->grp_assignment_read);