From patchwork Wed Nov 8 17:32:39 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: 835930 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-466291-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="CIsr+sTm"; 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 3yXD0C5rwsz9s0Z for ; Thu, 9 Nov 2017 04:32:59 +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=FjJB87deQKYjRE0JLh9c0cgSHxA6fn/OYAkbHwLn3c9IaQ8AST XxmVwaIGEC9kqqNhZF60C5xfsYyeN9RX1BoPRb6ciQvaztVgxbrLDOn839YCJ9oc kpEp5Z/vsrSu9Jjyt1iQDsMgS5hcYYP9U02nwjZyNh5ybT+nwqlq8r6pQ= 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=hWVZzLp/0FaZ0724Ra02cxDUIQE=; b=CIsr+sTmh/M7bds3lI1j uXFwJiyaroti5rhIoajHk9wqwpPTxN/tXRoGz7YfIuC82UrX+RBqIsM3gVYWG5o6 Cx2GdGIsGe//VuiXRAZ0CLkdKWG6iCvqTCq0XfGWHo/mRtfvKa1Po0KcufMKRsQ3 v8Nv/fpBOiRVc1WzXynVMbw= Received: (qmail 46260 invoked by alias); 8 Nov 2017 17:32:47 -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 45825 invoked by uid 89); 8 Nov 2017 17:32:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=renaming, Nam 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; Wed, 08 Nov 2017 17:32:41 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id E365056B9C; Wed, 8 Nov 2017 12:32:39 -0500 (EST) 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 hnnthGBQsY0n; Wed, 8 Nov 2017 12:32:39 -0500 (EST) 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 D308256B9B; Wed, 8 Nov 2017 12:32:39 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id CF8C02FD; Wed, 8 Nov 2017 12:32:39 -0500 (EST) Date: Wed, 8 Nov 2017 12:32:39 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Hristian Kirtchev Subject: [Ada] Crash on access-to-object in SPARK Message-ID: <20171108173239.GA27934@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch corrects the light expansion of object renamings for SPARK to prevent a crash by querying the subtype mark when the renaming carries an access definition. ------------- -- Sources -- ------------- -- p.ads package P with SPARK_Mode is type T is record Ptr : access constant Integer; end record; function Get (X : T) return Integer; end P; -- p.adb package body P with SPARK_Mode is function Get (X : T) return Integer is Proxy : access constant Integer renames X.Ptr; begin return Proxy.all; end; end P; ----------------- -- Compilation -- ----------------- $ gcc -c p.adb $ gcc -c p.adb -gnatd.F Tested on x86_64-pc-linux-gnu, committed on trunk 2017-11-08 Hristian Kirtchev * exp_spark.adb (Expand_SPARK_N_Object_Renaming_Declaration): Obtain the type of the renaming from its defining entity, rather then the subtype mark as there may not be a subtype mark. Index: exp_spark.adb =================================================================== --- exp_spark.adb (revision 254542) +++ exp_spark.adb (working copy) @@ -349,7 +349,7 @@ Loc : constant Source_Ptr := Sloc (N); Obj_Id : constant Entity_Id := Defining_Entity (N); Nam : constant Node_Id := Name (N); - Typ : constant Entity_Id := Etype (Subtype_Mark (N)); + Typ : constant Entity_Id := Etype (Obj_Id); begin -- Transform a renaming of the form