From patchwork Mon Jun 11 09:23:36 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: 927567 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-479441-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="Esjo11o4"; 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 4146yz22Fqz9ryk for ; Mon, 11 Jun 2018 19:24:11 +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=wz7G5/U/4Me7TJm1x6IDQaowJmBwa14kCP+aZjSqUHgQkrnv/y QFwTpNGyI1HqukZ5uawEq0SCIo9mKkWLlZUTwfvccNM3S3W/25TyujEcDjL+DPw3 V4LwhaJhvzshTEq04i9aHQWP1AEzxDjAD8SoOXPzyCIYsrVStLuX8F/Bk= 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=qkwn/lG8qSmUdNBy6rQ0L4fadmM=; b=Esjo11o4Lw9jE23+7dCd r9QoGkwaSC7gf/y2I+do/W2Z9puXgyiASoneg0vEansNHMAXznY3/Uo8dqoK9IcZ 8z3jZ9HFbWhAlcNm1Zm4ue4I5KFGT//Hgq9WVkwBXKf1CAvQDcjhcAziVtdQ8k3P 154/n6nknQ8hHDOIdu0vBlw= Received: (qmail 32975 invoked by alias); 11 Jun 2018 09:23:40 -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 32849 invoked by uid 89); 11 Jun 2018 09:23:39 -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=UD:P, sf, Hx-languages-length:2557 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, 11 Jun 2018 09:23:37 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 26D79560ED; Mon, 11 Jun 2018 05:23:36 -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 N+0xUzTfHdJg; Mon, 11 Jun 2018 05:23:36 -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 160F3560EC; Mon, 11 Jun 2018 05:23:36 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 1502A54C; Mon, 11 Jun 2018 05:23:36 -0400 (EDT) Date: Mon, 11 Jun 2018 05:23:36 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Missing predicate function body for derived type in nested package Message-ID: <20180611092336.GA135053@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch fixes a bug in the construction of predicate functions. For a derived type, we must ensure that the parent type is already frozen so that its predicate function has been constructed already. This is necessary if the parent is declared in a nested package and its own freeze point has not been reached when the derived type is frozen by a local object declaration. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-06-11 Ed Schonberg gcc/ada/ * sem_ch13.adb (Build_Predicate_Functions): For a derived type, ensure that its parent is already frozen so that its predicate function, if any, has already been constructed. gcc/testsuite/ * gnat.dg/predicate1.adb: New testcase. --- gcc/ada/sem_ch13.adb +++ gcc/ada/sem_ch13.adb @@ -11114,13 +11114,27 @@ package body Sem_Ch13 is -- If we have a type with predicates, build predicate function. This is -- not needed in the generic case, nor within TSS subprograms and other - -- predefined primitives. + -- predefined primitives. For a derived type, ensure that the parent + -- type is already frozen so that its predicate function has been + -- constructed already. This is necessary if the parent is declared + -- in a nested package and its own freeze point has not been reached. if Is_Type (E) and then Nongeneric_Case and then not Within_Internal_Subprogram and then Has_Predicates (E) then + declare + Atyp : constant Entity_Id := Nearest_Ancestor (E); + begin + if Present (Atyp) + and then Has_Predicates (Atyp) + and then not Is_Frozen (Atyp) + then + Freeze_Before (N, Atyp); + end if; + end; + Build_Predicate_Functions (E, N); end if; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/predicate1.adb @@ -0,0 +1,40 @@ +-- { dg-do run } +-- { dg-options "-gnata" } + +procedure Predicate1 with SPARK_Mode is + type R is record + F : Integer; + end record; + + package Nested is + subtype S is R with Predicate => S.F = 42; + procedure P (X : in out S) is null; + + type T is private; + procedure P (X : in out T) is null; + private + type T is new S; + end Nested; + + X : Nested.T; + Y : Nested.S; + + X_Uninitialized : Boolean := False; + Y_Uninitialized : Boolean := False; +begin + begin + Nested.P (X); + exception + when others => X_Uninitialized := True; + end; + + begin + Nested.P (Y); + exception + when others => Y_Uninitialized := True; + end; + + if not X_Uninitialized or else not Y_Uninitialized then + raise Program_Error; + end if; +end Predicate1;