From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x42a.google.com with SMTP id h11so2772624wrw.13 for ; Thu, 01 Dec 2022 05:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kjcHPsfcUBeONwMY+2UYxLV7eZxsiCMKnGQIe2bRGTM=; b=FsKRfTf3Wk0vzt/fjrelGsE6yvivViwZ/j0Dm10FmM2C7JR4/TMu5qg8gPY1hwRFSU j9uWE4MxqIplga3XpunDwR7dWFnfTYKm6CzqjdmJspnqVYKJ3Oh0D1WUM0DIhuVP4cc6 NdIFGUKIeh8dbCyHZtf3RPjE0r6FWFKWFr75sXU6RicdK4QanBRGbje4XT4Pp3LiMCBQ LoSWzxYbF+kdbZu82h1RJGOxvPorowisQESzvZJFDwLCsq3PFsz+mcsqEEurDpJb6ubE OOiS14NCHQ/8Qu1WSfpB6EZKutxull/avLYO/BCZ0DEh4enP7iNLEDuNFU771z7PHWIQ qi9Q== 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-Google-Smtp-Source: AA0mqf5dSGpet1CvOXtYQwbbvRoNgeU6tlF7poUZRjNDa62hEx9RooIxDhgq5MRAgC2ptk6+k6v40g== 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) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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); -- 2.34.1