From: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
Date: Tue, 23 Dec 2014 19:02:46 +0000 (+0000)
Subject: ira-build.c (ira_flattening): Add the current object to OBJECTS_LIVE after traversing... 
X-Git-Tag: upstream/12.2.0~57886
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3feb029833c3f53ce4753f78ef6a2ce5b11492d9;p=platform%2Fupstream%2Fgcc.git

ira-build.c (ira_flattening): Add the current object to OBJECTS_LIVE after traversing OBJECTS_LIVE.

        * ira-build.c (ira_flattening): Add the current
        object to OBJECTS_LIVE after traversing OBJECTS_LIVE.

From-SVN: r219046
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 133d8aa..0d817d2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-22  Zhouyi Zhou <yizhouzhou@ict.ac.cn>
+
+	* ira-build.c (ira_flattening): Add the current
+	object to OBJECTS_LIVE after traversing OBJECTS_LIVE.
+
 2014-12-23  Martin Liska  <mliska@suse.cz>
 
 	PR ipa/63851
diff --git a/gcc/ira-build.c b/gcc/ira-build.c
index af82b71..6631809 100644
--- a/gcc/ira-build.c
+++ b/gcc/ira-build.c
@@ -3252,7 +3252,6 @@ ira_flattening (int max_regno_before_emit, int ira_max_point_before_emit)
 		continue;
 
 	      aclass = ALLOCNO_CLASS (a);
-	      sparseset_set_bit (objects_live, OBJECT_CONFLICT_ID (obj));
 	      EXECUTE_IF_SET_IN_SPARSESET (objects_live, n)
 		{
 		  ira_object_t live_obj = ira_object_id_map[n];
@@ -3264,6 +3263,7 @@ ira_flattening (int max_regno_before_emit, int ira_max_point_before_emit)
 		      && live_a != a)
 		    ira_add_conflict (obj, live_obj);
 		}
+	      sparseset_set_bit (objects_live, OBJECT_CONFLICT_ID (obj));
 	    }
 
 	  for (r = ira_finish_point_ranges[i]; r != NULL; r = r->finish_next)