From patchwork Thu Sep 7 09:58:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 810948 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-461674-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="s0MZkY1c"; 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 3xnwrq3pZ7z9t2R for ; Thu, 7 Sep 2017 19:58:49 +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=tDerqoUhwU3XBtiNLIIkGciOOJB78+Ehqw7dDhfl4OYM6P8v1G cviTfgOl/5xK6YXos4E0RxX7twkJ+VFwI/JWL7YiiSL0JXCrrY6+27BICo13LHEq J+/imksNT/00IwsNX2grN/nR1bjvM3OdD5DSU0o/xfN6Mf7SEilGyP/CE= 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=KG5N/FfML6rOTt6vYqE+HAHKvlY=; b=s0MZkY1cyURGjHarZoYa HSPBQinJRys8mp0yiPxnW3T4FYG9VJopTO6E9w/uxdPFp0n09nRb8J+9haTEXiz/ nG7Rs6/ymkrBRgb637QouqnE9vQhQQ4WxlqZaSlaTnnrudwcSrhzX7xeBEgfWLbV xwCX4KYPSvcqEDqsmsuKHwE= Received: (qmail 72320 invoked by alias); 7 Sep 2017 09:58:42 -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 71806 invoked by uid 89); 7 Sep 2017 09:58:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.2 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= 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; Thu, 07 Sep 2017 09:58:36 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 94A78561A2; Thu, 7 Sep 2017 05:58:34 -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 50XLZyPcRRhl; Thu, 7 Sep 2017 05:58:34 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 8151856179; Thu, 7 Sep 2017 05:58:34 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id 7DE714FC; Thu, 7 Sep 2017 05:58:34 -0400 (EDT) Date: Thu, 7 Sep 2017 05:58:34 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Spurious error in precondition and classwide parameter Message-ID: <20170907095834.GA15662@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) This patch fixes a spurious error on a classwide precondition for a subprogram S that is a primitive of some type T, when the precondition includes a dispatching call on a classwide formal of S whose type is urelated to T. The following must compile quietly: gnatmake -q main --- with Derived_Objects; with Using_Interfaces; with Using_Objects; procedure Main is D : aliased Derived_Objects.Derived_Object; U : aliased Using_Objects.Using_Object; UI : not null access Using_Interfaces.Using_Interface'Class := U'Access; begin U.Use_An_Object (D); UI.Use_An_Object (D); U.Use_A_Valid_Object (D); UI.Use_A_Valid_Object (D); end Main; --- package Base_Objects is type Base_Object is tagged null record; function Is_Valid (This : in Base_Object) return Boolean is (True); end Base_Objects; --- with Base_Objects; package Derived_Objects is type Derived_Object is new Base_Objects.Base_Object with null record; end Derived_Objects; --- with Base_Objects; package Using_Interfaces is type Using_Interface is limited interface; procedure Use_An_Object (This : aliased in out Using_Interface; Obj : in Base_Objects.Base_Object'Class) is abstract; procedure Use_A_Valid_Object (This : aliased in out Using_Interface; Obj : in Base_Objects.Base_Object'Class) is abstract with Pre'Class => Obj.Is_Valid; end Using_Interfaces; --- with Base_Objects; with Using_Interfaces; package Using_Objects is type Using_Object is limited new Using_Interfaces.Using_Interface with null record; procedure Use_An_Object (This : aliased in out Using_Object; Base : in Base_Objects.Base_Object'Class) is null; procedure Use_A_Valid_Object (This : aliased in out Using_Object; Base : in Base_Objects.Base_Object'Class) is null; end Using_Objects; Tested on x86_64-pc-linux-gnu, committed on trunk 2017-09-07 Ed Schonberg * exp_disp.adb (Replace_Formals): If thr formal is classwide, and thus not a controlling argument, preserve its type after rewriting because it may appear in an nested call with a classwide parameter. Index: exp_disp.adb =================================================================== --- exp_disp.adb (revision 251838) +++ exp_disp.adb (working copy) @@ -701,6 +701,16 @@ while Present (F) loop if F = Entity (N) then Rewrite (N, New_Copy_Tree (A)); + + -- If the formal is class-wide, and thus not a + -- controlling argument, preserve its type because + -- it may appear in a nested call with a class-wide + -- parameter. + + if Is_Class_Wide_Type (Etype (F)) then + Set_Etype (N, Etype (F)); + end if; + exit; end if;