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

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 99f001154c39f34888866b22e708ea86063c7bd8..6c20ddba54a2f704e0bb8d624ceebb04046b5d7b 100644 (file)
--- 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 a2bf108c38eec2c456509f0dfdd9b0db60bd970a..0ffdd1920204ce6bc4c41497a5bb25a4040ecb21 100644 (file)
--- 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;