From patchwork Tue May 31 17:34:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 54578 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4589395B073 for ; Tue, 31 May 2022 17:35:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4589395B073 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1654018538; bh=kUNC2bNPod5YFG8OJVUUpLN9hPrtmjbpqQVjEuxxdnU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Lxk6Zo5dPfkQR1Vnnu/jSIlUseeoDdOc3nXhZ0yzYX0/VCbCafsAjQxBOuKfOHIdA DWX3QGuroRiqgckJMqGZ3XC+CeBG9dqBgY0nasdTEoKxGx92Ey2XB8AIXrGg3aY/Q1 RZzAOIVHMNMbxhz5wHNm2y7SCLW4zQ/9do+uKYoM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 9DB38384B078 for ; Tue, 31 May 2022 17:35:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9DB38384B078 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-352-TEvipuC5NvqL7W_KP2RIHQ-1; Tue, 31 May 2022 13:35:02 -0400 X-MC-Unique: TEvipuC5NvqL7W_KP2RIHQ-1 Received: by mail-qt1-f198.google.com with SMTP id c1-20020ac81101000000b002f9219952f0so12757925qtj.15 for ; Tue, 31 May 2022 10:35:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kUNC2bNPod5YFG8OJVUUpLN9hPrtmjbpqQVjEuxxdnU=; b=SHTpX+/d4abBqGhpe73wSpu7zWyqWRDKnboiRuTv0HVnWfmZlveZeeTNgArYDpGGts oExpYKTwcAxi9VMdbg0+va2HrhvjMZnM2mruKzKBdUt8tlsrgBijlEg9aVWMxdw8M3Yu heKWx7r0Z98rFOsCzPlJkQoDTjNvQvJOQE0sgA8ECeU9g9iJOKoHLZSY0Wo0hiH48HEG 5jj36dqdUwAUMeE0jhC/FxsVjg5jN1AxyzMFlPe0bUOmx/EXiQdiwF4U6qUGmEJfGQ9L DUOQTRk+mkAw3RJzMWnCDwsQIHoTc47697Nd8+3zYhRKPJR4Sklh9nFKt3VSDHmXQzEb o73w== X-Gm-Message-State: AOAM5331Zc4+T0gDJG05qxkQhAqC5bJ4ZP86MRATJfeACy1kbOTSeeTf z6gF6SSxzDIna5Bg2bFdoLZNuCno/f2O4TJABjZCRvnInu9Qm7ZexLs9actUBu5U3cAF4ONbByv aDELmN/6mbT8eKLGqugWrZ68h4gMRnLkkt9bXuWdZQFqlrmH1y5I+CrAIuyFYI8K8vNg= X-Received: by 2002:a05:622a:24e:b0:304:c1f0:6eb9 with SMTP id c14-20020a05622a024e00b00304c1f06eb9mr839437qtx.167.1654018501552; Tue, 31 May 2022 10:35:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIUzwGN5P/YHlq8/rg8v5rqCF2gSTvlL2oFtTFyPJBD06sibAY+NBNjIqw9I3JvWfi6XO0uQ== X-Received: by 2002:a05:622a:24e:b0:304:c1f0:6eb9 with SMTP id c14-20020a05622a024e00b00304c1f06eb9mr839400qtx.167.1654018501153; Tue, 31 May 2022 10:35:01 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id a85-20020ae9e858000000b0069fc13ce257sm9603490qkg.136.2022.05.31.10.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 10:35:00 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: use auto_timevar instead of timevar_push/pop Date: Tue, 31 May 2022 13:34:57 -0400 Message-Id: <20220531173457.334065-1-ppalka@redhat.com> X-Mailer: git-send-email 2.36.1.203.g1bcf4f6271 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" r12-5487-g9bf69a8558638c replaced uses of timevar_cond_push/pop with auto_cond_timevar and removed now unnecessary wrapper functions. This patch does the same for timevar_push/pop and auto_timevar. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? gcc/cp/ChangeLog: * parser.cc: * pt.cc: Use auto_timevar instead of timevar_push/pop. Remove wrapper functions. --- gcc/cp/parser.cc | 31 ++++++++---------------- gcc/cp/pt.cc | 61 +++++++++++------------------------------------- 2 files changed, 24 insertions(+), 68 deletions(-) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 21066421a02..3acfbd43c5b 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -19106,7 +19106,7 @@ cp_parser_explicit_instantiation (cp_parser* parser) cp_decl_specifier_seq decl_specifiers; tree extension_specifier = NULL_TREE; - timevar_push (TV_TEMPLATE_INST); + auto_timevar time (TV_TEMPLATE_INST); /* Look for an (optional) storage-class-specifier or function-specifier. */ @@ -19207,8 +19207,6 @@ cp_parser_explicit_instantiation (cp_parser* parser) cp_parser_consume_semicolon_at_end_of_statement (parser); - timevar_pop (TV_TEMPLATE_INST); - cp_finalize_omp_declare_simd (parser, &odsd); } @@ -20966,7 +20964,8 @@ cp_parser_enum_specifier (cp_parser* parser) elaborated-type-specifier. */ if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)) { - timevar_push (TV_PARSE_ENUM); + auto_timevar time (TV_PARSE_ENUM); + if (nested_name_specifier && nested_name_specifier != error_mark_node) { @@ -21072,7 +21071,6 @@ cp_parser_enum_specifier (cp_parser* parser) if (scoped_enum_p) finish_scope (); - timevar_pop (TV_PARSE_ENUM); } else { @@ -25927,9 +25925,11 @@ pop_injected_parms (void) Returns the TREE_TYPE representing the class. */ -static tree -cp_parser_class_specifier_1 (cp_parser* parser) +tree +cp_parser_class_specifier (cp_parser* parser) { + auto_timevar time (TV_PARSE_STRUCT); + tree type; tree attributes = NULL_TREE; bool nested_name_specifier_p; @@ -26321,16 +26321,6 @@ cp_parser_class_specifier_1 (cp_parser* parser) return type; } -static tree -cp_parser_class_specifier (cp_parser* parser) -{ - tree ret; - timevar_push (TV_PARSE_STRUCT); - ret = cp_parser_class_specifier_1 (parser); - timevar_pop (TV_PARSE_STRUCT); - return ret; -} - /* Parse a class-head. class-head: @@ -31281,10 +31271,9 @@ cp_parser_function_definition_from_specifiers_and_declarator tv = TV_PARSE_INLINE; else tv = TV_PARSE_FUNC; - timevar_push (tv); + auto_timevar time (tv); fn = cp_parser_function_definition_after_declarator (parser, /*inline_p=*/false); - timevar_pop (tv); } return fn; @@ -32276,7 +32265,8 @@ cp_parser_enclosed_template_argument_list (cp_parser* parser) static void cp_parser_late_parsing_for_member (cp_parser* parser, tree member_function) { - timevar_push (TV_PARSE_INMETH); + auto_timevar time (TV_PARSE_INMETH); + /* If this member is a template, get the underlying FUNCTION_DECL. */ if (DECL_FUNCTION_TEMPLATE_P (member_function)) @@ -32346,7 +32336,6 @@ cp_parser_late_parsing_for_member (cp_parser* parser, tree member_function) /* Restore the queue. */ pop_unparsed_function_queues (parser); - timevar_pop (TV_PARSE_INMETH); } /* If DECL contains any default args, remember it on the unparsed diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 759f119abc2..ffa3a05d8c8 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -9813,10 +9813,12 @@ maybe_get_template_decl_from_type_decl (tree decl) that we want to avoid. It also causes some problems with argument coercion (see convert_nontype_argument for more information on this). */ -static tree -lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context, - int entering_scope, tsubst_flags_t complain) +tree +lookup_template_class (tree d1, tree arglist, tree in_decl, tree context, + int entering_scope, tsubst_flags_t complain) { + auto_timevar time (TV_TEMPLATE_INST); + tree templ = NULL_TREE, parmlist; tree t; spec_entry **slot; @@ -10354,20 +10356,6 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context, } } -/* Wrapper for lookup_template_class_1. */ - -tree -lookup_template_class (tree d1, tree arglist, tree in_decl, tree context, - int entering_scope, tsubst_flags_t complain) -{ - tree ret; - timevar_push (TV_TEMPLATE_INST); - ret = lookup_template_class_1 (d1, arglist, in_decl, context, - entering_scope, complain); - timevar_pop (TV_TEMPLATE_INST); - return ret; -} - /* Return a TEMPLATE_ID_EXPR for the given variable template and ARGLIST. */ tree @@ -11881,9 +11869,11 @@ perform_instantiation_time_access_checks (tree tmpl, tree targs) } } -static tree -instantiate_class_template_1 (tree type) +tree +instantiate_class_template (tree type) { + auto_timevar time (TV_TEMPLATE_INST); + tree templ, args, pattern, t, member; tree typedecl; tree pbinfo; @@ -12405,18 +12395,6 @@ instantiate_class_template_1 (tree type) return type; } -/* Wrapper for instantiate_class_template_1. */ - -tree -instantiate_class_template (tree type) -{ - tree ret; - timevar_push (TV_TEMPLATE_INST); - ret = instantiate_class_template_1 (type); - timevar_pop (TV_TEMPLATE_INST); - return ret; -} - tree tsubst_template_arg (tree t, tree args, tsubst_flags_t complain, tree in_decl) { @@ -21572,9 +21550,11 @@ recheck_decl_substitution (tree d, tree tmpl, tree args) /* Instantiate the indicated variable, function, or alias template TMPL with the template arguments in TARG_PTR. */ -static tree -instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain) +tree +instantiate_template (tree tmpl, tree orig_args, tsubst_flags_t complain) { + auto_timevar time (TV_TEMPLATE_INST); + tree targ_ptr = orig_args; tree fndecl; tree gen_tmpl; @@ -21746,18 +21726,6 @@ instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain) return fndecl; } -/* Wrapper for instantiate_template_1. */ - -tree -instantiate_template (tree tmpl, tree orig_args, tsubst_flags_t complain) -{ - tree ret; - timevar_push (TV_TEMPLATE_INST); - ret = instantiate_template_1 (tmpl, orig_args, complain); - timevar_pop (TV_TEMPLATE_INST); - return ret; -} - /* Instantiate the alias template TMPL with ARGS. Also push a template instantiation level, which instantiate_template doesn't do because functions and variables have sufficient context established by the @@ -26595,7 +26563,7 @@ instantiate_decl (tree d, bool defer_ok, bool expl_inst_class_mem_p) if (! push_tinst_level (d)) return d; - timevar_push (TV_TEMPLATE_INST); + auto_timevar time (TV_TEMPLATE_INST); /* Set TD to the template whose DECL_TEMPLATE_RESULT is the pattern for the instantiation. */ @@ -26761,7 +26729,6 @@ instantiate_decl (tree d, bool defer_ok, bool expl_inst_class_mem_p) } pop_deferring_access_checks (); - timevar_pop (TV_TEMPLATE_INST); pop_tinst_level (); input_location = saved_loc; cp_unevaluated_operand = saved_unevaluated_operand;