From patchwork Mon Jun 11 09:22:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 927538 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-479434-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="TzMjzMns"; 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 4146xD3090z9ryk for ; Mon, 11 Jun 2018 19:22:40 +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=heLSHjbZ+j42Ked0rzm8VrYBsgXsy1avwG18OmvoHqOErXK5b4 RGtMdbfoTIgLdWDq34fYVdFZA/Ph4U9Mim5zV7IzDf03YLOUaVDyGfatL8m52Q+t IIKgEa178Kh16H0VDyjmeHHe3+LMGZE8aubPq44diSHA5hcif5kw3G6tQ= 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=7ZqStAi7wPU7ucuvwwOofhSfSWQ=; b=TzMjzMnsj4iXAxUN6vU4 +79fPz9aM6aSoqoZgY/toG7vOd/rf4zOcRgsUe8+WIKJxEbO092irBgc9zbwmDsx PpibLaAiUt3/IBHJZKLli9dfMCh2ynLByeLBlj0TXIYdceo3eJZQsAAiAGVUZk74 V/gcjrcQubKQdIOk3McqzOc= Received: (qmail 21470 invoked by alias); 11 Jun 2018 09:22:20 -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 21332 invoked by uid 89); 11 Jun 2018 09:22:20 -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=harder, sk:analyze 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; Mon, 11 Jun 2018 09:22:18 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 48AE6560F3; Mon, 11 Jun 2018 05:22:17 -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 UPwbvEroZDDi; Mon, 11 Jun 2018 05:22:17 -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 388F3560EF; Mon, 11 Jun 2018 05:22:17 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 379B254C; Mon, 11 Jun 2018 05:22:17 -0400 (EDT) Date: Mon, 11 Jun 2018 05:22:17 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Don't split AND THEN expressions in GNATprove_Mode Message-ID: <20180611092217.GA134900@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes Splitting AND THEN expressions in contracts into separate pragma Check is only useful for compilation when the error message points to a failed conjunct. For proof it is of no use; for flow analysis it is annoying. Also, it makes debugging harder. Now it is disabled in GNATprove_Mode. Compilation is not affected, so no test provided. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-06-11 Piotr Trojanek gcc/ada/ * sem_ch13.adb (Analyze_Aspect_Specifications): Don't split AND THEN expressions in Pre/Post contracts while in GNATprove_Mode. --- gcc/ada/sem_ch13.adb +++ gcc/ada/sem_ch13.adb @@ -3443,9 +3443,13 @@ package body Sem_Ch13 is -- We do not do this in ASIS mode, as ASIS relies on the -- original node representing the complete expression, when - -- retrieving it through the source aspect table. + -- retrieving it through the source aspect table. Also, we + -- don't do this in GNATprove mode, because it brings no + -- benefit for proof and causes annoynace for flow analysis, + -- which prefers to be as close to the original source code + -- as possible. - if not ASIS_Mode + if not (ASIS_Mode or GNATprove_Mode) and then (Pname = Name_Postcondition or else not Class_Present (Aspect)) then