aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2007-07-03 15:29:19 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2007-07-03 15:29:19 +0000
commite656a4656e61366599bce12256e22b019e3cd65b (patch)
tree99dc19d6f7b8cb68004e7d0a8d2c67758122924b
parent6ba6728370f90daaec0dc7d3b052c5e58cc8cc4c (diff)
downloadgcc-e656a4656e61366599bce12256e22b019e3cd65b.zip
gcc-e656a4656e61366599bce12256e22b019e3cd65b.tar.gz
gcc-e656a4656e61366599bce12256e22b019e3cd65b.tar.bz2
re PR c++/32609 (ICE in htab_clear_slot at libiberty/hashtab.c:722)
2007-07-03 Richard Guenther <rguenther@suse.de> PR c++/32609 * class.c (fixed_type_or_null): Re-lookup the hashtable slot after recursing. From-SVN: r126262
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/class.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 27f6dc5..059631f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-03 Richard Guenther <rguenther@suse.de>
+
+ PR c++/32609
+ * class.c (fixed_type_or_null): Re-lookup the hashtable slot
+ after recursing.
+
2007-07-02 Simon Baldwin <simonb@google.com>
* parser.c (cp_parser_elaborated_type_specifier): Added a warning
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 67cf63d..f2ccd5b 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5377,7 +5377,7 @@ fixed_type_or_null (tree instance, int *nonnull, int *cdtorp)
slot = htab_find_slot (ht, instance, INSERT);
*slot = instance;
type = RECUR (DECL_INITIAL (instance));
- htab_clear_slot (ht, slot);
+ htab_remove_elt (ht, instance);
return type;
}