From patchwork Wed Sep 6 10:09:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 810493 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-461579-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="Yz6bPhSu"; 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 3xnK8543tVz9s0Z for ; Wed, 6 Sep 2017 20:09:57 +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=p1uQHcqtafBz6vBfq0+v9bFcKRCHtkoUVF5uPNaYpmbvUtFIpN N7Keaq3Rz75C58PXaiJBSz+ZZv5R1O1nWVAM2ii8rGEbgMDKrHlnW3e6C+/E9cxz gTKQtbmS+KOUX0N9dYOUrZO2zvKKiCnz17bTLPid8KbGxyEibAIPNNzd4= 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=GZFm2/NXV3DDWN8M+HDe+7filWw=; b=Yz6bPhSuC2y8G+OuAy7K BWsgvdnzz8iddN3VMZcOJKjfKeYSDcIy9M2wa1aSc+FmKNqe7eIHogKBXCMv9/z2 GpTPHG/YWiRrS9t6QOfR+FSmAikI0Zx3PtM3aj9hJq6RXOv2RePa+lhf5XET3MdG LQvjst/fbsagnXnKSTNQdh8= Received: (qmail 62181 invoked by alias); 6 Sep 2017 10:09:39 -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 62136 invoked by uid 89); 6 Sep 2017 10:09:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, 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; Wed, 06 Sep 2017 10:09:37 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 0867456137; Wed, 6 Sep 2017 06:09: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 wMoFFyzFZkEs; Wed, 6 Sep 2017 06:09:35 -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 EC6F25606C; Wed, 6 Sep 2017 06:09:35 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id EB4B44FC; Wed, 6 Sep 2017 06:09:35 -0400 (EDT) Date: Wed, 6 Sep 2017 06:09:35 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] No_Return procedures in renaming declarations. Message-ID: <20170906100935.GA55016@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) This patch implements legality rule in 6.5.1 (7/2): if a renaming as body completes a nonreturning procedure declaration, the renamed procedure must be nonreturning as well. Previously GNAT only produced a warning in such cases. Tested in ACATS test B651002. Tested on x86_64-pc-linux-gnu, committed on trunk 2017-09-06 Ed Schonberg * sem_ch6.adb (Check_Returns): Clean up warnings coming from generated bodies for renamings that are completions, when renamed procedure is No_Return. * sem_ch8.adb (Analyze_Subprogram_Renaming): Implement legality rule in 6.5.1 (7/2): if a renaming is a completion of a subprogram with No_Return, the renamed entity must be No_Return as well. Index: sem_ch6.adb =================================================================== --- sem_ch6.adb (revision 251762) +++ sem_ch6.adb (working copy) @@ -6693,7 +6693,11 @@ Error_Msg_N ("implied return after this statement " & "would have raised Program_Error", Last_Stm); - else + + -- In normal compilation mode, do not warn on a generated + -- call (e.g. in the body of a renaming as completion). + + elsif Comes_From_Source (Last_Stm) then Error_Msg_N ("implied return after this statement " & "will raise Program_Error??", Last_Stm); Index: sem_ch8.adb =================================================================== --- sem_ch8.adb (revision 251762) +++ sem_ch8.adb (working copy) @@ -2946,6 +2946,14 @@ Check_Fully_Conformant (New_S, Rename_Spec); Set_Public_Status (New_S); + if No_Return (Rename_Spec) + and then not No_Return (Entity (Nam)) + then + Error_Msg_N ("renaming completes a No_Return procedure", N); + Error_Msg_N + ("\renamed procedure must be nonreturning (RM 6.5.1 (7/2))", N); + end if; + -- The specification does not introduce new formals, but only -- repeats the formals of the original subprogram declaration. -- For cross-reference purposes, and for refactoring tools, we