From patchwork Wed Jul 13 10:02:48 2022 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: 213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a98:d5ce:0:b0:178:cc93:bf7d with SMTP id g14csp163264eik; Wed, 13 Jul 2022 03:04:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s0HK+v4EMUPAKDBy8AGaM3iIIW+6b9m5BqjJS2yYIR3w23X1SnU0zfP33xf4/UbjzxqWND X-Received: by 2002:a17:906:49:b0:6f3:bb5e:54a8 with SMTP id 9-20020a170906004900b006f3bb5e54a8mr2586962ejg.534.1657706690048; Wed, 13 Jul 2022 03:04:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657706690; cv=none; d=google.com; s=arc-20160816; b=klIsTHoqGXPe4telxD46hR309pXeACI8iX8nPdPZvy1Yr6kDr0NSr952KE5/mwuRkg 35SYYZml/sq3f6kg5HYcr4f0X2boIEcu9w/i7umd4NdtWBI5U4IgmCqHCZr/648Xwa2E IXl9HMrHGmWjowo6CAh5n6lqebcLx1G5H1QsBL1lkMnzNS883Um2G7KFLaRRXDLrZymH aGCbI0qTphGGmHDogC2aW/C+Z2o3QtvgRmO/fESaFu3Csv/fLrZqRkhYApkv5QnRounK Nmg2/4DW2BtN5erxkrCINHp870qmSDL4rRznvQo3Fyh0m/CrKF7N+4dNEM+qH8hAnGzM J6nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=K2btXv+VuQIdPvQ5ZceVxQuPlWlje6qtHa/PIq6W93Y=; b=NNj36CEIj4+cnm0769mA1vhxonxg3qzUjS5LOihLfG4kxa9qxjgvcHE9dwqCfypec6 cXH/l9APXVNT7zVcqq99JIhgc+uMkMVdhvm+68eKLp8AWQYNv1kOSyUx6j+z4WDb7VkI vIJsAbygQ2OedFqizWnc1YX/BW9Kuk9b9Ap/Z7ouRLIi+EXagQmTTF10SYWNchxxRDVI jS4cof2II7npM2L/u1yK08IvQeFRd/cGucEd9yHx6SYqp6GS+Le+OUau2qAKjsO8POo7 TNwT5cQr1nEw+eNIfhhzhtf9zs1PuhpPT2/4DWwZu7kc/Py9cJU3A02+22/iyPJx0VIn vtlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=MukbKgrt; 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 sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ds14-20020a170907724e00b0072b9815216bsi2479062ejc.990.2022.07.13.03.04.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 03:04:50 -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=MukbKgrt; 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 B47F53876895 for ; Wed, 13 Jul 2022 10:03:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B47F53876895 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657706622; bh=K2btXv+VuQIdPvQ5ZceVxQuPlWlje6qtHa/PIq6W93Y=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=MukbKgrtKyNqJu6IokHaBgai74IZI1ll55hVVoo/NNrpzL+AQqmo72edtfYiw0wtI jgKcb5k24OQr3qyXE2M6LgJge4YGyWkn5rlK6s7eAornAUptiR8AGaY5szi8Hkmcyr hXLmiJ8KKRCyuT6M0Pi5J7y8GB/A+vKHjRMQjFsk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by sourceware.org (Postfix) with ESMTPS id E5C1E38515C3 for ; Wed, 13 Jul 2022 10:02:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E5C1E38515C3 Received: by mail-ed1-x52e.google.com with SMTP id y4so13413538edc.4 for ; Wed, 13 Jul 2022 03:02:50 -0700 (PDT) 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=K2btXv+VuQIdPvQ5ZceVxQuPlWlje6qtHa/PIq6W93Y=; b=ZYUG9IcWhLPPB1UHDwLl/pcZzOo47yzi1bLz12+cj1zjzPljxwdL7NojV04YUaFzNO uHOkatnOasY6pPJuHFd7o4RsDkZgWkAgLFF9rne5hSvVh753eoqlw+XPjvegqFlL2/FD U4fu/W8O3/rlrtGSVwHivAsXTCdRTsTac16uc4O8fvqYWE6v6mSrPhSoYW4yuzcY5NR6 vwP58kjojEj9VT7P9pvodBNGsldc7ASSArSd/fC1K4r+WVtYejQKWofbmwBn2j2Ur9Tb vQIW2aVau5j/y4Yyr6uVYZGeBmqUsh5OMTjJzts6lI4t4XSE3nT3G+TWpt7oQn2DMqtc ueVQ== X-Gm-Message-State: AJIora9EMEvWFqukh/VlnwpGB586py70OfJ7LZtHT5sHsic0CaUG7JVH XTdCjsrPObcifV8i89eaMV5wnQTXMdzaDg== X-Received: by 2002:a05:6402:c44:b0:431:52cc:f933 with SMTP id cs4-20020a0564020c4400b0043152ccf933mr3739648edb.41.1657706569736; Wed, 13 Jul 2022 03:02:49 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id f12-20020a170906390c00b006fec8e8eff6sm4792562eje.176.2022.07.13.03.02.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 03:02:49 -0700 (PDT) Date: Wed, 13 Jul 2022 10:02:48 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix if expression returning slice Message-ID: <20220713100248.GA994551@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 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, 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Marc =?iso-8859-1?q?Poulhi=E8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1738231449982889235?= X-GMAIL-MSGID: =?utf-8?q?1738231449982889235?= The compiler incorrectly assumed the prefix for a slice returned in one branch of an if expression has its bounds known at compile time and would crash when this is not true. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_ch4.adb (Expand_N_If_Expression): Test for compile time known bounds when handling slices. diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -6174,7 +6174,13 @@ package body Exp_Ch4 is Slice_Bnd : Node_Id) return Node_Id is begin - if Nkind (Elsex) = N_Slice then + -- We need to use the special processing for slices only if + -- they do not have compile-time known bounds; if they do, they + -- can be treated like any other expressions. + + if Nkind (Elsex) = N_Slice + and then not Compile_Time_Known_Bounds (Etype (Elsex)) + then if Compile_Time_Known_Value (Slice_Bnd) and then Expr_Value (Slice_Bnd) = Then_Bnd then @@ -6230,7 +6236,11 @@ package body Exp_Ch4 is begin Get_First_Index_Bounds (Etype (Thenx), Then_Lo, Then_Hi); - if Nkind (Elsex) = N_Slice then + -- See the rationale in Build_New_Bound + + if Nkind (Elsex) = N_Slice + and then not Compile_Time_Known_Bounds (Etype (Elsex)) + then Slice_Lo := Low_Bound (Discrete_Range (Elsex)); Slice_Hi := High_Bound (Discrete_Range (Elsex)); Get_First_Index_Bounds @@ -6289,7 +6299,11 @@ package body Exp_Ch4 is Set_Suppress_Assignment_Checks (Last (Then_List)); - if Nkind (Elsex) = N_Slice then + -- See the rationale in Build_New_Bound + + if Nkind (Elsex) = N_Slice + and then not Compile_Time_Known_Bounds (Etype (Elsex)) + then Else_List := New_List ( Make_Assignment_Statement (Loc, Name =>