From patchwork Tue May 30 07:21:24 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: 100613 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2000121vqr; Tue, 30 May 2023 00:35:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6hfjGm79g/eLU8BpWZELiZGc6hlKQmqW87sOBdcLUzufB8ogqtJXZ4MJ0Xyu9JTXPjOTyJ X-Received: by 2002:a17:907:7da6:b0:96a:1cbf:3dcc with SMTP id oz38-20020a1709077da600b0096a1cbf3dccmr1700266ejc.54.1685432158932; Tue, 30 May 2023 00:35:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685432158; cv=none; d=google.com; s=arc-20160816; b=lTdaTNntj1GvLXMo80MONLG0swYuH7+TBV2RnPRlkFEKlBB7XsLGNP/TfDMFKMvzlh gzk+ddYpeI5H8UViZ6oLKRTbtNC8i1y3uvd9XG7DT4gYXgMyHXNqaoPR81iI3OcM7qJ9 tBIR/wTPe/oI76PcFg789gh3jcojDhuN72Uv17WutUgknk9swuAkjX29/AuR2tcc2d4+ 8sbBj2n732CCf8lKk16cgi9nj2mcofOK0VZ7LrJSaQH5tn8lGV04lJGJyLYgTF11Vzyf sCQJQxCUwbN3lCJqWc6T1CyMBhsD/wp8KFBkUU8Md43JARjwnCBr6JeVtdugL+57XxZg +VJA== 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=Rt/2BdOEJyEEbXL+dSxv6ajZlBQk2tvCbSZW07LvY+c=; b=ETscYlevkuTzIsJcKa8LtLEDGyGVq03XXSxXPxuwALsX7mBOWU62c1pHN7qltaDxB/ aMsyPy552d0Fy1A2l2lPa9p8QxwqCecvpxYVPwxot7nm2ATreq1HORVR4tzNaWs+yPcz 9rscnFGH8odHls0VkIDucfhVE+uTvC8KX2jNzMzJWaj6NmfnrL8rBh6M6LXC9LPI4ccU 7UzDJDAgWFlLrfbe6llNKtXwkv6E77QIuHcnWXK68mNkdMpuU/yvrqhTkwCfgxY0Jv/p 3jXt+PZ92n2SS7FWqvXssHzphQRCHitUBC5THkGeA2v5BQXVxA4jIXa2X0ySqx7MzZ8r FnOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=dBhFfzEo; 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 tl11-20020a170907c30b00b0096aae0b3695si6343398ejc.84.2023.05.30.00.35.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 00:35:58 -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=dBhFfzEo; 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 0B4A3385C6D6 for ; Tue, 30 May 2023 07:29:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B4A3385C6D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685431768; bh=Rt/2BdOEJyEEbXL+dSxv6ajZlBQk2tvCbSZW07LvY+c=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=dBhFfzEoAetXdtV55veA1CYE8aW9FQFySkrCOyWDB6Bzpb4creiRzSLqpJcwxS4AX Erx7i+0veGs9FSMuyl9fU1cT7NMJSWnwPaBJYsA8V0Fu2Ywdsao9VddbL8vU+ZYvWj XuB5iz0fRHAzEGLIt1uOfkaEcMOrP5Itq1RLhbk0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id D0F7F385589D for ; Tue, 30 May 2023 07:21:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0F7F385589D Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f6d01d390bso42485675e9.2 for ; Tue, 30 May 2023 00:21:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685431286; x=1688023286; 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=Rt/2BdOEJyEEbXL+dSxv6ajZlBQk2tvCbSZW07LvY+c=; b=R/6ppL8j4jLp4DgYBWckMSYEn+uW71Bs+8FrYXcxqgIpLkZ3c/CI+L4ncLys/TPCNO pK4BG2LeDzRMdpqTSRf1HiFfDDqMNqxrdu1ttMguQKM0l6dlXuHP3md7Rb+0i8+o8XOX 0ncVKGCoq+b8YwdN5Q+NQ+5zcgKTiWQpxP3iHPCZ3NPmliJmFNRUSJJ44a6AnlyI0Khr 0Qlxe7VJOY0utN+7JWSabCvbDN72aC5qY3kT3xoSHAgS9u8V/uDOe9VpZrBrJh6zhvwq QEF9PdCD8IX9AcC+xRtfMMJoqGvlPjme6XSkpehD2nCNbeFc3FCUJk+cWNYW6DvTWBTB MHJA== X-Gm-Message-State: AC+VfDzdMUftiIxLiBAfjpHDX4fhRoYRUGy6vbSRpqbpyRij/aovkd5Z U9QJFdWqtLdemT/nNSe8GHPgDV7HE5/UzC6Nq12Bqw== X-Received: by 2002:a7b:ce96:0:b0:3f4:2174:b28a with SMTP id q22-20020a7bce96000000b003f42174b28amr1170381wmj.15.1685431286705; Tue, 30 May 2023 00:21:26 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:7733:a608:a415:6b2a]) by smtp.gmail.com with ESMTPSA id i1-20020a05600c354100b003f61177faffsm28605229wmq.0.2023.05.30.00.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 00:21:26 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Add missing guards for degenerate storage models Date: Tue, 30 May 2023 09:21:24 +0200 Message-Id: <20230530072124.2500941-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, 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: =?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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767303711308290193?= X-GMAIL-MSGID: =?utf-8?q?1767303711308290193?= From: Eric Botcazou gcc/ada/ * gcc-interface/trans.cc (Attribute_to_gnu) : Check that the storage model has Copy_From before instantiating loads for it. : Likewise. : Likewise. (gnat_to_gnu) : Likewise. : Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gcc-interface/trans.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index 57933ceb8a3..18f7e73d45d 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -1978,7 +1978,8 @@ Attribute_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p, int attribute) if (TREE_CODE (gnu_prefix) != TYPE_DECL) { gnu_result = SUBSTITUTE_PLACEHOLDER_IN_EXPR (gnu_result, gnu_prefix); - if (Present (gnat_smo)) + if (Present (gnat_smo) + && Present (Storage_Model_Copy_From (gnat_smo))) gnu_result = INSTANTIATE_LOAD_IN_EXPR (gnu_result, gnat_smo); } else if (CONTAINS_PLACEHOLDER_P (gnu_result)) @@ -2211,7 +2212,8 @@ Attribute_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p, int attribute) handling. Note that these attributes could not have been used on an unconstrained array type. */ gnu_result = SUBSTITUTE_PLACEHOLDER_IN_EXPR (gnu_result, gnu_prefix); - if (Present (gnat_smo)) + if (Present (gnat_smo) + && Present (Storage_Model_Copy_From (gnat_smo))) gnu_result = INSTANTIATE_LOAD_IN_EXPR (gnu_result, gnat_smo); /* Cache the expression we have just computed. Since we want to do it @@ -2373,7 +2375,8 @@ Attribute_to_gnu (Node_Id gnat_node, tree *gnu_result_type_p, int attribute) /* If this has a PLACEHOLDER_EXPR, qualify it by the object we are handling. */ gnu_result = SUBSTITUTE_PLACEHOLDER_IN_EXPR (gnu_result, gnu_prefix); - if (Present (gnat_smo)) + if (Present (gnat_smo) + && Present (Storage_Model_Copy_From (gnat_smo))) gnu_result = INSTANTIATE_LOAD_IN_EXPR (gnu_result, gnat_smo); break; } @@ -6701,7 +6704,8 @@ gnat_to_gnu (Node_Id gnat_node) gnu_result = build_binary_op (ARRAY_REF, NULL_TREE, gnu_result, gnu_expr); - if (Present (gnat_smo)) + if (Present (gnat_smo) + && Present (Storage_Model_Copy_From (gnat_smo))) instantiate_load_in_array_ref (gnu_result, gnat_smo); } @@ -6746,7 +6750,8 @@ gnat_to_gnu (Node_Id gnat_node) gnu_result = build_binary_op (ARRAY_RANGE_REF, gnu_result_type, gnu_array_object, gnu_expr); - if (Present (gnat_smo)) + if (Present (gnat_smo) + && Present (Storage_Model_Copy_From (gnat_smo))) instantiate_load_in_array_ref (gnu_result, gnat_smo); /* If storage model access is required on the RHS, build the load. */