From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 17 Nov 2014 22:05:45 +0000 (+0000)
Subject:        * ira-conflicts.c (build_conflict_bit_table): Add the current
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=630c50aa193dea8521e56921e12b5cfb98ea0287;p=thirdparty%2Fgcc.git

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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 366be84ad34b..36bf41fcdba0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-17  Zhouyi Zhou <yizhouzhou@ict.ac.cn>
+
+	* ira-conflicts.c (build_conflict_bit_table): Add the current
+	object to OBJECTS_LIVE after traversing OBJECTS_LIVE.
+
 2014-11-17  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-cp.c (ipa_get_indirect_edge_target_1): Handle speculation.
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c
index 7aaf0cb9948b..cccdb6b074fa 100644
--- a/gcc/ira-conflicts.c
+++ b/gcc/ira-conflicts.c
@@ -177,7 +177,6 @@ build_conflict_bit_table (void)
 	  gcc_assert (id < ira_objects_num);
 
 	  aclass = ALLOCNO_CLASS (allocno);
-	  sparseset_set_bit (objects_live, id);
 	  EXECUTE_IF_SET_IN_SPARSESET (objects_live, j)
 	    {
 	      ira_object_t live_obj = ira_object_id_map[j];
@@ -191,6 +190,7 @@ build_conflict_bit_table (void)
 		  record_object_conflict (obj, live_obj);
 		}
 	    }
+	  sparseset_set_bit (objects_live, id);
 	}
 
       for (r = ira_finish_point_ranges[i]; r != NULL; r = r->finish_next)