From patchwork Wed Jun 16 08:43:55 2021 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: 1492800 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.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 4G4f0B60L5z9sSn for ; Wed, 16 Jun 2021 18:45:30 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C2EF3989828 for ; Wed, 16 Jun 2021 08:45:28 +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 ESMTPS id BF2093989009 for ; Wed, 16 Jun 2021 08:43:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BF2093989009 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 7C3DB117D49; Wed, 16 Jun 2021 04:43:55 -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 JgB4RO1cGDbI; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 64F00117869; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 63FB5180; Wed, 16 Jun 2021 04:43:55 -0400 (EDT) Date: Wed, 16 Jun 2021 04:43:55 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Raise expressions and unconstrained components Message-ID: <20210616084355.GA94562@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-12.6 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" During the implementation of AI12-0172, we incorrectly allowed illegal cases of unconstrained components. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_ch3.adb (Analyze_Component_Declaration): Do not special case raise expressions. gcc/testsuite/ * gnat.dg/limited4.adb: Disable illegal code. diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -2083,21 +2083,10 @@ package body Sem_Ch3 is end if; end if; - -- Avoid reporting spurious errors if the component is initialized with - -- a raise expression (which is legal in any expression context) - - if Present (E) - and then - (Nkind (E) = N_Raise_Expression - or else (Nkind (E) = N_Qualified_Expression - and then Nkind (Expression (E)) = N_Raise_Expression)) - then - null; - -- The parent type may be a private view with unknown discriminants, -- and thus unconstrained. Regular components must be constrained. - elsif not Is_Definite_Subtype (T) + if not Is_Definite_Subtype (T) and then Chars (Id) /= Name_uParent then if Is_Class_Wide_Type (T) then diff --git a/gcc/testsuite/gnat.dg/limited4.adb b/gcc/testsuite/gnat.dg/limited4.adb --- a/gcc/testsuite/gnat.dg/limited4.adb +++ b/gcc/testsuite/gnat.dg/limited4.adb @@ -22,11 +22,12 @@ procedure Limited4 is Obj2 : Lim_Tagged'Class := Lim_Tagged'Class'(raise TBD_Error); -- b) initialization expression of a CW component_declaration - - type Rec is record - Comp01 : Lim_Tagged'Class := (raise TBD_Error); - Comp02 : Lim_Tagged'Class := Lim_Tagged'Class'((raise TBD_Error)); - end record; + -- ... is illegal: cannot have unconstrained components. + -- + -- type Rec is record + -- Comp01 : Lim_Tagged'Class := (raise TBD_Error); + -- Comp02 : Lim_Tagged'Class := Lim_Tagged'Class'((raise TBD_Error)); + -- end record; -- c) the expression of a record_component_association @@ -55,4 +56,4 @@ procedure Limited4 is begin Check := Do_Test1 (raise TBD_Error); Check := Do_Test2; -end; \ No newline at end of file +end;