From patchwork Tue Apr 25 08:37:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 754641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wBxRR3zVjz9s82 for ; Tue, 25 Apr 2017 18:37:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="fvLB/aOj"; dkim-atps=neutral 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=MWMGtRqnnYJPwH2C82VgiX6M7we8sAMHQoMOAEvZ3gZHY4cMKu 56dPqE3U2p6uyQMT5Bolgth/lmeFCuPsNXa/ydhE48kWgz/6wFSEph6tIxgEduqC ZPZcYG83RBJ8vXpOW8ZuGTNZMm3ZaiAG5oWk7Uk7AetlGGnE/a13EWiRI= 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=U03RPr8Jop2HG4+uUyAcSwtNdJs=; b=fvLB/aOjd5K9o5Ukym6w cTgl3TdptGcgwv/5sqqNdtDBdds4Iyow+0hZ7Ht4Jz9o6+nHTLvvR6p0XifnxyXj dRHe1T3jIlg0tId2w3wVM7mXp6zbRHE3r7JH3fIg5QinMGtKWQFu1H7lKj0RpBS6 XHSDDEqq/Evwk1EfyEE1yB0= Received: (qmail 29241 invoked by alias); 25 Apr 2017 08:37:28 -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 29212 invoked by uid 89); 25 Apr 2017 08:37:25 -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=Convention, gt, GT 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; Tue, 25 Apr 2017 08:37:24 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 3F9FD3504; Tue, 25 Apr 2017 04:37:25 -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 NMwsMD5SjGVV; Tue, 25 Apr 2017 04:37:25 -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 3013A2970B; Tue, 25 Apr 2017 04:37:25 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id 2EB8D521; Tue, 25 Apr 2017 04:37:25 -0400 (EDT) Date: Tue, 25 Apr 2017 04:37:25 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Better error message for illegal use of 'Access in a call. Message-ID: <20170425083725.GA103530@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) This patch improves the error message in the case of an attribute reference that is an actual in a call to a subprogram inherited from a generic formal type with unknown discriminants, which makes the subprogram and its formal parameters intrinsic (see RM 6.3.1 (8) and (13)). Compiling l.adb must yield: l.adb:6:08: subprogram and its formal paramenters have convention Intrinsic l.adb:6:22: actual cannot be access attribute with G; generic type D (<>) is new G.T with private; package L is type DT is new D with null record; procedure Foo (A_T : DT; P : access procedure); end; --- package body L is procedure Foo (A_T : DT; P : access procedure) is procedure Q is begin null; end; begin D (A_T).Foo (Q'Access); end Foo; end; --- package G is type T is tagged null record; procedure Foo (A_T : T; P : access procedure); end; Tested on x86_64-pc-linux-gnu, committed on trunk 2017-04-25 Ed Schonberg * sem_attr.adb (Analyze_Attribute, case 'Access): Specialize the error message when the attribute reference is an actual in a call to a subprogram inherited from a generic formal type with unknown discriminants, which makes the subprogram and its formal parameters intrinsic (see RM 6.3.1 (8) and (13)). Index: sem_attr.adb =================================================================== --- sem_attr.adb (revision 247147) +++ sem_attr.adb (working copy) @@ -10532,11 +10532,34 @@ if Convention (Designated_Type (Btyp)) /= Convention (Entity (P)) then - Error_Msg_FE - ("subprogram & has wrong convention", P, Entity (P)); - Error_Msg_Sloc := Sloc (Btyp); - Error_Msg_FE ("\does not match & declared#", P, Btyp); + -- The rule in 6.3.1 (8) deserves a special error + -- message. + if Convention (Btyp) = Convention_Intrinsic + and then Nkind (Parent (N)) = N_Procedure_Call_Statement + and then Is_Entity_Name (Name (Parent (N))) + and then Inside_A_Generic + then + declare + Subp : constant Entity_Id := + Entity (Name (Parent (N))); + begin + if Convention (Subp) = Convention_Intrinsic then + Error_Msg_FE ("subprogram and its formal " + & "parameters have convention Intrinsic", + Parent (N), Subp); + Error_Msg_N + ("actual cannot be access attribute", N); + end if; + end; + + else + Error_Msg_FE + ("subprogram & has wrong convention", P, Entity (P)); + Error_Msg_Sloc := Sloc (Btyp); + Error_Msg_FE ("\does not match & declared#", P, Btyp); + end if; + if not Is_Itype (Btyp) and then not Has_Convention_Pragma (Btyp) then