From d844478ab47a16c8ae65f253fd1cdc685c7951fc Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 22 Jun 2022 07:51:44 -0700 Subject: c++: Remove ifdefed code The only reason I chose to use DECL_UID on this hash table was to make it stable against ASLR and perturbations due to other allocations. It's not required for correctness, as the comment mentions the equality fn uses pointer identity. gcc/cp/ * module.cc (struct duplicate_hash): Remove. (duplicate_hash_map): Adjust. --- gcc/cp/module.cc | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gcc/cp/module.cc') diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index b3fbd46..d735d7e 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -2829,24 +2829,10 @@ struct merge_key { } }; -struct duplicate_hash : nodel_ptr_hash -{ -#if 0 - /* This breaks variadic bases in the xtreme_header tests. Since ::equal is - the default pointer_hash::equal, let's use the default hash as well. */ - inline static hashval_t hash (value_type decl) - { - if (TREE_CODE (decl) == TREE_BINFO) - decl = TYPE_NAME (BINFO_TYPE (decl)); - return hashval_t (DECL_UID (decl)); - } -#endif -}; - /* Hashmap of merged duplicates. Usually decls, but can contain BINFOs. */ typedef hash_map > + simple_hashmap_traits,uintptr_t> > duplicate_hash_map; /* Tree stream reader. Note that reading a stream doesn't mark the -- cgit v1.1