From patchwork Fri Sep 8 09:23:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 811414 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-461708-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="eBW09w73"; 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 3xpX1S68zYz9s82 for ; Fri, 8 Sep 2017 19:23:23 +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=l5VGCCTL9S+dUBc8VFmxjjWJhQiJ277B+SwJaBAWA6rM6twWTf KS51v6kh1FGNv3UNUgDGqbO0qTbk50MxQLYU9HqZz5dkwd0JyJPyqoVf9YfcGYEA PazeMitX69JcXBYGgh+WXuajDoeckIxQP6lfIqRTUx9m4xqfNTVyZ6Fxk= 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=Jr6T3lpLdwru5Yb1xvSR+PIFocQ=; b=eBW09w73mja+p9Nvqpgt sUVuE5ky2m5A3whF5RvWebB6mW/VBslaH8ArA8UCNWd1ymCySwz1zFzS0nL+9Kh3 dZz0VKq7rHjbNVN7WZhCHB1Ai9TYial3QaVZKZ6V1bPSxGzKvYw02K7F5GAUXcNZ dUmRvWAHylgqrXK0kdqUiDA= Received: (qmail 109547 invoked by alias); 8 Sep 2017 09:23:14 -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 109136 invoked by uid 89); 8 Sep 2017 09:23:13 -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= 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; Fri, 08 Sep 2017 09:23:09 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id B46585619D; Fri, 8 Sep 2017 05:23:07 -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 0jCPm4GgeC2l; Fri, 8 Sep 2017 05:23:07 -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 9E7ED56126; Fri, 8 Sep 2017 05:23:07 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id 9AC0A505; Fri, 8 Sep 2017 05:23:07 -0400 (EDT) Date: Fri, 8 Sep 2017 05:23:07 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Spurious error on actual array type in generic child instantiation. Message-ID: <20170908092307.GA4711@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) This patch suppresses the check for compatibility of the component types of the formal and the corresponding actual in the instantiation of a generic child unit, when the component type of the formal is itself a formal of an enclosing generic unit. This removes spurious conformance errors in complex sets of nested instantiations of generic hierarchies. No short example available. Tested on x86_64-pc-linux-gnu, committed on trunk 2017-09-08 Ed Schonberg * sem_ch12.adb (Validate_Array_Type_Instance): Suppress check for compatibility of component types of formal and actual in an instantiation of a child unit, when the component type of the formal is itself a formal of an enclosing generic. Index: sem_ch12.adb =================================================================== --- sem_ch12.adb (revision 251869) +++ sem_ch12.adb (working copy) @@ -12080,7 +12080,10 @@ -- for static matching has failed. The case where both the component -- type and the array type are separate formals, and the component -- type is a private view may also require special checking in - -- Subtypes_Match. + -- Subtypes_Match. Finally, we assume that a child instance where + -- the component type comes from a formal of a parent instance is + -- correct because the generic was correct. A more precise check + -- seems too complex to install??? if Subtypes_Match (Component_Type (A_Gen_T), Component_Type (Act_T)) @@ -12088,6 +12091,9 @@ Subtypes_Match (Find_Actual_Type (Component_Type (A_Gen_T), A_Gen_T), Component_Type (Act_T)) + or else + (not Inside_A_Generic + and then Is_Child_Unit (Scope (Component_Type (A_Gen_T)))) then null; else