From patchwork Fri Jun 12 08:35:46 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: 1308065 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=8.43.85.97; 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 [8.43.85.97]) (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 49jvGv0KHkz9sSy for ; Fri, 12 Jun 2020 18:37:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B3DAB395A018; Fri, 12 Jun 2020 08:35:58 +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 202E23957015 for ; Fri, 12 Jun 2020 08:35:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 202E23957015 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 D89D15601A; Fri, 12 Jun 2020 04:35:46 -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 osym5pHjIPPA; Fri, 12 Jun 2020 04:35:46 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id A2D1E56009; Fri, 12 Jun 2020 04:35:46 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id A1E66141; Fri, 12 Jun 2020 04:35:46 -0400 (EDT) Date: Fri, 12 Jun 2020 04:35:46 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix handling of Ada 83 OUT parameter rule Message-ID: <20200612083546.GA73993@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, KAM_ASCII_DIVIDERS, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no 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: Arnaud Charlet Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" The current code was climbing the tree manually assuming that an array attribute (e.g. 'First) would appear immediately, which isn't the case for e.g. a selected component expression. Tested on x86_64-pc-linux-gnu, committed on trunk 2020-06-12 Arnaud Charlet gcc/ada/ * sem_res.adb (Resolve_Entity_Name): Fix handling of expressions containing array attributes wrt Ada 83 detection. --- gcc/ada/sem_res.adb +++ gcc/ada/sem_res.adb @@ -7370,6 +7370,10 @@ package body Sem_Res is -- Determine whether node Context denotes an assignment statement or an -- object declaration whose expression is node Expr. + function Is_Attribute_Expression (Expr : Node_Id) return Boolean; + -- Determine whether Expr is part of an N_Attribute_Reference + -- expression. + ---------------------------------------- -- Is_Assignment_Or_Object_Expression -- ---------------------------------------- @@ -7412,6 +7416,24 @@ package body Sem_Res is end if; end Is_Assignment_Or_Object_Expression; + ----------------------------- + -- Is_Attribute_Expression -- + ----------------------------- + + function Is_Attribute_Expression (Expr : Node_Id) return Boolean is + N : Node_Id := Expr; + begin + while Present (N) loop + if Nkind (N) = N_Attribute_Reference then + return True; + end if; + + N := Parent (N); + end loop; + + return False; + end Is_Attribute_Expression; + -- Local variables E : constant Entity_Id := Entity (N); @@ -7482,8 +7504,8 @@ package body Sem_Res is -- array types (i.e. bounds and length) are legal. elsif Ekind (E) = E_Out_Parameter - and then (Nkind (Parent (N)) /= N_Attribute_Reference - or else Is_Scalar_Type (Etype (E))) + and then (Is_Scalar_Type (Etype (E)) + or else not Is_Attribute_Expression (Parent (N))) and then (Nkind (Parent (N)) in N_Op or else Nkind (Parent (N)) = N_Explicit_Dereference