From patchwork Mon May 21 15:00:05 2018 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: 917675 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-478065-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="sq5j3pTl"; 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 40qMSH1dNhz9s1w for ; Tue, 22 May 2018 01:01:50 +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=YztXfDYzpXQRjMNZogI+39a/4L5Iv1WzRR2ioYdcYRhQMJyECh qj2rlVtnyGIKsGpSbKMmGQadKIP7uN0PcfAWXoav6csOohAp+f3XcpZPADKblIOw SjOXFRMnf98P/H8lbNhQ5dR7wKUBEDD3yiYJItFpJlD71pvfpSCzGH/rY= 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=RAwgih73FlX5irff4YJPT7PE4cU=; b=sq5j3pTl5mIoJ+eWSW/N YvDEgU7F31IIq59xgYDP7Sc6VzuEHohGvebZ0GdoORBxOxIMgKEaDnPVBpiRrtKJ RApH300LrSYUiSUnWMufBNAMt4iYSJxJYkJKHP//lavn3Qw2D2efxdtSVUbAK3NS wY4hSs5xRkOKC3Zbk7XTlVE= Received: (qmail 5265 invoked by alias); 21 May 2018 15:01:16 -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 129430 invoked by uid 89); 21 May 2018 15:00:30 -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, TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.3.2 spammy=allowing, advised 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, 21 May 2018 15:00:07 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C9EB4117430; Mon, 21 May 2018 11:00:05 -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 9FNUhXiGntZN; Mon, 21 May 2018 11:00:05 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 86851116C34; Mon, 21 May 2018 11:00:05 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 859F04B2; Mon, 21 May 2018 11:00:05 -0400 (EDT) Date: Mon, 21 May 2018 11:00:05 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Extend legality of Scalar_Storage_Order to formal types Message-ID: <20180521150005.GA76977@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch extends the legality of the GNAT attribute Scalar_Storage_Order, to apply to formal private types. Previously this extension applied only in GNAT_Mode, to support instantiations of Ada.Sequential_IO, but it is more generally useful. The following must compile quietly: ---- with Memory_View_Generic; procedure Main is type T is array (1..10) of integer; package OK is new Memory_View_Generic (T); type T2 is new Long_Float; package Wrong is new Memory_View_Generic (T2); begin null; end; ---- with System; generic type Source_Type is private; package Memory_View_Generic is -- various declarations ... SSO : System.Bit_Order := Source_Type'Scalar_Storage_Order; end Memory_View_Generic; Tested on x86_64-pc-linux-gnu, committed on trunk 2018-05-21 Ed Schonberg gcc/ada/ * sem_attr.adb (Analyze_Attribute, case Scalar_Storage_Order): The attribute reference is legal within a generic unit when the prefix is a formal private type. --- gcc/ada/sem_attr.adb +++ gcc/ada/sem_attr.adb @@ -5709,11 +5709,15 @@ package body Sem_Attr is if not (Is_Record_Type (P_Type) or else Is_Array_Type (P_Type)) then - -- In GNAT mode, the attribute applies to generic types as well - -- as composite types, and for non-composite types always returns - -- the default bit order for the target. - - if not (GNAT_Mode and then Is_Generic_Type (P_Type)) + -- The attribute applies to generic private types (in which case + -- the legality rule is applied in the instance) as well as to + -- composite types. For noncomposite types it always returns the + -- default bit order for the target. + -- Allowing formal private types was originally introduced in + -- GNAT_Mode only, to compile instances of Sequential_IO, but + -- users find it more generally useful in generic units. + + if not (Is_Generic_Type (P_Type) and then Is_Private_Type (P_Type)) and then not In_Instance then Error_Attr_P @@ -11074,7 +11078,7 @@ package body Sem_Attr is -- The context may be a constrained access type (however ill- -- advised such subtypes might be) so in order to generate a - -- constraint check when needed set the type of the attribute + -- constraint check we need to set the type of the attribute -- reference to the base type of the context. Set_Etype (N, Btyp); @@ -11837,6 +11841,8 @@ package body Sem_Attr is if Attr_Id = Attribute_Elaborated then null; + -- Should this be restricted to Expander_Active??? + else Freeze_Expression (P); end if;