From patchwork Mon Oct 9 20:47:48 2017 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: 823505 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-463823-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="OSWG20VI"; 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 3y9slK6NGqz9s7v for ; Tue, 10 Oct 2017 07:48:13 +1100 (AEDT) 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=MxuJiElzVpFD0e1tSdvUOvSMOUSflKsGWOcigfituxPZefJYOY MonVmS3LzW2T+ZYBLRynxkhaTUspsSdBXQdPBjixOPFgXIWp7tA+u1FRxP5p6ce9 kvOopo6OszAC7bXVmj1Et8U4qKynh1wWHtNXMQpCqzeWD09+IM9P204fs= 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=SAhSMRmFEHAFou9J3W9iX3a1R0Q=; b=OSWG20VISDDNWlbIOXdi OgujR2w0Uy4huUGdijZq15qZIkmbNZoF1dTjdTkJoDMq3LTnI6mdvHyqH6/U1Mfp UfZVUiko+kP5IlTJC3f8y8xhG6qAGyBRhGB5d+6JFYklsjlyMffFyIjCd8VG+GHc oDkPOiQ7q4FGA+q5d8THKak= Received: (qmail 10275 invoked by alias); 9 Oct 2017 20:47:51 -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 10213 invoked by uid 89); 9 Oct 2017 20:47:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=rts X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 09 Oct 2017 20:47:49 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 40820562C9; Mon, 9 Oct 2017 16:47:48 -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 iVfGNVwgC16u; Mon, 9 Oct 2017 16:47:48 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 2FFAB562A6; Mon, 9 Oct 2017 16:47:48 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 2C32F43A; Mon, 9 Oct 2017 16:47:48 -0400 (EDT) Date: Mon, 9 Oct 2017 16:47:48 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Hristian Kirtchev Subject: [Ada] Crash on potential access-before-elaboration in ZFP Message-ID: <20171009204748.GA22063@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch update the mechanism which retrieves the enclosing scope of a node to account for blocks produces by exception handler expansion. These blocks are not scoping constructs and should not be considered. As a result, an access- before-elaboration check will no longer cause a crash on ZFP. ------------ -- Source -- ------------ -- pack.ads package Pack is procedure Force_Body; end Pack; -- pack.adb with Ada.Text_IO; use Ada.Text_IO; package body Pack is procedure Force_Body is begin null; end Force_Body; package Nested is function Func (Val : Integer) return Integer; end Nested; package body Nested is procedure Proc is Val : Integer; begin Val := Func (1); Put_Line ("ERROR: Program_Error not raised"); exception when Program_Error => Put_Line ("OK"); when others => Put_Line ("ERROR: unexpected exception"); end Proc; package Elaborator is end Elaborator; package body Elaborator is begin Proc; end Elaborator; function Func (Val : Integer) return Integer is begin return Val + 1; end Func; end Nested; end Pack; ----------------- -- Compilation -- ----------------- $ gcc -c -gnatws --RTS=zfp pack.adb Tested on x86_64-pc-linux-gnu, committed on trunk 2017-10-09 Hristian Kirtchev * sem_unit.adb (Find_Enclosing_Scope): Do not treat a block statement as a scoping construct when it is byproduct of exception handling. Index: sem_util.adb =================================================================== --- sem_util.adb (revision 253567) +++ sem_util.adb (working copy) @@ -7929,13 +7929,21 @@ -- Special cases - -- Blocks, loops, and return statements have artificial scopes + -- Blocks carry either a source or an internally-generated scope, + -- unless the block is a byproduct of exception handling. - when N_Block_Statement - | N_Loop_Statement - => + when N_Block_Statement => + if not Exception_Junk (Par) then + return Entity (Identifier (Par)); + end if; + + -- Loops carry an internally-generated scope + + when N_Loop_Statement => return Entity (Identifier (Par)); + -- Extended return statements carry an internally-generated scope + when N_Extended_Return_Statement => return Return_Statement_Entity (Par); @@ -19511,13 +19519,13 @@ N := Next (Actual_Id); if Nkind (N) = N_Parameter_Association then + -- In case of a build-in-place call, the call will no longer be a -- call; it will have been rewritten. - if Nkind_In (Parent (Actual_Id), - N_Entry_Call_Statement, - N_Function_Call, - N_Procedure_Call_Statement) + if Nkind_In (Parent (Actual_Id), N_Entry_Call_Statement, + N_Function_Call, + N_Procedure_Call_Statement) then return First_Named_Actual (Parent (Actual_Id)); else @@ -23257,16 +23265,15 @@ return "unknown subprogram"; end if; + -- If the subprogram is a child unit, use its simple name to start the + -- construction of the fully qualified name. + if Nkind (Ent) = N_Defining_Program_Unit_Name then - - -- If the subprogram is a child unit, use its simple name to - -- start the construction of the fully qualified name. - Append_Entity_Name (Buf, Defining_Identifier (Ent)); - else Append_Entity_Name (Buf, Ent); end if; + return +Buf; end Subprogram_Name;