From patchwork Fri Jul 10 09:44:20 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: 1326607 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 4B37Rb6gvBz9sDX for ; Fri, 10 Jul 2020 19:44:26 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3040A3842422; Fri, 10 Jul 2020 09:44:23 +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 76A49386F447 for ; Fri, 10 Jul 2020 09:44:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 76A49386F447 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 4D31956122; Fri, 10 Jul 2020 05:44:20 -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 7yPdnr4+z3Vj; Fri, 10 Jul 2020 05:44:20 -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 3CB5D56124; Fri, 10 Jul 2020 05:44:20 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 3BE3AA6; Fri, 10 Jul 2020 05:44:20 -0400 (EDT) Date: Fri, 10 Jul 2020 05:44:20 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix crash on quantified expression in expression function Message-ID: <20200710094420.GA35314@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-8.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: Eric Botcazou Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" The problem is that the compiler freezes the iterator type associated with a given type in the body of an expression function that contains a quantified expression for this type and happens to be the completion of a previous declaration. The reason is that Freeze_Expr_Types does not see that the iterator type is referenced by the expression. The patch also changes Write_Field24_Name to also display the field as the Related_Expression for an E_Loop_Parameter entity. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * einfo.adb (Write_Field24_Name): Handle E_Loop_Parameter. * freeze.adb (Freeze_Expr_Types): Freeze the iterator type used as Default_Iterator of the name of an N_Iterator_Specification node. diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb --- a/gcc/ada/einfo.adb +++ b/gcc/ada/einfo.adb @@ -10969,6 +10969,7 @@ package body Einfo is when Type_Kind | E_Constant + | E_Loop_Parameter | E_Variable => Write_Str ("Related_Expression"); diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -7990,6 +7990,22 @@ package body Freeze is and then Nkind (Parent (Node)) = N_Explicit_Dereference then Check_And_Freeze_Type (Designated_Type (Etype (Node))); + + -- An iterator specification freezes the iterator type, even though + -- that type is not attached to an entity in the construct. + + elsif Nkind (Node) in N_Has_Etype + and then Nkind (Parent (Node)) = N_Iterator_Specification + and then Node = Name (Parent (Node)) + then + declare + Iter : constant Node_Id := + Find_Aspect (Etype (Node), Aspect_Default_Iterator); + begin + if Present (Iter) then + Check_And_Freeze_Type (Etype (Expression (Iter))); + end if; + end; end if; -- No point in posting several errors on the same expression