From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 6C13F3858D35; Tue, 1 Feb 2022 19:15:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C13F3858D35 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6972] tree: move tree_vec_map_cache_hasher into header X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: f32f74c2e8cef5fe37af6d4e8d7e8f6b4c8ae9a8 X-Git-Newrev: b649071d4b3490aa43c6c2212312ace304c9ff1c Message-Id: <20220201191540.6C13F3858D35@sourceware.org> Date: Tue, 1 Feb 2022 19:15:40 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Feb 2022 19:15:40 -0000 https://gcc.gnu.org/g:b649071d4b3490aa43c6c2212312ace304c9ff1c commit r12-6972-gb649071d4b3490aa43c6c2212312ace304c9ff1c Author: Jason Merrill Date: Thu Jan 27 10:53:07 2022 -0500 tree: move tree_vec_map_cache_hasher into header gcc/ChangeLog: * tree.h (struct tree_vec_map_cache_hasher): Move from... * tree.cc (struct tree_vec_map_cache_hasher): ...here. Diff: --- gcc/tree.h | 17 +++++++++++++++++ gcc/tree.cc | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gcc/tree.h b/gcc/tree.h index 4c01d94244e..e2157d66d6c 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -5559,6 +5559,23 @@ struct tree_decl_map_cache_hasher : ggc_cache_ptr_hash #define tree_vec_map_hash tree_decl_map_hash #define tree_vec_map_marked_p tree_map_base_marked_p +struct tree_vec_map_cache_hasher : ggc_cache_ptr_hash +{ + static hashval_t hash (tree_vec_map *m) { return DECL_UID (m->base.from); } + + static bool + equal (tree_vec_map *a, tree_vec_map *b) + { + return a->base.from == b->base.from; + } + + static int + keep_cache_entry (tree_vec_map *&m) + { + return ggc_marked_p (m->base.from); + } +}; + /* Hasher for tree decls. Pointer equality is enough here, but the DECL_UID is a better hash than the pointer value and gives a predictable traversal order. Additionally it can be used across PCH save/restore. */ diff --git a/gcc/tree.cc b/gcc/tree.cc index 9d445b2740f..7ce4f242751 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -242,23 +242,6 @@ static GTY ((cache)) static GTY ((cache)) hash_table *value_expr_for_decl; -struct tree_vec_map_cache_hasher : ggc_cache_ptr_hash -{ - static hashval_t hash (tree_vec_map *m) { return DECL_UID (m->base.from); } - - static bool - equal (tree_vec_map *a, tree_vec_map *b) - { - return a->base.from == b->base.from; - } - - static int - keep_cache_entry (tree_vec_map *&m) - { - return ggc_marked_p (m->base.from); - } -}; - static GTY ((cache)) hash_table *debug_args_for_decl;