From patchwork Mon Aug 7 11:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 131801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1374718vqr; Mon, 7 Aug 2023 04:18:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0qlCwA5FsAtnFz9ElLuxUhlFBQZ2X0lFAUCArnaa4ntZ/hcWRnrSWnctJLi65hQYtl+TY X-Received: by 2002:a17:906:249:b0:99c:da24:bdb7 with SMTP id 9-20020a170906024900b0099cda24bdb7mr2131787ejl.71.1691407135255; Mon, 07 Aug 2023 04:18:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691407135; cv=none; d=google.com; s=arc-20160816; b=AgBSdSTtWZe7ykMev5U8nrmTcIouBpKDXY/kdorDORJ1x0V1uc3Yo5zjL1VVd/Z2xP k0INGwSPyGqo+rjzBbsjYLUdAqbUL40Nt0Hu0jCXoEO8UtqKxMXi9+KUEFbu1PWX5ONG Z1gu9HhHI6QU+blOQ83IVWlCMDDDoDF2yBAqI9NtFTupwW7j+75fhE3HcCVgNgyiWk2I boWM67OJpBXDPmhDO2Q8g8NDApQ96rriA7X0TilrVDXutIC3xiyH6nr2u7SzGL1mmTd9 F3BvwmAR4trHGWz4PAEYlQzDThg4uRGDzgOt6KE82XUm/bEN5p+yeErLYPAj+0/3/zim jUPw== 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:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=+3Lo8P1UaISG8Z0K8R/gZC3JLpzrsk0Z0XQWJ1hvMAw=; fh=IG1vP+QW/+W8mciGx+F2QUKHSqhPuxx3asUj+NTFqQw=; b=WnfUMBxR7h0y6DP2pmryp9uDc+tlR6zWtWzoB+kIT7VFUcIvd42tXBZniSBOx1hOmX 98RgLVESRefMCgtgLOMKl277glGpUxJZ5U11C7yvBXStliWsw75oMwi51+xPqW/WxmP4 Q2p+0NIGbxXZOJXFdu81dSllpeQbvpPUpp9jNH91ab+GRY1DKC7JPOHeWvZn4Cfl4jTW dPv/ptZnYqpn50uGfrBBsnT04aXMbP+P+0blXs+5VIzgk+yr1iw6AlaPNASP7Eko2Ohp bW3Y9W8bbhvvs9qfmt6lxDLgJ9M4Iq4w9qSUotG1+FjqJcZYs9bL7P0+5igU2EouE1nF gUrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=DSCVS02Y; 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 x17-20020a170906b09100b0099bce59e6ddsi5601243ejy.169.2023.08.07.04.18.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:18:55 -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=DSCVS02Y; 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 BB2953857726 for ; Mon, 7 Aug 2023 11:18:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB2953857726 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691407101; bh=+3Lo8P1UaISG8Z0K8R/gZC3JLpzrsk0Z0XQWJ1hvMAw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=DSCVS02Ye3J62cMtzutUnzRO6s12tDlWxl5DibeH7SIx6IztGErMCnYm0dkIG5Apl gN4WG4PKpwTtFpZHJ0VrkTFSlS/8vC9t5TZADvhtv20xRydkqYSFP5pG2qqPRu0bE1 M/H89+JdMwOMgEAmpiGHYmUViDOAvXBaJqgwku5o= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id EE6013858417 for ; Mon, 7 Aug 2023 11:16:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE6013858417 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fe4a89e8c4so21150905e9.3 for ; Mon, 07 Aug 2023 04:16:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691407002; x=1692011802; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+3Lo8P1UaISG8Z0K8R/gZC3JLpzrsk0Z0XQWJ1hvMAw=; b=Dhafm5nhbxFkt5eH4sjJmVs6RKOw+EiqGcI9G6NeNQzqeTn2ITz+n5WA5rKxYalVsj cpuKxV+JFYAHUyPC9HqlI6o8ulsBrnh+blkukWAzb4ZauOoAiIYuHyKJV9gwGVvvnAou fyaE55O5oTFayxXJ5U6c2w+meE1tMGHj6vZ/bTdf7+xUunE93Dt1iLtObOFXPATEPep5 1l+OmPTOiryir2pMQrNwv1E7+5Uzb/oNGlh6knxb3VKXZkYOUvH6Lz2nOVNDAcSDIwKL sjdNDKUOWF5Spi8ZfgwW7pC3aihKTygGJmR6yqJrCKN38+stU26kTuG3h3yIGGtUm1Mk nOoA== X-Gm-Message-State: AOJu0YzdWeyG4TSVqCDw/dEjSN9hUXpE+9E+IgJPwSRv6rRxsnnmGhOB tPOLGkYDP5DWLu1FGZDnNob8uwqOUE0CseXpbXakJg== X-Received: by 2002:a1c:f603:0:b0:3fe:21b9:806 with SMTP id w3-20020a1cf603000000b003fe21b90806mr5897262wmc.0.1691407002615; Mon, 07 Aug 2023 04:16:42 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id p22-20020a05600c205600b003fbb0c01d4bsm10363270wmg.16.2023.08.07.04.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:16:41 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Sheri Bernstein Subject: [COMMITTED] ada: Refactor multiple returns Date: Mon, 7 Aug 2023 13:16:41 +0200 Message-Id: <20230807111641.2855120-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773568928287055692 X-GMAIL-MSGID: 1773568928287055692 From: Sheri Bernstein Replace multiple returns by a single return statement with a conditional expression. This is more readable and maintainable, and also conformant with a Highly Recommended design principle of ISO 26262-6. gcc/ada/ * libgnat/s-parame__qnx.adb: Refactor multiple returns. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/s-parame__qnx.adb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gcc/ada/libgnat/s-parame__qnx.adb b/gcc/ada/libgnat/s-parame__qnx.adb index d9b46b6f795..8a7dfaf57d0 100644 --- a/gcc/ada/libgnat/s-parame__qnx.adb +++ b/gcc/ada/libgnat/s-parame__qnx.adb @@ -39,13 +39,11 @@ package body System.Parameters is function Adjust_Storage_Size (Size : Size_Type) return Size_Type is begin - if Size = Unspecified_Size then - return Default_Stack_Size; - elsif Size < Minimum_Stack_Size then - return Minimum_Stack_Size; - else - return Size; - end if; + return + (if Size = Unspecified_Size then Default_Stack_Size + elsif Size < Minimum_Stack_Size then Minimum_Stack_Size + else Size + ); end Adjust_Storage_Size; ------------------------ @@ -56,14 +54,16 @@ package body System.Parameters is Default_Stack_Size : constant Integer; pragma Import (C, Default_Stack_Size, "__gl_default_stack_size"); begin - if Default_Stack_Size = -1 then - -- 256K is the default stack size on aarch64 QNX - return 256 * 1024; - elsif Size_Type (Default_Stack_Size) < Minimum_Stack_Size then - return Minimum_Stack_Size; - else - return Size_Type (Default_Stack_Size); - end if; + return + (if Default_Stack_Size = -1 + then + (256 * 1024) -- 256K is the default stack size on aarch64 QNX + elsif Size_Type (Default_Stack_Size) < Minimum_Stack_Size + then + Minimum_Stack_Size + else + Size_Type (Default_Stack_Size) + ); end Default_Stack_Size; ------------------------