From patchwork Thu Sep 19 13:28:19 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: 1164621 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-509282-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="ZCNTnb3c"; 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 46YyRB3Mt9z9sNk for ; Thu, 19 Sep 2019 23:31:02 +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=uK7vYW4WNdnrftwCjOBJ9Tb2KjwJ+txLrVUdPSFSMXuXYGOevI LiL3XN9ytuhyvRBP1M9EZrG3vH7Xid09ndUwMmCvLLOo9EZ0SCyCvcDz7RSGn4sp 2U/gMznILDtZUHvjv9PLI3jl/aKs8g2+SjUZqSlba71nRpuFYaaK+edu8= 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=Xtgfk3nZ65D9Qf9yMkqxrTn+lgQ=; b=ZCNTnb3cEmsfchMg1QEH Gu4E3RT0qvyRgNy1UiYKvpqJtCqMO1SBuvB0nRYT8pnpOAQeR5Hhr+OLiMBznpjR Ildg2ItEQMkUciI9wVQ9MfRv1bhpP5sjYg8+0Rxfu4GSJEUyH9hL/Tnavbj1A2gZ zzcTz140DieMs3tR9P44dIY= Received: (qmail 2420 invoked by alias); 19 Sep 2019 13:28:32 -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 2103 invoked by uid 89); 19 Sep 2019 13:28:29 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=sem_ch3.adb, sem_ch3adb, UD:sem_ch3.adb 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; Thu, 19 Sep 2019 13:28:28 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwTx-0001OC-9q for gcc-patches@gcc.gnu.org; Thu, 19 Sep 2019 09:28:26 -0400 Received: from rock.gnat.com ([2620:20:4000:0:a9e:1ff:fe9b:1d1]:58709) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAwTv-0001LE-TR for gcc-patches@gcc.gnu.org; Thu, 19 Sep 2019 09:28:25 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id BACF456024; Thu, 19 Sep 2019 09:28:19 -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 1kYyOnjldsbn; Thu, 19 Sep 2019 09:28:19 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 9048256025; Thu, 19 Sep 2019 09:28:19 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 8F76D6B4; Thu, 19 Sep 2019 09:28:19 -0400 (EDT) Date: Thu, 19 Sep 2019 09:28:19 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [Ada] Fix run-time segfault with derived access-to-subprogram type Message-ID: <20190919132819.GA41804@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 X-Received-From: 2620:20:4000:0:a9e:1ff:fe9b:1d1 X-IsSubscribed: yes This fixes a segfault at run time for the call to a local subprogram through an access value if the type of this access value is derived from an initial access-to-subprogram type and the access value was originally obtained with the initial type. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-09-19 Eric Botcazou gcc/ada/ * sem_ch3.adb (Build_Derived_Access_Type): If this is an access- to-subprogram type, copy Can_Use_Internal_Rep from the parent. gcc/testsuite/ * gnat.dg/access9.adb: New testcase. --- gcc/ada/sem_ch3.adb +++ gcc/ada/sem_ch3.adb @@ -6723,6 +6723,11 @@ package body Sem_Ch3 is Has_Private_Component (Derived_Type)); Conditional_Delay (Derived_Type, Subt); + if Is_Access_Subprogram_Type (Derived_Type) then + Set_Can_Use_Internal_Rep + (Derived_Type, Can_Use_Internal_Rep (Parent_Type)); + end if; + -- Ada 2005 (AI-231): Set the null-exclusion attribute, and verify -- that it is not redundant. --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/access9.adb @@ -0,0 +1,20 @@ +-- { dg-do run } + +procedure Access9 is + + type A_Type is access procedure; + + type B_Type is new A_Type; + + procedure Invoke (B : B_Type) is + begin + B.all; + end; + + procedure Nested is begin null; end; + + A : A_Type := Nested'Access; + +begin + Invoke (B_Type (A)); +end; \ No newline at end of file