From patchwork Mon Jul 27 08:05:52 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: 1336724 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 4BFXT52vVZz9sR4 for ; Mon, 27 Jul 2020 18:06:49 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A82903865460; Mon, 27 Jul 2020 08:06:00 +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 [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 9ED633861862 for ; Mon, 27 Jul 2020 08:05:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9ED633861862 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 AC16611682D; Mon, 27 Jul 2020 04:05:52 -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 aspBXlwvCLyD; Mon, 27 Jul 2020 04:05:52 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 64E1C11684B; Mon, 27 Jul 2020 04:05:52 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 63FCB13D; Mon, 27 Jul 2020 04:05:52 -0400 (EDT) Date: Mon, 27 Jul 2020 04:05:52 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] AI12-0383 Renaming values Message-ID: <20200727080552.GA36411@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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: Arnaud Charlet Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This AI allows names that denote values rather than objects to nevertheless be renamed using an object renaming. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_ch8.adb (Analyze_Object_Renaming): Allow values in Ada 2020 mode. diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -918,7 +918,8 @@ package body Sem_Ch8 is if No (Etype (Nam)) or else Etype (Nam) = Standard_Void_Type then - Error_Msg_N ("object name expected in renaming", Nam); + Error_Msg_N + ("object name or value expected in renaming", Nam); Set_Ekind (Id, E_Variable); Set_Etype (Id, Any_Type); @@ -965,7 +966,8 @@ package body Sem_Ch8 is -- as overloaded procedures named in the object renaming). if No (It.Typ) then - Error_Msg_N ("object name expected in renaming", Nam); + Error_Msg_N + ("object name or value expected in renaming", Nam); Set_Ekind (Id, E_Variable); Set_Etype (Id, Any_Type); @@ -996,6 +998,12 @@ package body Sem_Ch8 is T := It1.Typ; end; end if; + + if Etype (Nam) = Standard_Exception_Type then + Error_Msg_N + ("exception requires a subtype mark in renaming", Nam); + return; + end if; end if; -- The object renaming declaration may become Ghost if it renames a @@ -1396,8 +1404,19 @@ package body Sem_Ch8 is and then Nkind (Original_Node (Nam)) /= N_Attribute_Reference then null; - else - Error_Msg_N ("expect object name in renaming", Nam); + + -- A named number can only be renamed without a subtype mark + + elsif Nkind (Nam) in N_Real_Literal | N_Integer_Literal + and then Present (Subtype_Mark (N)) + and then Present (Original_Entity (Nam)) + then + Error_Msg_N ("incompatible types in renaming", Nam); + + -- AI12-0383: Names that denote values can be renamed + + elsif Ada_Version < Ada_2020 then + Error_Msg_N ("value in renaming requires -gnat2020", Nam); end if; Set_Etype (Id, T2);