From patchwork Tue Apr 25 10:47:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 754720 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 3wC0Kq6LWyz9s8G for ; Tue, 25 Apr 2017 20:47:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="ZB25PHXu"; 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=TrfWjnlpPie390iZACMyBrVPjk4UHWSpyyL0Pykiy7QpGJRhJh a5tTdSbe4xaRZOWgxhNOOdALwqrX9NlTkk/bbc/0NDXl50USQAi/uwxeEDpLiNA0 rnytOpHdbDsQp+wk5xqBZya5WN7zfRS/4rEyg0Fd8QjlMp4shGPoqLZ4w= 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=d+CPC48/jVO8ZoPpXWIGuSycx2w=; b=ZB25PHXuE7ydKQqkjGJA H0MIPEPRjsVtlp52rghNgh5LORTkD8onHt8+a1m2H752xGp9pujP6fBs9dTVfALr /1OEbbFdPe3Yfz1ackcPxcT8OnqnpX21spM6wYSy04uZmUjPej4k9rrV3F+aT2XL rVHGmQufEZNCXx3TrutPMxA= Received: (qmail 12511 invoked by alias); 25 Apr 2017 10:47:27 -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 12182 invoked by uid 89); 25 Apr 2017 10:47:24 -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=continuation 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 10:47:23 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 9077235CD; Tue, 25 Apr 2017 06:47:23 -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 9-qKSnYl0TcT; Tue, 25 Apr 2017 06:47:23 -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 8093233B0; Tue, 25 Apr 2017 06:47:23 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id 7F5253F0; Tue, 25 Apr 2017 06:47:23 -0400 (EDT) Date: Tue, 25 Apr 2017 06:47:23 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [Ada] Do not mention an error on continuation message of info message Message-ID: <20170425104723.GA53806@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Info messages are used in GNATprove to inform the user of subtleties in how source constructs are verified. They should not be mistaken for error messages in continuation messages. Now fixed. Tested on x86_64-pc-linux-gnu, committed on trunk 2017-04-25 Yannick Moy * errout.adb (Error_Msg): Adapt continuation message in instantiations and inlined bodies for info messages. Index: errout.adb =================================================================== --- errout.adb (revision 247177) +++ errout.adb (working copy) @@ -423,9 +423,14 @@ -- or - -- warning: in instantiation at + -- warning: in instantiation at ... -- warning: original warning message + -- or + + -- info: in instantiation at ... + -- info: original info message + -- All these messages are posted at the location of the top level -- instantiation. If there are nested instantiations, then the -- instantiation error message can be repeated, pointing to each @@ -440,9 +445,14 @@ -- or - -- warning: in inlined body at + -- warning: in inlined body at ... -- warning: original warning message + -- or + + -- info: in inlined body at ... + -- info: original info message + -- OK, here we have an instantiation error, and we need to generate the -- error on the instantiation, rather than on the template. @@ -494,8 +504,12 @@ -- Case of inlined body if Inlined_Body (X) then - if Is_Warning_Msg or Is_Style_Msg then + if Is_Info_Msg then Error_Msg_Internal + ("info: in inlined body #", + Actual_Error_Loc, Flag_Location, Msg_Cont_Status); + elsif Is_Warning_Msg or Is_Style_Msg then + Error_Msg_Internal (Warn_Insertion & "in inlined body #", Actual_Error_Loc, Flag_Location, Msg_Cont_Status); else @@ -507,8 +521,12 @@ -- Case of generic instantiation else - if Is_Warning_Msg or else Is_Style_Msg then + if Is_Info_Msg then Error_Msg_Internal + ("info: in instantiation #", + Actual_Error_Loc, Flag_Location, Msg_Cont_Status); + elsif Is_Warning_Msg or else Is_Style_Msg then + Error_Msg_Internal (Warn_Insertion & "in instantiation #", Actual_Error_Loc, Flag_Location, Msg_Cont_Status); else