From patchwork Thu Oct 14 04:46:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 46194 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E60B13858D3C for ; Thu, 14 Oct 2021 04:47:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E60B13858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634186847; bh=OyerWj5JXIXul0HoFkRCQLRzrdZoPSComXzJ5zMG5oc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=kLhCEe31Om22JRIUTq8PBiDF4XR0zxXYcZLIJqLdtKZOKgb+LrgTKFsRPSBS8v0Dr NT5tc6uxhrsHXFJoSA28GP0xiOLXgP+X3UoAPKx9J6yJSbYp9zSiKeDbz+M5N+BbZ+ 4doyuiUU5lfXCsSFxQpoAj5K6I8WpoX0jgsHD3u4= 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 ESMTPS id EE7C03858414 for ; Thu, 14 Oct 2021 04:46:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE7C03858414 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 918F31163FF; Thu, 14 Oct 2021 00:46:57 -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 FRn9znNOX1sO; Thu, 14 Oct 2021 00:46:57 -0400 (EDT) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 5C6511163AC; Thu, 14 Oct 2021 00:46:57 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 19E4khbP555000 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Oct 2021 01:46:46 -0300 To: gcc-patches@gcc.gnu.org Subject: [FYI] [Ada] reenable ada83 library unit renaming error Organization: Free thinker, does not speak for AdaCore Date: Thu, 14 Oct 2021 01:46:43 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.2 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The condition of the 'if' encompassed that of the 'elsif', so the error message wouldn't get a chance to be printed. Regstrapped on x86_64-linux-gnu. I'm checking this in. for gcc/ada/ChangeLog * par-ch10.adb (P_Compilation_Unit): Reenable ada83 library unit renaming test and error. --- gcc/ada/par-ch10.adb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb index f02934afc7e44..76f0edddc94c6 100644 --- a/gcc/ada/par-ch10.adb +++ b/gcc/ada/par-ch10.adb @@ -532,13 +532,14 @@ package body Ch10 is | N_Subprogram_Body | N_Subprogram_Renaming_Declaration then - Unit_Node := Specification (Unit_Node); - - elsif Nkind (Unit_Node) = N_Subprogram_Renaming_Declaration then - if Ada_Version = Ada_83 then + if Nkind (Unit_Node) = N_Subprogram_Renaming_Declaration + and then Ada_Version = Ada_83 + then Error_Msg_N ("(Ada 83) library unit renaming not allowed", Unit_Node); end if; + + Unit_Node := Specification (Unit_Node); end if; if Nkind (Unit_Node) in N_Task_Body