From patchwork Tue Sep 21 15:26:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1530772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=LCsDeWBE; 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 ozlabs.org (Postfix) with ESMTPS id 4HDQTQ4JCGz9sW5 for ; Wed, 22 Sep 2021 01:34:34 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9388C3858403 for ; Tue, 21 Sep 2021 15:34:32 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 8A6763857C4A for ; Tue, 21 Sep 2021 15:26:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8A6763857C4A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x42e.google.com with SMTP id q26so40309677wrc.7 for ; Tue, 21 Sep 2021 08:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=H1sgbuFUos8ZtGlWWmLKLGvusiwh0PiC7DsHNOezvaQ=; b=LCsDeWBE8ISPo8+PPnhDFtqA8EQZbRbYoMWJNB93FWmvONgKlaUB22ruI5BP6GVhJ8 k2v55m2GTf8KSqTT2JBjd6i09bFxsyDViULyPx49wxE/qrMJM8xNXWZ45ljMY3YGZDsB qCWgNMK0fVGgk2qpl5s74f/wnOJ3NuqPn7oxr58NSTzpy+6SpeeWKNx7gHnrMrQuAIfc M0DEgKMLHXFDjbw1gNwQ/irHKf7JvnQCoOxX/GpMOOyHBvHJ4rwkM7G0eFbhq5UCv6ex y5AF3LH3ADhWUqmhuY0JJi424vhwQkZKqHgcwY6gS8kEw5TlWM9zQKmLHDQY3FN2PV8L 9tVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=H1sgbuFUos8ZtGlWWmLKLGvusiwh0PiC7DsHNOezvaQ=; b=LVyiU7vzDMgQTN6EHdlt6ltIfObJsLWfzTfwbFRjsN/3JHDBE1ths6NRgEVzRoeEQV IqQG6S+uj7wc4srcXTw6tOgx5r5l0k8aU0r1JkWL2gRmhKUFcX6U7jDxjCzV+HjnBkcw Wrpt8mcPGrEu5XbP/izZsDLpV0fdF+bA6kvt83dn1nSJ1PmDFi5Q4h1C4rABpUi5+de6 ozQuilK+9+AnFT0hg5/9a4YvHuM3FiHP3gD4A719F5I9NvnzD1Ba+qWucOL3XAlgKMxk hUU7U19/fe/FrebSKsEInPX+GPq4IWu8do4MPa7MWA8I4SAW/JSzgoMhO25RN6nbKAi3 THWQ== X-Gm-Message-State: AOAM532oFg5CjLIaC+zTNoIu7Nd0LmZs3u7S5mH7RP3qw5GloGo8A6yV eY7W8cacVktqUFRHTb0+OK/IBPRHPSpocQ== X-Google-Smtp-Source: ABdhPJy3XkNm7sH8lLN6oS6Tzz0cZV4VUghj+kKW9g+VQUAuQp/nnuawcwo8q4QRFbuE2nVRpuB6Pw== X-Received: by 2002:a1c:3543:: with SMTP id c64mr5334098wma.68.1632237981091; Tue, 21 Sep 2021 08:26:21 -0700 (PDT) Received: from adacore.com ([2a02:2ab8:224:2ce:72b5:e8ff:feef:ee60]) by smtp.gmail.com with ESMTPSA id o13sm22805320wri.53.2021.09.21.08.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 08:26:20 -0700 (PDT) Date: Tue, 21 Sep 2021 15:26:19 +0000 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Remove if_expression Message-ID: <20210921152619.GA3094775@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.8 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.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: , Cc: Bob Duff Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Replace an if_expression with an if_statement, because codepeer is tripping over the if_expression. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_eval.adb (Fold_Shift): Replace an if_expression with an if_statement. diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -5063,12 +5063,20 @@ package body Sem_Eval is -- result is always positive, even if the original operand was -- negative. - Fold_Uint - (N, - (Expr_Value (Left) + - (if Expr_Value (Left) >= Uint_0 then Uint_0 else Modulus)) - / (Uint_2 ** Expr_Value (Right)), - Static => Static); + declare + M : Unat; + begin + if Expr_Value (Left) >= Uint_0 then + M := Uint_0; + else + M := Modulus; + end if; + + Fold_Uint + (N, + (Expr_Value (Left) + M) / (Uint_2 ** Expr_Value (Right)), + Static => Static); + end; end if; elsif Op = N_Op_Shift_Right_Arithmetic then Check_Elab_Call;