From a49bf6f0f5b421fda0e44507cbf03c8a570f511b Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 9 Sep 2017 09:42:39 +0000 Subject: [PATCH] re PR bootstrap/81926 (go/parse.o differs between stage2 and stage3) PR bootstrap/81926 * cp-objcp-common.c (struct debug_type_hasher): New class. (debug_type_hash): New variable. (cp_get_debug_type): Associate the OFFSET_TYPEs with the types. From-SVN: r251922 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/cp-objcp-common.c | 45 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 730a2dace19..fa3e00889c3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2017-09-09 Eric Botcazou + + PR bootstrap/81926 + * cp-objcp-common.c (struct debug_type_hasher): New class. + (debug_type_hash): New variable. + (cp_get_debug_type): Associate the OFFSET_TYPEs with the types. + 2017-09-08 Jason Merrill PR c++/70029 - ICE with ref-qualifier and -flto diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c index 4475b6cb911..183e7f7bf57 100644 --- a/gcc/cp/cp-objcp-common.c +++ b/gcc/cp/cp-objcp-common.c @@ -131,6 +131,20 @@ cxx_types_compatible_p (tree x, tree y) return same_type_ignoring_top_level_qualifiers_p (x, y); } +struct debug_type_hasher : ggc_cache_ptr_hash +{ + static hashval_t hash (tree_map *m) { return tree_map_hash (m); } + static bool equal (tree_map *a, tree_map *b) { return tree_map_eq (a, b); } + + static int + keep_cache_entry (tree_map *&e) + { + return ggc_marked_p (e->base.from); + } +}; + +static GTY((cache)) hash_table *debug_type_hash; + /* Return a type to use in the debug info instead of TYPE, or NULL_TREE to keep TYPE. */ @@ -138,8 +152,35 @@ tree cp_get_debug_type (const_tree type) { if (TYPE_PTRMEMFUNC_P (type) && !typedef_variant_p (type)) - return build_offset_type (TYPE_PTRMEMFUNC_OBJECT_TYPE (type), - TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (type))); + { + if (debug_type_hash == NULL) + debug_type_hash = hash_table::create_ggc (512); + + /* We cannot simply use build_offset_type here because the function uses + the type canonicalization hashtable, which is GC-ed, so its behavior + depends on the actual collection points. Since we are building these + types on the fly for the debug info only, they would not be attached + to any GC root and always be swept, so we would make the contents of + the debug info depend on the collection points. */ + struct tree_map in, *h; + + in.base.from = CONST_CAST_TREE (type); + in.hash = htab_hash_pointer (type); + h = debug_type_hash->find_with_hash (&in, in.hash); + if (h) + return h->to; + + tree t = build_offset_type (TYPE_PTRMEMFUNC_OBJECT_TYPE (type), + TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (type))); + + h = ggc_alloc (); + h->base.from = CONST_CAST_TREE (type); + h->hash = htab_hash_pointer (type); + h->to = t; + *debug_type_hash->find_slot_with_hash (h, h->hash, INSERT) = h; + + return t; + } return NULL_TREE; } -- 2.30.2