From 449e9a33887046acec46f373f96900fc07735355 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sun, 22 Oct 2017 20:42:06 +0000 Subject: Rename inchash::hash::add_wide_int The name inchash::add_wide_int is a bit misleading, since it sounds like it's hashing a wide_int. This patch renames it to add_hwi instead. 2017-10-22 Richard Sandiford gcc/ * inchash.h (inchash::hash::add_wide_int): Rename to... (inchash::hash::add_hwi): ...this. * ipa-devirt.c (hash_odr_vtable): Update accordingly. (polymorphic_call_target_hasher::hash): Likewise. * ipa-icf.c (sem_function::get_hash, sem_function::init): Likewise. (sem_item::add_expr, sem_item::add_type, sem_variable::get_hash) (sem_item_optimizer::update_hash_by_addr_refs): Likewise. * lto-streamer-out.c (hash_tree): Likewise. * optc-save-gen.awk: Likewise. * tree.c (add_expr): Likewise. From-SVN: r253987 --- gcc/ipa-icf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gcc/ipa-icf.c') diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index e666d5a..3f6f432 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -286,11 +286,11 @@ sem_function::get_hash (void) /* Add common features of declaration itself. */ if (DECL_FUNCTION_SPECIFIC_TARGET (decl)) - hstate.add_wide_int + hstate.add_hwi (cl_target_option_hash (TREE_TARGET_OPTION (DECL_FUNCTION_SPECIFIC_TARGET (decl)))); if (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl)) - hstate.add_wide_int + hstate.add_hwi (cl_optimization_hash (TREE_OPTIMIZATION (DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl)))); hstate.add_flag (DECL_CXX_CONSTRUCTOR_P (decl)); @@ -1438,8 +1438,8 @@ sem_function::init (void) { cfg_checksum = 0; inchash::hash hstate; - hstate.add_wide_int (cnode->thunk.fixed_offset); - hstate.add_wide_int (cnode->thunk.virtual_value); + hstate.add_hwi (cnode->thunk.fixed_offset); + hstate.add_hwi (cnode->thunk.virtual_value); hstate.add_flag (cnode->thunk.this_adjusting); hstate.add_flag (cnode->thunk.virtual_offset_p); hstate.add_flag (cnode->thunk.add_pointer_bounds_args); @@ -1486,7 +1486,7 @@ sem_item::add_expr (const_tree exp, inchash::hash &hstate) unsigned HOST_WIDE_INT idx; tree value; - hstate.add_wide_int (int_size_in_bytes (TREE_TYPE (exp))); + hstate.add_hwi (int_size_in_bytes (TREE_TYPE (exp))); FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (exp), idx, value) if (value) @@ -1501,7 +1501,7 @@ sem_item::add_expr (const_tree exp, inchash::hash &hstate) case VAR_DECL: case CONST_DECL: case PARM_DECL: - hstate.add_wide_int (int_size_in_bytes (TREE_TYPE (exp))); + hstate.add_hwi (int_size_in_bytes (TREE_TYPE (exp))); break; case MEM_REF: case POINTER_PLUS_EXPR: @@ -1519,7 +1519,7 @@ sem_item::add_expr (const_tree exp, inchash::hash &hstate) } break; CASE_CONVERT: - hstate.add_wide_int (int_size_in_bytes (TREE_TYPE (exp))); + hstate.add_hwi (int_size_in_bytes (TREE_TYPE (exp))); return add_expr (TREE_OPERAND (exp, 0), hstate); default: break; @@ -1590,11 +1590,11 @@ sem_item::add_type (const_tree type, inchash::hash &hstate) hstate2.add_int (nf); hash = hstate2.end (); - hstate.add_wide_int (hash); + hstate.add_hwi (hash); optimizer->m_type_hash_cache.put (type, hash); } else - hstate.add_wide_int (*val); + hstate.add_hwi (*val); } } @@ -2114,7 +2114,7 @@ sem_variable::get_hash (void) hstate.add_int (456346417); if (DECL_SIZE (decl) && tree_fits_shwi_p (DECL_SIZE (decl))) - hstate.add_wide_int (tree_to_shwi (DECL_SIZE (decl))); + hstate.add_hwi (tree_to_shwi (DECL_SIZE (decl))); add_expr (ctor, hstate); set_hash (hstate.end ()); @@ -2726,7 +2726,7 @@ sem_item_optimizer::update_hash_by_addr_refs () if (TYPE_NAME (class_type) && DECL_ASSEMBLER_NAME_SET_P (TYPE_NAME (class_type))) - hstate.add_wide_int + hstate.add_hwi (IDENTIFIER_HASH_VALUE (DECL_ASSEMBLER_NAME (TYPE_NAME (class_type)))); -- cgit v1.1