From patchwork Mon Aug 19 08:39:03 2019 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: 1149117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-507229-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Qxnd1oBv"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46BnV65j5Bz9s3Z for ; Mon, 19 Aug 2019 18:42:06 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=J2Dhdr2Pe3SvvUmKYSAxug5tzK1VvZ8KeFxAPxlyFYedxMR4Ul DTUl+SQmPujWDBCTbnD3yhUvcmri5DvzeZhhDYmuNXvpsGL/KcCBRPpi4wtixGio UGBP5znPR5bC+pMLWdtakXBp8YvKq8sAG3WA97nCvLbJNjYS+EIP2LrFA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=HPIhpAmntVEp8UCTea77ti4ls0E=; b=Qxnd1oBvNSx2uObXx9bF RjAWUiqlm4+D2tpQyXgC9OlPkHOaDyokAHwxGPME+eWnz29BSznU6oszTSqrsPLb 8uz1H8gA0Og/DtByvyxgEfAHkemvs8LCIhMfYpNRhAfnG+Cgh1euF4CHOO9j+lgr 6mKnElVNR9530pLbn0/+bmY= Received: (qmail 118089 invoked by alias); 19 Aug 2019 08:39:25 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 116495 invoked by uid 89); 19 Aug 2019 08:39:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy= X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (209.51.188.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 19 Aug 2019 08:39:11 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzdBz-0007xd-HM for gcc-patches@gcc.gnu.org; Mon, 19 Aug 2019 04:39:09 -0400 Received: from rock.gnat.com ([2620:20:4000:0:a9e:1ff:fe9b:1d1]:35773) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzdBz-0007vb-Ad for gcc-patches@gcc.gnu.org; Mon, 19 Aug 2019 04:39:07 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 4A0EF1161CE; Mon, 19 Aug 2019 04:39:03 -0400 (EDT) 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 k-gaoeVSmxvK; Mon, 19 Aug 2019 04:39:03 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 38BDE11619A; Mon, 19 Aug 2019 04:39:03 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 37D8D6AB; Mon, 19 Aug 2019 04:39:03 -0400 (EDT) Date: Mon, 19 Aug 2019 04:39:03 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Crash on object initialization that is call to expression function Message-ID: <20190819083902.GA33546@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 2620:20:4000:0:a9e:1ff:fe9b:1d1 X-IsSubscribed: yes This patch fixes a compiler abort on an object declaration for a class-wide type whose expression is a call to an expression function that returns type extension. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-08-19 Ed Schonberg gcc/ada/ * sem_res.adb (Resolve_Call): A call to an expression function freezes when expander is active, unless the call appears within the body of another expression function, gcc/testsuite/ * gnat.dg/expr_func9.adb: New testcase. --- gcc/ada/sem_res.adb +++ gcc/ada/sem_res.adb @@ -6314,13 +6314,15 @@ package body Sem_Res is -- an expression function may appear when it is part of a default -- expression in a call to an initialization procedure, and must be -- frozen now, even if the body is inserted at a later point. + -- Otherwise, the call freezes the expression if expander is active, + -- for example as part of an object declaration. if Is_Entity_Name (Subp) and then not In_Spec_Expression and then not Is_Expression_Function_Or_Completion (Current_Scope) and then (not Is_Expression_Function_Or_Completion (Entity (Subp)) - or else Scope (Entity (Subp)) = Current_Scope) + or else Expander_Active) then if Is_Expression_Function (Entity (Subp)) then --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/expr_func9.adb @@ -0,0 +1,24 @@ +-- { dg-do compile } +-- { dg-options "-gnatws" } + +procedure Expr_Func9 is + + type Root is interface; + + type Child1 is new Root with null record; + + type Child2 is new Root with record + I2 : Integer; + end record; + + function Create (I : Integer) return Child2 is (I2 => I); + + I : Root'Class := + (if False + then Child1'(null record) + else + Create (1)); + +begin + null; +end Expr_Func9;