From patchwork Thu Dec 1 13:55:56 2022 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: 28389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp274151wrr; Thu, 1 Dec 2022 06:00:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf7A9FUBuvYeSzPnE4a8i/7EE7zXP07vAyKqKcylO52OQl0sfOzLt/cDh6aiIj7/Bkr6O3qs X-Received: by 2002:a17:906:144c:b0:7ad:cda3:93c7 with SMTP id q12-20020a170906144c00b007adcda393c7mr57171327ejc.500.1669903211305; Thu, 01 Dec 2022 06:00:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669903211; cv=none; d=google.com; s=arc-20160816; b=c5g+VPybJaltKKpYSacJn9ew8Q3DMj0GnvpvdvMJr9mhUBWY1NupCW/M42yHq/HI3b GB9eZ/PJra58taZQJnYs2ZtS80Y56RgaHgyQ1cKCdl/5w7GAC5yLHKfA/nR5etPfFd0i l1PEdBVVYPo/s1KmQ7qSut+VsRJl6Jn3X+xnZGWCiqxFqwIP0llXqUU/Gr9LPzQHKNms Pgz5cZJuK4BxKq44EhXwSnsgpDSZmaLn3lnoOfdsSMH6JKiSIxP/35e+o9CMtp8Ix6Yd 4/R4mAxKYSLr6KqVzjYDAXOUGy+xT7HC114wKFUH7iEgoCmKH8ptmXC5OuvLpDmgNcIW gGWw== 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=kjcHPsfcUBeONwMY+2UYxLV7eZxsiCMKnGQIe2bRGTM=; b=T0pgE6L/cKAlL2/YrNROvT2sc5kgd1A4lQ+6h+D1zBj+3qUAUba7OC7UGzhd4z99C1 esqZVvACAaiufyqYNwmW3Q+0WdqUCTdRZp5e1N//p0fmLMl0E7t4T1nH/vsYoOLYrA0a Mp47ztjJuuPqXg6XueQ3N8vNxQ03Ro0PFGsm+NXpoJUXmLx1VqUU1+RG4kza94HisSE8 DY0laGKYVInR/q2X0ToU+k0aQNMDvp5eCB6/5IGxwy4mW8siLfgrQfVLFfU/KuG3DFB5 cEymC0Tlu6f9vtK+GT99YhP1PuL0C1iiXc/K12xL2kV4WWDlV/JXJkhT3z1sf+z4UiKf NdVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lwfyNCqI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id hg4-20020a1709072cc400b007aeec2bf18fsi4018646ejc.543.2022.12.01.06.00.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 06:00:11 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=lwfyNCqI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 A873F3858280 for ; Thu, 1 Dec 2022 14:00:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A873F3858280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669903209; bh=kjcHPsfcUBeONwMY+2UYxLV7eZxsiCMKnGQIe2bRGTM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=lwfyNCqIH2YXDWa1gKcoWcfHUh1R4e068VnNRLW3DcHQs+lLAsZBvhtEakpQZULlm mf8EOhU4KHgOP3iUD5WIhoX9HZ+iZwFniWXS4Bu39ArNSVKU5GILlUwBQtrRyrcb5R c0KhGgRwcTwq38IrguMdIIN43lfzbJQ0yBuGgYVk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 05D67385517C for ; Thu, 1 Dec 2022 13:56:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 05D67385517C Received: by mail-wr1-x42a.google.com with SMTP id h11so2772624wrw.13 for ; Thu, 01 Dec 2022 05:55:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kjcHPsfcUBeONwMY+2UYxLV7eZxsiCMKnGQIe2bRGTM=; b=mmdfucY+scH+Sr+zdB0Iqio6Kt9lezxYVO41IMqdhif5Z1IzZ3MH4IAPjVOdrGJZO3 VbJldOGcB1TljJ10Z+Fl+/jY1n54si24keQiCsJNZRHYhdjxCzAe22Eg2k/wxVTgyOSt JYxLpdJJsXwR4TJQugSGzGJOHx6dujmLAQg04GdZ3RRHKqbyJctRWrKFzwajLSZetbRz VDPazoOPyGkrtmliuTBxo/ixlow5GyE4j8dF1lMsz/XTHq1sAjPr6Htmq3nrNk7D7j2x pZsLwJhmLjlB1cNoQmq8hwFYwGWoNxTMqpoPNNkR1TCkUeReWswUgkB23QO31NP2m4Mm qqjA== X-Gm-Message-State: ANoB5pmwGFOQECc862Q3ONz4yEpMPltwoMCOmBYSwMEIk1jinbjeWufs 9kparUBA2Wdqx1M46yLl/8+mB0y/5+Gp7w== X-Received: by 2002:a5d:69c6:0:b0:242:1b9d:1bd5 with SMTP id s6-20020a5d69c6000000b002421b9d1bd5mr11321875wrw.232.1669902958858; Thu, 01 Dec 2022 05:55:58 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id ay2-20020a05600c1e0200b003cfd0bd8c0asm5604826wmb.30.2022.12.01.05.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 05:55:58 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Strip conversions for the implementation of storage models Date: Thu, 1 Dec 2022 14:55:56 +0100 Message-Id: <20221201135556.458319-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.5 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751020429856582368?= X-GMAIL-MSGID: =?utf-8?q?1751020429856582368?= From: Eric Botcazou This is necessary for unconstrained allocators with qualified expression. gcc/ada/ * gcc-interface/trans.cc (get_storage_model_access): Strip any type conversion around the node before looking into it. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gcc-interface/trans.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index b9d7c015a73..a012271abf3 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -4400,6 +4400,11 @@ get_storage_model_access (Node_Id gnat_node, Entity_Id *gnat_smo) return; } + /* Now strip any type conversion from GNAT_NODE. */ + if (Nkind (gnat_node) == N_Type_Conversion + || Nkind (gnat_node) == N_Unchecked_Type_Conversion) + gnat_node = Expression (gnat_node); + while (node_is_component (gnat_node)) gnat_node = Prefix (gnat_node);