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: 1149115 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-507228-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="StO9o9+f"; 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 46BnTt2t5Bz9sNk for ; Mon, 19 Aug 2019 18:41:54 +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=WgoqlC/Vr5e0pwBDfQtvElo3n+LNaddfN7fpAKfiTdLhXsARvB 1k4rpg3f8fa8dAJ7i3P2KWkujd4IztwV8j/KhPvB6ALMW/hqNtwdkW2Zkxw6cgg5 ODDEaKPVwGVrKeaJsDJ08SP0biP30M7bkBZJjOuogE1NcqOgOgtNelXF4= 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=QZTgMEjokq3m8slIwqabhSLZ6sg=; b=StO9o9+f8rnunS4nUr7j LN4CJzxi+F9VDPadJ80DnhVquSTh+wk4R4SnxJxB7mxeD96UwQp2MBjXVWKLfCH1 SKxk98t9Dcg0N7U0972a6NcBHIDayyrKwSUHatfvvDAp8xc0JU5iig7O7rS0tGYA mmFPCGhhDspe3MWUNWbhgEs= Received: (qmail 117998 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 116530 invoked by uid 89); 19 Aug 2019 08:39:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=rewritten 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-0007xU-Ea 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]:35775) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzdBz-0007vk-8e 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 CC0E75605F; 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 Cke3bGTdsqQK; Mon, 19 Aug 2019 04:39:03 -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 BB62E56058; Mon, 19 Aug 2019 04:39:03 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id BA7206AB; 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: Eric Botcazou Subject: [Ada] Fix bogus compilation error with Elaborate_Body and -gnatN Message-ID: <20190819083903.GA33570@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 fixes a bogus compilation error when a unit with SPARK_Mode containing a pragma Elaborate_Body is with-ed by a generic unit containing an inlined subprogram, and front-end inlining is enabled. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-08-19 Eric Botcazou gcc/ada/ * sem_prag.adb (Is_Before_First_Decl): Deal with rewritten pragmas. gcc/testsuite/ * gnat.dg/elab8.adb, gnat.dg/elab8_gen.adb, gnat.dg/elab8_gen.ads, gnat.dg/elab8_pkg.adb, gnat.dg/elab8_pkg.ads: New testcase. --- gcc/ada/sem_prag.adb +++ gcc/ada/sem_prag.adb @@ -7146,10 +7146,11 @@ package body Sem_Prag is Item : Node_Id := First (Decls); begin - -- Only other pragmas can come before this pragma + -- Only other pragmas can come before this pragma, but they might + -- have been rewritten so check the original node. loop - if No (Item) or else Nkind (Item) /= N_Pragma then + if No (Item) or else Nkind (Original_Node (Item)) /= N_Pragma then return False; elsif Item = Pragma_Node then --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/elab8.adb @@ -0,0 +1,12 @@ +-- { dg-do compile } +-- { dg-options "-gnatN" } + +with Elab8_Gen; + +procedure Elab8 is + + package My_G is new Elab8_Gen (Integer); + +begin + My_G.Compare (0, 1); +end; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/elab8_gen.adb @@ -0,0 +1,12 @@ +with Elab8_Pkg; + +package body Elab8_Gen is + + procedure Compare (Arg1, Arg2 : T) is + begin + if Arg1 = Arg2 then + raise Program_Error; + end if; + end; + +end Elab8_Gen; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/elab8_gen.ads @@ -0,0 +1,8 @@ +generic + type T is private; +package Elab8_Gen is + + procedure Compare (Arg1, Arg2 : T); + pragma Inline (Compare); + +end Elab8_Gen; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/elab8_pkg.adb @@ -0,0 +1,5 @@ +package body Elab8_Pkg is + + procedure Dummy is null; + +end Elab8_Pkg; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/elab8_pkg.ads @@ -0,0 +1,5 @@ +package Elab8_Pkg with SPARK_Mode is + + pragma Elaborate_Body; + +end Elab8_Pkg;