merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 850979abb9afa1c2a6e8de68f012cfd65c286239..837dbdaca4d3d1e44f9260db30de19dd30b843fe 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-29  Michael Matz  <matz@suse.de>
+
+       * fibheap.c (fibheap_replace_key_data): Make sure we don't early
+       out when forcing the minimum.
+       (fibheap_delete_node): Assert that we managed to force the minimum.
+
 2009-05-25  Tristan Gingold  <gingold@adacore.com>
 
        * config.h-vms: Rewritten.  Define configure macros.

diff --git a/libiberty/fibheap.c b/libiberty/fibheap.c
index c032149c0c24fc9639d9c56725691e9d4035aed8..a37ee4ef270a55d9df7d47c5722272a9b5f78cab 100644 (file)
--- a/libiberty/fibheap.c
+++ b/libiberty/fibheap.c
@@ -214,7 +214,10 @@ fibheap_replace_key_data (fibheap_t heap, fibnode_t node,
   node->key = key;
   y = node->parent;
 
-  if (okey == key)
+  /* Short-circuit if the key is the same, as we then don't have to
+     do anything.  Except if we're trying to force the new node to
+     be the new minimum for delete.  */
+  if (okey == key && okey != FIBHEAPKEY_MIN)
     return odata;
 
   /* These two compares are specifically <= 0 to make sure that in the case
@@ -256,6 +259,11 @@ fibheap_delete_node (fibheap_t heap, fibnode_t node)
 
   /* To perform delete, we just make it the min key, and extract.  */
   fibheap_replace_key (heap, node, FIBHEAPKEY_MIN);
+  if (node != heap->min)
+    {
+      fprintf (stderr, "Can't force minimum on fibheap.\n");
+      abort ();
+    }
   fibheap_extract_min (heap);
 
   return ret;