From patchwork Mon Aug 19 08:38:59 2019 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: 1149103 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-507216-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="fABm08m/"; 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 46BnQx4vy7z9s3Z for ; Mon, 19 Aug 2019 18:39:21 +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=eKir627qFxX0euoprrNu9uKzF3dcZcl6zKOh8dW4Lo3yg8VPOb Ljd8L7dGAUT4RREKvn2W2BjSclAd4ZL2WGLWYkks/LlTaNvUOmm5Avb0YhuoLK65 2uD+qzcDZ2QjZsGcRH6/ZQLd72NcnTOGJI/hKfTE6SX/QL81pNJSN3EBw= 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=woTI2zoLSbGFx08yfseZ9/8qIfg=; b=fABm08m/OXQaFNghV0SJ KWvQ9/h7Zrs3GAZAvFzQAQMLJYDHar3RvPn1upXCTk9FmFXBOg0k+EjmMpY3LX+S nWg+dMeV64qH3K+U26xJx2XWECjp07R8reESn4VKDXRp2jwWEiA4+Qy7OipDlCQF mj9E2pg7WYDRZ+h6AHW9/Jk= Received: (qmail 114764 invoked by alias); 19 Aug 2019 08:39:02 -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 114717 invoked by uid 89); 19 Aug 2019 08:39:01 -0000 Authentication-Results: sourceware.org; auth=none 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.1 spammy=sem_res.adb, proof, UD:sem_res.adb, sem_resadb 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, 19 Aug 2019 08:39:00 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 898981161D2; Mon, 19 Aug 2019 04:38:59 -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 cIAFZSshQeIE; Mon, 19 Aug 2019 04:38:59 -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 7836211619A; Mon, 19 Aug 2019 04:38:59 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 756CD6AB; Mon, 19 Aug 2019 04:38:59 -0400 (EDT) Date: Mon, 19 Aug 2019 04:38:59 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [Ada] Do not skip non-aliasing checking when inlining in GNATprove Message-ID: <20190819083859.GA33353@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes When code is inlinined for proof in the special mode for GNATprove, Ada rules about non-aliasing should still be checked. Now fixed. There is no impact on compilation. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-08-19 Yannick Moy gcc/ada/ * sem_res.adb (Resolve_Call): Check non-aliasing rules before GNATprove inlining. --- gcc/ada/sem_res.adb +++ gcc/ada/sem_res.adb @@ -6968,6 +6968,10 @@ package body Sem_Res is Build_Call_Marker (N); + Mark_Use_Clauses (Subp); + + Warn_On_Overlapping_Actuals (Nam, N); + -- In GNATprove mode, expansion is disabled, but we want to inline some -- subprograms to facilitate formal verification. Indirect calls through -- a subprogram type or within a generic cannot be inlined. Inlining is @@ -7116,10 +7120,6 @@ package body Sem_Res is end if; end if; end if; - - Mark_Use_Clauses (Subp); - - Warn_On_Overlapping_Actuals (Nam, N); end Resolve_Call; -----------------------------