From: Vladimir N. Makarov <vmakarov@redhat.com>
Date: Mon, 9 Mar 2020 18:05:09 +0000 (-0400)
Subject: Revert: One more patch for PR93564: Prefer smaller hard regno when we do not honor... 
X-Git-Tag: upstream/12.2.0~17939
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5dc1390b41db5c1765e25fd21dad1a930a015aac;p=platform%2Fupstream%2Fgcc.git

Revert: One more patch for PR93564: Prefer smaller hard regno when we do not honor reg alloc order.

2020-03-09  Vladimir Makarov  <vmakarov@redhat.com>

	Revert:

	2020-02-28  Vladimir Makarov  <vmakarov@redhat.com>

	PR rtl-optimization/93564
	* ira-color.c (assign_hard_reg): Prefer smaller hard regno when we
	do not honor reg alloc order.
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99f0011..6c20ddba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2020-03-09  Vladimir Makarov  <vmakarov@redhat.com>
+
+	Revert:
+
+	2020-02-28  Vladimir Makarov  <vmakarov@redhat.com>
+
+	PR rtl-optimization/93564
+	* ira-color.c (assign_hard_reg): Prefer smaller hard regno when we
+	do not honor reg alloc order.
+
 2020-03-09  Andrew Pinski  <apinski@marvell.com>
 
 	PR inline-asm/94095
diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index a2bf108..0ffdd19 100644
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -1925,9 +1925,7 @@ assign_hard_reg (ira_allocno_t a, bool retry_p)
 	}
       if (min_cost > cost)
 	min_cost = cost;
-      if (min_full_cost > full_cost
-	  || (!HONOR_REG_ALLOC_ORDER && min_full_cost == full_cost
-	      && best_hard_regno > hard_regno))
+      if (min_full_cost > full_cost)
 	{
 	  min_full_cost = full_cost;
 	  best_hard_regno = hard_regno;