From patchwork Tue Mar 1 16:55:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1599463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=NutOzgfX; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K7NgH6pPFz9sG3 for ; Wed, 2 Mar 2022 03:56:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 52FEA385841F for ; Tue, 1 Mar 2022 16:56:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52FEA385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1646153768; bh=E7Sh7cap7VebfosOnGkvDiTjB6MvNrZc6gC4PjXd6I8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=NutOzgfXAFZBC7vcGdZiSP8WUwM39KsOGmHuVaYzvbN2UQBUwOSYNlS/LpwBXXI4P W6XIhmoN5UnLFV/o/3LrSPfYj4BGZqXk5xOxoKRuz2r/pFvpNA7ZXigKEv+t3V2Kev BWauyoCY2eq57EJjbrad5qP3PgPFfgiOOVkgV2oA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id B1F3E3858D20 for ; Tue, 1 Mar 2022 16:55:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B1F3E3858D20 Received: by mail-pl1-x630.google.com with SMTP id ay5so11113335plb.1 for ; Tue, 01 Mar 2022 08:55:26 -0800 (PST) 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=E7Sh7cap7VebfosOnGkvDiTjB6MvNrZc6gC4PjXd6I8=; b=UqzU/pDuXVhnrBTrqhNevwRroUNUM88PssBnj4Ea9cvisbBTP4kGsle4apP7xQ3jvo OkpFfvC4YA36zJi02PDn4sdNMZsoXA/HKOBCLK9b5ZVyKrUdsNiz+xxse7jHCmkjbhZ3 5ac5SfU4qpY49trUSVtgCw4sXKlE9JuRpG7k3dsuykDjq07oREjdTrx1S3VfWZetgcaU Ik+3zXCs6j0tjOpgjXanKHrTkrbslcgBeQeAP6mobBmS/6llPmGoHTZg2UvuhrMOH0OB mMr/SqSKL0gM6paLaibkmidrNGUdGE2diB9nrARU30WhQo369pD4wWXHxF6fZGWHmUdP wcyQ== X-Gm-Message-State: AOAM532TmeuyEuis/jb+tGYKEibCv7Qj8T88LakKvoeyUsisTgbMhvnQ Mzd6ayAFsXVp8gk9QdeVwCn39kAjLVk= X-Google-Smtp-Source: ABdhPJzCwi68AGx6PXGKa87vSZ5ZKpqmYvLdWxOE235M9owncQipPBLorR5w9pgTPSUB8pZLOpcx4g== X-Received: by 2002:a17:90a:9b08:b0:1bc:9b4f:8dff with SMTP id f8-20020a17090a9b0800b001bc9b4f8dffmr22318847pjp.159.1646153725424; Tue, 01 Mar 2022 08:55:25 -0800 (PST) Received: from gnu-tgl-2.localdomain ([172.58.35.88]) by smtp.gmail.com with ESMTPSA id f15-20020a056a0022cf00b004f3b99a6c43sm17836814pfj.219.2022.03.01.08.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 08:55:25 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id D551C300438; Tue, 1 Mar 2022 08:55:23 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Use C++ RAII to clear currently_expanding_gimple_stmt Date: Tue, 1 Mar 2022 08:55:23 -0800 Message-Id: <20220301165523.869939-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Jakub Jelinek , Richard Biener Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Use C++ RAII with make_temp_override in the C++ FE to automatically clear currently_expanding_gimple_stmt. gcc/ PR middle-end/104721 * cfgexpand.cc (expand_gimple_basic_block): Use make_temp_override to clear currently_expanding_gimple_stmt automatically. * tree.h (temp_override): Moved from cp/cp-tree.h. (type_identity_t): Likewise. make_temp_override(): Likewise. gcc/cp/ PR middle-end/104721 * cp-tree.h (temp_override): Moved to ../tree.h. (type_identity_t): Likewise. make_temp_override(): Likewise. --- gcc/cfgexpand.cc | 15 +++++--------- gcc/cp/cp-tree.h | 51 ------------------------------------------------ gcc/tree.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 61 deletions(-) diff --git a/gcc/cfgexpand.cc b/gcc/cfgexpand.cc index 87536ec7ccd..3d656113df5 100644 --- a/gcc/cfgexpand.cc +++ b/gcc/cfgexpand.cc @@ -5817,6 +5817,9 @@ expand_gimple_basic_block (basic_block bb, bool disable_tail_calls) if (note) NOTE_BASIC_BLOCK (note) = bb; + auto cleanup = make_temp_override (currently_expanding_gimple_stmt, + nullptr); + for (; !gsi_end_p (gsi); gsi_next (&gsi)) { basic_block new_bb; @@ -5927,10 +5930,7 @@ expand_gimple_basic_block (basic_block bb, bool disable_tail_calls) { new_bb = expand_gimple_cond (bb, as_a (stmt)); if (new_bb) - { - currently_expanding_gimple_stmt = NULL; - return new_bb; - } + return new_bb; } else if (is_gimple_debug (stmt)) { @@ -6052,10 +6052,7 @@ expand_gimple_basic_block (basic_block bb, bool disable_tail_calls) if (can_fallthru) bb = new_bb; else - { - currently_expanding_gimple_stmt = NULL; - return new_bb; - } + return new_bb; } } else @@ -6078,8 +6075,6 @@ expand_gimple_basic_block (basic_block bb, bool disable_tail_calls) } } - currently_expanding_gimple_stmt = NULL; - /* Expand implicit goto and convert goto_locus. */ FOR_EACH_EDGE (e, ei, bb->succs) { diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 80994e94793..0a55588dc5d 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1961,57 +1961,6 @@ public: } }; -/* RAII sentinel that saves the value of a variable, optionally - overrides it right away, and restores its value when the sentinel - id destructed. */ - -template -class temp_override -{ - T& overridden_variable; - T saved_value; -public: - temp_override(T& var) : overridden_variable (var), saved_value (var) {} - temp_override(T& var, T overrider) - : overridden_variable (var), saved_value (var) - { - overridden_variable = overrider; - } - ~temp_override() { overridden_variable = saved_value; } -}; - -/* Wrapping a template parameter in type_identity_t hides it from template - argument deduction. */ -#if __cpp_lib_type_identity -using std::type_identity_t; -#else -template -struct type_identity { typedef T type; }; -template -using type_identity_t = typename type_identity::type; -#endif - -/* Object generator function for temp_override, so you don't need to write the - type of the object as a template argument. - - Use as auto x = make_temp_override (flag); */ - -template -inline temp_override -make_temp_override (T& var) -{ - return { var }; -} - -/* Likewise, but use as auto x = make_temp_override (flag, value); */ - -template -inline temp_override -make_temp_override (T& var, type_identity_t overrider) -{ - return { var, overrider }; -} - /* The cached class binding level, from the most recently exited class, or NULL if none. */ diff --git a/gcc/tree.h b/gcc/tree.h index 36ceed57064..32d610474d2 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -6581,4 +6581,55 @@ extern tree get_attr_nonstring_decl (tree, tree * = NULL); extern int get_target_clone_attr_len (tree); +/* RAII sentinel that saves the value of a variable, optionally + overrides it right away, and restores its value when the sentinel + id destructed. */ + +template +class temp_override +{ + T& overridden_variable; + T saved_value; +public: + temp_override(T& var) : overridden_variable (var), saved_value (var) {} + temp_override(T& var, T overrider) + : overridden_variable (var), saved_value (var) + { + overridden_variable = overrider; + } + ~temp_override() { overridden_variable = saved_value; } +}; + +/* Wrapping a template parameter in type_identity_t hides it from template + argument deduction. */ +#if __cpp_lib_type_identity +using std::type_identity_t; +#else +template +struct type_identity { typedef T type; }; +template +using type_identity_t = typename type_identity::type; +#endif + +/* Object generator function for temp_override, so you don't need to write the + type of the object as a template argument. + + Use as auto x = make_temp_override (flag); */ + +template +inline temp_override +make_temp_override (T& var) +{ + return { var }; +} + +/* Likewise, but use as auto x = make_temp_override (flag, value); */ + +template +inline temp_override +make_temp_override (T& var, type_identity_t overrider) +{ + return { var, overrider }; +} + #endif /* GCC_TREE_H */