From patchwork Thu Apr 25 10:35:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 239480 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id C25462C00BC for ; Thu, 25 Apr 2013 20:36:04 +1000 (EST) 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=k1wsbXhUBCDeAXX0e5Ci4pb4oJaOXcSBW5dRWvRWVlKvPzCH/8 c0xhszUpeQlDuGe/9NBQFg7r521tdEmBGbldzWHUI1GROtdoati7KSvWVcuHqDaM JBJH9QSN241H1q20KaTI0DyqUq88HELBG/1wyQ39rNsSAbdBU+rnfKj6Y= 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=IsMOArurcGcdx9v5QFWz/Z6AtaM=; b=QlqBF+Wwp4+r9mcsBq45 /eqFNbreLFkszJG8NN47ixAbJFRNPNTxbWKGDJXdURhNhea20OkQs1OapCHeZGqn TpLYHS6jRJhW3Gk9uxHGBoHIa+oKNkZfX3xsSX7myxdfULNjYKbkWDlDefTHnQA9 n/gvNRu6hPlkEyvjzKsMROs= Received: (qmail 7045 invoked by alias); 25 Apr 2013 10:35:47 -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 7002 invoked by uid 89); 25 Apr 2013 10:35:47 -0000 X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_NO autolearn=ham version=3.3.1 Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 25 Apr 2013 10:35:46 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 432C22EA28; Thu, 25 Apr 2013 06:35:45 -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 dr57pd+vRQTk; Thu, 25 Apr 2013 06:35:45 -0400 (EDT) Received: from kwai.gnat.com (kwai.gnat.com [205.232.38.4]) by rock.gnat.com (Postfix) with ESMTP id 2B2972E7DC; Thu, 25 Apr 2013 06:35:45 -0400 (EDT) Received: by kwai.gnat.com (Postfix, from userid 4192) id 2A32B3FF09; Thu, 25 Apr 2013 06:35:45 -0400 (EDT) Date: Thu, 25 Apr 2013 06:35:45 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Hristian Kirtchev Subject: [Ada] Control over error message details for Contract_Cases Message-ID: <20130425103545.GA12697@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Found: No This patch conditions the error message generation part of the Contract_Cases mechanism to produce a short default message or a longer, more elaborate one when switch -gnateE is in effect. ------------ -- Source -- ------------ -- main.adb procedure Main is X : Integer; procedure Proc with Contract_Cases => (X <= 5 => X = 3, X >= 5 => X = 20); procedure Proc is begin X := X + 1; end Proc; begin X := 5; Proc; end Main; ---------------------------- -- Compilation and output -- ---------------------------- $ gnatmake -f -q -gnat12 -gnata -gnatd.V main.adb $ ./main $ gnatmake -f -q -gnat12 -gnataa-gnatd.V -gnateE main.adb $ ./main raised SYSTEM.ASSERTIONS.ASSERT_FAILURE : contract cases overlap for subprogram proc raised SYSTEM.ASSERTIONS.ASSERT_FAILURE : contract cases overlap for subprogram proc case guard at main.adb:6 evaluates to True case guard at main.adb:7 evaluates to True Tested on x86_64-pc-linux-gnu, committed on trunk 2013-04-25 Hristian Kirtchev * sem_ch6.adb (Expand_Contract_Cases): Generate detailed error messages only when switch -gnateE is in effect. Index: sem_ch6.adb =================================================================== --- sem_ch6.adb (revision 198286) +++ sem_ch6.adb (working copy) @@ -11655,7 +11655,7 @@ -- Check possible overlap between a case guard and "others" - if Multiple_PCs then + if Multiple_PCs and then Exception_Extra_Info then Case_Guard_Error (Decls => Error_Decls, Flag => Others_Flag, @@ -11695,7 +11695,7 @@ -- Check whether this case guard overlaps with another case -- guard. - if Multiple_PCs then + if Multiple_PCs and then Exception_Extra_Info then Case_Guard_Error (Decls => Error_Decls, Flag => Flag,