2005-05-17  Jakub Jelinek  <jakub@redhat.com>

	* varasm.c (struct constant_descriptor_tree): Add hash field.

	(const_desc_hash): Just return hash field.

	(const_desc_eq): If hash values are different, return 0 immediately.

	(output_constant_def): Compute hash field of temporary key, use

	htab_find_slot_with_hash instead of htab_find_slot.  Set hash in

	newly built constant descriptor.

	(lookup_constant_def): Compute hash field of temporary key, use

	htab_find_with_hash instead of htab_find.

--- gcc/varasm.c	16 May 2005 21:37:01 -0000	1.510

+++ gcc/varasm.c	17 May 2005 06:34:48 -0000	1.511

@@ -2361,6 +2361,11 @@ struct constant_descriptor_tree GTY(())

   /* The value of the constant.  */

   tree value;

+

+  /* Hash of value.  Computing the hash from value each time

+     hashfn is called can't work properly, as that means recursive

+     use of the hash table during hash table expansion.  */

+  hashval_t hash;

 };

 static GTY((param_is (struct constant_descriptor_tree)))

@@ -2374,7 +2379,7 @@ static void maybe_output_constant_def_co

 static hashval_t

 const_desc_hash (const void *ptr)

 {

-  return const_hash_1 (((struct constant_descriptor_tree *)ptr)->value);

+  return ((struct constant_descriptor_tree *)ptr)->hash;

 }

 static hashval_t

@@ -2474,8 +2479,11 @@ const_hash_1 (const tree exp)

 static int

 const_desc_eq (const void *p1, const void *p2)

 {

-  return compare_constant (((struct constant_descriptor_tree *)p1)->value,

-			   ((struct constant_descriptor_tree *)p2)->value);

+  const struct constant_descriptor_tree *c1 = p1;

+  const struct constant_descriptor_tree *c2 = p2;

+  if (c1->hash != c2->hash)

+    return 0;

+  return compare_constant (c1->value, c2->value);

 }

 /* Compare t1 and t2, and return 1 only if they are known to result in

@@ -2745,12 +2753,14 @@ output_constant_def (tree exp, int defer

   /* Look up EXP in the table of constant descriptors.  If we didn't find

      it, create a new one.  */

   key.value = exp;

-  loc = htab_find_slot (const_desc_htab, &key, INSERT);

+  key.hash = const_hash_1 (exp);

+  loc = htab_find_slot_with_hash (const_desc_htab, &key, key.hash, INSERT);

   desc = *loc;

   if (desc == 0)

     {

       desc = build_constant_desc (exp);

+      desc->hash = key.hash;

       *loc = desc;

     }

@@ -2853,7 +2863,8 @@ lookup_constant_def (tree exp)

   struct constant_descriptor_tree key;

   key.value = exp;

-  desc = htab_find (const_desc_htab, &key);

+  key.hash = const_hash_1 (exp);

+  desc = htab_find_with_hash (const_desc_htab, &key, key.hash);

   return (desc ? desc->rtl : NULL_RTX);

 }