From: Martin Jambor <mjambor@suse.cz>
Date: Tue, 15 Jan 2013 16:43:05 +0000 (+0100)
Subject: re PR tree-optimization/55920 (ICE in expand_debug_locations, at cfgexpand.c:3753)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=207b59560f7c136462aec8df61bb36fd0191eaab;p=gcc.git

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 8323062459d..15b15032d8b 100644
--- 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 e5fbcf2c5c5..234dde22da1 100644
--- 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);