From patchwork Tue Jul 18 13:13:11 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: 122009 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1736865vqt; Tue, 18 Jul 2023 06:15:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlFlFaG4cnC4LkI8bwswYHNpLWb/Yz+eujGBMowimFbvqfOWdytrZ7GPn5Zz3FuDsw1NrOwW X-Received: by 2002:aa7:c643:0:b0:51e:3bb0:aa4e with SMTP id z3-20020aa7c643000000b0051e3bb0aa4emr2211298edr.15.1689686115470; Tue, 18 Jul 2023 06:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689686115; cv=none; d=google.com; s=arc-20160816; b=pR4YL/5WAAqox94Yi266b8eHPVNfrLm9bb67tgW+5r4+1gjbE0cChgdSyRKkhuef0q CMJzdq+Hi7cXNuZ5A1WT4EgW7Pv6B3BrznWyLEum8m9wcawnjvZ+cjG8Zty0nhja2tnO FWaWIUDjN3aAl+E+xovHEVp29YqYPzIZrmdRNJjtcFogsdI3u/w41aSQTUVoStHQ9wBQ 9Po+Mqx41QNlSztl/lxTdUekMy0xZpsoYHqUtL5hUxki0Ua5esApx9gcwKxphnzBQM95 orUiCtKVKGhXvXCp+cmqeGbAAU4Kv9Rk7kQBv+GYKfU4oiI1PSX3g3v73+5UUdFWjY5O NRAA== 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=qlWMgyPRDx3G6O9x6/BbXsK4z3CWjEgHF2APZ0LYL10=; fh=/3KX5nH+f3PGIzCwnuf//1E+cbLgxv/xavy4NboKqC4=; b=hWMSfNTq+GSwuRKp+a2+33nOzyIre0gKPAiHH+ZenUJVmJrkqDlKxw70eNpcPQzEjR N4UUvx/ZyePKtX9nJ/J3JYUKgCMvtYlgf7gjMfLq7VK/tkePa6NkatERLHLE3HpiaNsr b2XRsDWcdISVJ+3NDMv96Zo3jQSANrV22QMbZwYVUaW8cqftXW9CxU5v8WU6W3PzoWrS /pKkDdEWkjG9EvjK3yBSGK0nnIGxVQOHN09zsjsdtg9A+5r5o+L5/32BhTaDLAHj3aUH OChfzfx/P5vpaOXZWPeTn0oYzGnVkWfCopv3yNcAcGzWPs0dxOh38/l24wvY6J+Llxbb QVJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Gk0ZcaaW; 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b20-20020a056402139400b00521a9ae22adsi824111edv.104.2023.07.18.06.15.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 06:15:15 -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=Gk0ZcaaW; 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 51DF8386C5A8 for ; Tue, 18 Jul 2023 13:14:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 51DF8386C5A8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689686052; bh=qlWMgyPRDx3G6O9x6/BbXsK4z3CWjEgHF2APZ0LYL10=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Gk0ZcaaWXhzHrXRtlO1FWEKGQeWhFe152gho40E7tFZoP776H3gGVE2h+MFnKMngX XR6BgqKXI23m63TYKtLwl9kg+4KgAWpNdgDCMzXF7k5NekcKLwZI5XVtFm/fYIo6as 2ObsMkdu73kq5XtaH1WFdqVzAgJe+ysleyEXpEfY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 3F5BD3856DDE for ; Tue, 18 Jul 2023 13:13:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F5BD3856DDE Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fbf1b82dc7so52697945e9.2 for ; Tue, 18 Jul 2023 06:13:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689686003; x=1690290803; 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=qlWMgyPRDx3G6O9x6/BbXsK4z3CWjEgHF2APZ0LYL10=; b=dYV4CLWdCVKG05ysyLsshxlX/8o773oJZ9ZB0DJU7XF8rPDwk34vd9Yc56tFYzm3nb p99TWTBsr+9TqslrnVR3l2VP6MqPqs1jdtkmp+3n0gJWLuKNyy2fCDL4cY73gtpIVbA9 jgZa7L33ati9esuXjaV+wAeZu7u3FBWalFcpfXY66Gm8D+7GxHDJPKp7UcXFYjoiH0hn ZvDXBFNtShVr8BOFbmIBBMKsCM8Xjdxg05RlAfy5P+6FO07IQoUomTQOR1hZw8bPlYxM 4J8u9UB+ZOBLbVDzOTnTGIzA76AD4HDxGw1jMdHQqGvJwSt/I9WiNs1y64vkSdSmO2rV yiQg== X-Gm-Message-State: ABy/qLZCu3oS7v9//4kNSzGfUbGpnd1ABMWQtrjnpzELYNsbF8wkV5KQ 94kKfkqa+OkDHQ6r6TVg+3dMYVHp+7fbBTeOijFFMw== X-Received: by 2002:a05:600c:20c1:b0:3fa:9767:c816 with SMTP id y1-20020a05600c20c100b003fa9767c816mr1700951wmm.39.1689686003019; Tue, 18 Jul 2023 06:13:23 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id k25-20020a7bc419000000b003fbc30825fbsm2089127wmi.39.2023.07.18.06.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 06:13:22 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Fix Valid_Scalars attribute applied to types from limited with Date: Tue, 18 Jul 2023 15:13:11 +0200 Message-Id: <20230718131311.80670-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: INBOX X-GMAIL-THRID: 1771764308588091957 X-GMAIL-MSGID: 1771764308588091957 From: Eric Botcazou The attribute is wrongly computed as always True because, unlike for e.g. private types, Validated_View does not look through the limited view. gcc/ada/ * sem_util.ads (Validated_View): Document enhanced behavior. * sem_util.adb (Validated_View): Return the nonlimited view, if any, of types coming from a limited with. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 7 +++++++ gcc/ada/sem_util.ads | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 821aacf1ccb..222fd72a061 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -29231,6 +29231,13 @@ package body Sem_Util is return Typ; end if; + elsif From_Limited_With (Typ) then + if Has_Non_Limited_View (Typ) then + return Validated_View (Non_Limited_View (Typ)); + else + return Typ; + end if; + else return Typ; end if; diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index 3751fb73702..7fc77de2b8a 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -3331,8 +3331,8 @@ package Sem_Util is function Validated_View (Typ : Entity_Id) return Entity_Id; -- Obtain the "validated view" of arbitrary type Typ which is suitable for -- verification by attribute 'Valid_Scalars. This view is the type itself - -- or its full view while stripping away concurrency, derivations, and - -- privacy. + -- or its full view or nonlimited view, while stripping away concurrency, + -- derivations, and privacy. function Visible_Ancestors (Typ : Entity_Id) return Elist_Id; -- [Ada 2012:AI-0125-1]: Collect all the visible parents and progenitors