From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id A46613858D1E; Mon, 24 Apr 2023 14:34:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A46613858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682346849; bh=fwW4LaZ3o7YLyU82WjtFA3VkCA3oW+Jm2ULhHq+EDVk=; h=From:To:Subject:Date:From; b=M3sHnyziVhaS/o+vykVHJx2kvEli+dcdFFj+qSOcyWDlr0PCcglKXdEol9mSWeMTk kAvF4zc0sbIJNTSAKphi0wehTBrMVAbjy9NbA522IjH6u9+dNaNpFFQ40mVZjRfHEX uNsPQeoY5+koKhzecIXNvq3LuHbkx0CsGsx1UP0s= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-198] c++, tree: declare some basic functions inline X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: b6d8e2975a9e1b9c3e839c09f265cd40426d23c1 X-Git-Newrev: b9ee7c6bfdbfcc722f3e4c8bd8378cccd4311740 Message-Id: <20230424143409.A46613858D1E@sourceware.org> Date: Mon, 24 Apr 2023 14:34:09 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b9ee7c6bfdbfcc722f3e4c8bd8378cccd4311740 commit r14-198-gb9ee7c6bfdbfcc722f3e4c8bd8378cccd4311740 Author: Patrick Palka Date: Mon Apr 24 10:33:49 2023 -0400 c++, tree: declare some basic functions inline The functions strip_array_types, is_typedef_decl, typedef_variant_p and cp_expr_location are used throughout the C++ front end including in some fairly hot parts (e.g. in the tsubst routines and cp_walk_subtree) and they're small enough that the overhead of calling them out-of-line is relatively significant. So this patch moves their definitions into the appropriate headers to enable inlining them. gcc/cp/ChangeLog: * cp-tree.h (cp_expr_location): Define here. * tree.cc (cp_expr_location): Don't define here. gcc/ChangeLog: * tree.cc (strip_array_types): Don't define here. (is_typedef_decl): Don't define here. (typedef_variant_p): Don't define here. * tree.h (strip_array_types): Define here. (is_typedef_decl): Define here. (typedef_variant_p): Define here. Diff: --- gcc/cp/cp-tree.h | 26 +++++++++++++++++++++++++- gcc/cp/tree.cc | 24 ------------------------ gcc/tree.cc | 29 ----------------------------- gcc/tree.h | 32 +++++++++++++++++++++++++++++--- 4 files changed, 54 insertions(+), 57 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 6c5920dcbe0..c9c4cd6f32f 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -49,7 +49,7 @@ c-common.h, not after. but not all node kinds do (e.g. constants, and references to params, locals, etc), so we stash a copy here. */ -extern location_t cp_expr_location (const_tree); +inline location_t cp_expr_location (const_tree); class cp_expr { @@ -8163,6 +8163,30 @@ loc_or_input_loc (location_t loc) return loc == UNKNOWN_LOCATION ? input_location : loc; } +/* Like EXPR_LOCATION, but also handle some tcc_exceptional that have + locations. */ + +inline location_t +cp_expr_location (const_tree t_) +{ + tree t = CONST_CAST_TREE (t_); + if (t == NULL_TREE) + return UNKNOWN_LOCATION; + switch (TREE_CODE (t)) + { + case LAMBDA_EXPR: + return LAMBDA_EXPR_LOCATION (t); + case STATIC_ASSERT: + return STATIC_ASSERT_SOURCE_LOCATION (t); + case TRAIT_EXPR: + return TRAIT_EXPR_LOCATION (t); + case PTRMEM_CST: + return PTRMEM_CST_LOCATION (t); + default: + return EXPR_LOCATION (t); + } +} + inline location_t cp_expr_loc_or_loc (const_tree t, location_t or_loc) { diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index d35e30faf28..131b212ff73 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -6221,30 +6221,6 @@ cp_tree_code_length (enum tree_code code) } } -/* Like EXPR_LOCATION, but also handle some tcc_exceptional that have - locations. */ - -location_t -cp_expr_location (const_tree t_) -{ - tree t = CONST_CAST_TREE (t_); - if (t == NULL_TREE) - return UNKNOWN_LOCATION; - switch (TREE_CODE (t)) - { - case LAMBDA_EXPR: - return LAMBDA_EXPR_LOCATION (t); - case STATIC_ASSERT: - return STATIC_ASSERT_SOURCE_LOCATION (t); - case TRAIT_EXPR: - return TRAIT_EXPR_LOCATION (t); - case PTRMEM_CST: - return PTRMEM_CST_LOCATION (t); - default: - return EXPR_LOCATION (t); - } -} - /* Implement -Wzero_as_null_pointer_constant. Return true if the conditions for the warning hold, false otherwise. */ bool diff --git a/gcc/tree.cc b/gcc/tree.cc index 5f2af073af9..8394ff0f837 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -7312,18 +7312,6 @@ build_array_type_nelts (tree elt_type, poly_uint64 nelts) return build_array_type (elt_type, build_index_type (size_int (nelts - 1))); } -/* Recursively examines the array elements of TYPE, until a non-array - element type is found. */ - -tree -strip_array_types (tree type) -{ - while (TREE_CODE (type) == ARRAY_TYPE) - type = TREE_TYPE (type); - - return type; -} - /* Computes the canonical argument types from the argument type list ARGTYPES. @@ -12213,23 +12201,6 @@ get_binfo_at_offset (tree binfo, poly_int64 offset, tree expected_type) } } -/* Returns true if X is a typedef decl. */ - -bool -is_typedef_decl (const_tree x) -{ - return (x && TREE_CODE (x) == TYPE_DECL - && DECL_ORIGINAL_TYPE (x) != NULL_TREE); -} - -/* Returns true iff TYPE is a type variant created for a typedef. */ - -bool -typedef_variant_p (const_tree type) -{ - return is_typedef_decl (TYPE_NAME (type)); -} - /* PR 84195: Replace control characters in "unescaped" with their escaped equivalents. Allow newlines if -fmessage-length has been set to a non-zero value. This is done here, rather than diff --git a/gcc/tree.h b/gcc/tree.h index 8e67e7078d1..dc94c17db76 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -4821,9 +4821,20 @@ tree_to_poly_uint64 (const_tree t) extern int tree_int_cst_sgn (const_tree); extern int tree_int_cst_sign_bit (const_tree); extern unsigned int tree_int_cst_min_precision (tree, signop); -extern tree strip_array_types (tree); extern tree excess_precision_type (tree); +/* Recursively examines the array elements of TYPE, until a non-array + element type is found. */ + +inline tree +strip_array_types (tree type) +{ + while (TREE_CODE (type) == ARRAY_TYPE) + type = TREE_TYPE (type); + + return type; +} + /* Desription of the reason why the argument of valid_constant_size_p is not a valid size. */ enum cst_size_error { @@ -5374,8 +5385,6 @@ extern tree create_artificial_label (location_t); extern const char *get_name (tree); extern bool stdarg_p (const_tree); extern bool prototype_p (const_tree); -extern bool is_typedef_decl (const_tree x); -extern bool typedef_variant_p (const_tree); extern bool auto_var_p (const_tree); extern bool auto_var_in_fn_p (const_tree, const_tree); extern tree build_low_bits_mask (tree, unsigned); @@ -5391,6 +5400,23 @@ extern void error_unavailable_use (tree, tree); extern tree cache_integer_cst (tree, bool might_duplicate = false); extern const char *combined_fn_name (combined_fn); +/* Returns true if X is a typedef decl. */ + +inline bool +is_typedef_decl (const_tree x) +{ + return (x && TREE_CODE (x) == TYPE_DECL + && DECL_ORIGINAL_TYPE (x) != NULL_TREE); +} + +/* Returns true iff TYPE is a type variant created for a typedef. */ + +inline bool +typedef_variant_p (const_tree type) +{ + return is_typedef_decl (TYPE_NAME (type)); +} + /* Compare and hash for any structure which begins with a canonical pointer. Assumes all pointers are interchangeable, which is sort of already assumed by gcc elsewhere IIRC. */