From patchwork Mon May 25 15:04:26 2020 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: 1297383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49W0kP3QvCz9sSx for ; Tue, 26 May 2020 01:04:45 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E740C383E80F; Mon, 25 May 2020 15:04:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id EB8E33890438 for ; Mon, 25 May 2020 15:04:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EB8E33890438 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 7D1A81173B1; Mon, 25 May 2020 11:04:26 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 2UxSE6DbkgsD; Mon, 25 May 2020 11:04:26 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 68BCF1173AE; Mon, 25 May 2020 11:04:26 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 63DADA7; Mon, 25 May 2020 11:04:26 -0400 (EDT) Date: Mon, 25 May 2020 11:04:26 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Spurious accessibility error on return aggregate in GNATprove mode Message-ID: <20200525150426.GA102349@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Justin Squirek Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This patch fixes an issue whereby valid actuals within return aggregates could trigger spurious accessibility errors in GNATprove mode. Tested on x86_64-pc-linux-gnu, committed on trunk 2020-05-25 Justin Squirek gcc/ada/ * sem_ch6.adb (Check_Return_Obj_Accessibility): Use original node to avoid looking at expansion done in GNATprove mode. --- gcc/ada/sem_ch6.adb +++ gcc/ada/sem_ch6.adb @@ -798,44 +798,44 @@ package body Sem_Ch6 is N_Discriminant_Association) then Expr := Expression (Assoc); + else + Expr := Empty; end if; -- This anonymous access discriminant has an associated -- expression which needs checking. - if Nkind (Expr) = N_Attribute_Reference + if Present (Expr) + and then Nkind (Expr) = N_Attribute_Reference and then Attribute_Name (Expr) /= Name_Unrestricted_Access then -- Obtain the object to perform static checks on by moving -- up the prefixes in the expression taking into account -- named access types. - Obj := Prefix (Expr); + Obj := Original_Node (Prefix (Expr)); while Nkind_In (Obj, N_Indexed_Component, N_Selected_Component) loop + Obj := Original_Node (Prefix (Obj)); + -- When we encounter a named access type then we can -- ignore accessibility checks on the dereference. - if Ekind (Etype (Prefix (Obj))) + if Ekind (Etype (Obj)) in E_Access_Type .. E_Access_Protected_Subprogram_Type then - if Nkind (Obj) = N_Selected_Component then - Obj := Selector_Name (Obj); + if Nkind (Parent (Obj)) = N_Selected_Component then + Obj := Selector_Name (Parent (Obj)); end if; exit; end if; -- Skip over the explicit dereference - if Nkind (Prefix (Obj)) = N_Explicit_Dereference then - Obj := Prefix (Prefix (Obj)); - - -- Otherwise move up to the next prefix - - else - Obj := Prefix (Obj); + if Nkind (Obj) = N_Explicit_Dereference then + Obj := Original_Node (Prefix (Obj)); end if; end loop;