summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/bt-load.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index add2e7021e8..cd9d808fb0d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2014-11-25 Segher Boessenkool <segher@kernel.crashing.org>
+ * bt-load.c (migrate_btr_defs): Get the key of a heap entry
+ before removing it, not after.
+
+2014-11-25 Segher Boessenkool <segher@kernel.crashing.org>
+
* config/mn10300/mn10300.c (mn10300_insert_setlb_lcc): Remove
PATTERN call.
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index 3002b62e8e1..53c4db31847 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -1434,8 +1434,8 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
while (!all_btr_defs.empty ())
{
- btr_def def = all_btr_defs.extract_min ();
int min_cost = -all_btr_defs.min_key ();
+ btr_def def = all_btr_defs.extract_min ();
if (migrate_btr_def (def, min_cost))
{
all_btr_defs.insert (-def->cost, def);