From patchwork Thu Jul 13 08:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 119690 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1689115vqm; Thu, 13 Jul 2023 02:05:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlGXbWMRA0c43kCCp+ZZXe4jqK2VKSq6kIyEXqcWBrfcFRUAaSkPLenOBWXMXsO/KRrN6zVW X-Received: by 2002:a17:906:289:b0:993:ff93:cf8f with SMTP id 9-20020a170906028900b00993ff93cf8fmr1024458ejf.8.1689239111240; Thu, 13 Jul 2023 02:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689239111; cv=none; d=google.com; s=arc-20160816; b=GLiUQdiJXY7xsYO1XwMXczcoUVNFN/Y4f6Yap3yJ/CguO6Y8VnNcUkbFvouss62rFm XASjvU2pLxgZi7T3Ql+K2ks8S1PjMUeZz59q/3dKg0Ag0ajkzgBjV3ggc4IbtW9id/Td RcJPfSlZtD0T2W7TO1NE3bQYRmdNG9tbyDjZVFoaqku99NAJ9p5l9SAwlsLkwsj8UZmf uFpyplRaqbFZq+P1sTafZdoVUtJ9fC//VTNfBk6muVc38w4IlhA/8eGh2gEeIwQLNrAX 0XaTNBdOPG1B7EAgMVMrYA+N7J/8H7pQgVITPkyBtZRd+j6Vb8qLmbNrak0wiy1EntcU RXnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=DWS87SdkcrjoBg+SX8sxIUw0kGuSpQze4BEkbtom858=; fh=EAqAZnhg4AYtcBjfPm18lEF5V0R2rkI9MSWQf+svVaI=; b=jACPN/GkhzJtiF73lXbQHRYVrS1Vpy4x3ZncDH2xSft1j4f9fTx0USjb8hVh4PtMh/ ihzDAYPd/aQ5ZWZIX+Au1cx70m+HpgtfLZ8j5rdnSQ90/bnwWPYEvX77JNnW9KK8T/iw u72XIT7C4bjzSUd3FHlTbL9CstBap5xdlYz+vlYXpFvm32ljZ+jX8vtsczDf1BIB0W4K s18Gawj2ShqN5NFKD8U9KOlEeA5kxCTVYgme3yx7xuxLmIsP38dCvTATSWyBRF4QOJij PCaIJyvm3hQKHA8Jwz9hWMspb5umjSIY1iEs2uXnSIQRjOKRRoiTCCRrDY3nfsvK42U7 5T3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mNRNQLWv; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id x25-20020a1709064a9900b0098d807ee793si6844561eju.1023.2023.07.13.02.05.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 02:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mNRNQLWv; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 381B6393FC39 for ; Thu, 13 Jul 2023 08:56:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 381B6393FC39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689238616; bh=DWS87SdkcrjoBg+SX8sxIUw0kGuSpQze4BEkbtom858=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=mNRNQLWvGjE8oTPJAaHbZhf5QMhR/dChkGQzUrngmQ6bhXN+GGZacq2LGh9oJc3lh hPfEp4JQO2EAQUnhynTpFw9tKyQGepUvWQuw6+MqUrOPJ/mG4AF2F9PFcBpCmQlJ/N qmFI/YoAWBwJFMDkNq3GXnL1iExww2uZQWCbGH5E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.smtpout.orange.fr (smtp-13.smtpout.orange.fr [80.12.242.13]) by sourceware.org (Postfix) with ESMTPS id 236493858028 for ; Thu, 13 Jul 2023 08:52:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 236493858028 Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id Js3wqzoJKtImzJs44q0yW4; Thu, 13 Jul 2023 10:52:44 +0200 X-ME-Helo: cyrano.home X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Thu, 13 Jul 2023 10:52:44 +0200 X-ME-IP: 86.215.161.51 To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 09/14] fortran: Inline variable definition Date: Thu, 13 Jul 2023 10:52:31 +0200 Message-Id: <20230713085236.330222-10-mikael@gcc.gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713085236.330222-1-mikael@gcc.gnu.org> References: <20230713085236.330222-1-mikael@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NEUTRAL, 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: Mikael Morin via Gcc-patches From: Mikael Morin Reply-To: Mikael Morin Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771295590730734453 X-GMAIL-MSGID: 1771295590730734453 The variable has_finalizer is only used in one place, inline its definition there. gcc/fortran/ChangeLog: * trans.cc (gfc_add_finalizer_call): Inline definition of variable has_finalizer. Merge nested conditions. --- gcc/fortran/trans.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc index c6a65c87c5c..99677d37da7 100644 --- a/gcc/fortran/trans.cc +++ b/gcc/fortran/trans.cc @@ -1321,7 +1321,6 @@ gfc_add_finalizer_call (stmtblock_t *block, gfc_expr *expr2) tree tmp; gfc_ref *ref; gfc_expr *expr; - bool has_finalizer = false; if (!expr2 || (expr2->ts.type != BT_DERIVED && expr2->ts.type != BT_CLASS)) return false; @@ -1361,13 +1360,11 @@ gfc_add_finalizer_call (stmtblock_t *block, gfc_expr *expr2) ref->next = NULL; } - if (expr->ts.type == BT_CLASS) - { - has_finalizer = gfc_is_finalizable (expr->ts.u.derived, NULL); - - if (!expr2->rank && !expr2->ref && CLASS_DATA (expr2->symtree->n.sym)->as) - expr->rank = CLASS_DATA (expr2->symtree->n.sym)->as->rank; - } + if (expr->ts.type == BT_CLASS + && !expr2->rank + && !expr2->ref + && CLASS_DATA (expr2->symtree->n.sym)->as) + expr->rank = CLASS_DATA (expr2->symtree->n.sym)->as->rank; stmtblock_t tmp_block; gfc_start_block (&tmp_block); @@ -1398,7 +1395,8 @@ gfc_add_finalizer_call (stmtblock_t *block, gfc_expr *expr2) tmp = gfc_finish_block (&tmp_block); - if (expr->ts.type == BT_CLASS && !has_finalizer) + if (expr->ts.type == BT_CLASS + && !gfc_is_finalizable (expr->ts.u.derived, NULL)) { tree cond; gfc_se se;