From patchwork Fri Jul 9 12:37:46 2021 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: 1503081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=adacore-com.20150623.gappssmtp.com header.i=@adacore-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=XYQC3kk+; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GLt4D3kMNz9sRN for ; Fri, 9 Jul 2021 22:38:18 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F25E73AAB45B for ; Fri, 9 Jul 2021 12:38:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by sourceware.org (Postfix) with ESMTPS id 11739398B0E5 for ; Fri, 9 Jul 2021 12:37:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 11739398B0E5 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-lf1-x132.google.com with SMTP id n14so22969385lfu.8 for ; Fri, 09 Jul 2021 05:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=FTU6CSqrp7DECxkTqb/AE1XQIYdEoYBefLf+WHNblFM=; b=XYQC3kk+kSuGHfHDtWDcwO/n8aNJ+X9Wo4Pz9e8vuv0QznZyuLNTpLLy2ayrrgl3mG zhka9tnADhAIaDcs4o3BKtvAwLmV1jj5/R0s6CsFUwvATVvfUEiiSfJmFljJD1gVcrEF qrPxyG6Yv4yQEsJwiG39fsw95YX6pjkq59Vn5jfkFfkvzz59eiTfTvIxsq43F7cxJB6b lLW2Z0+ZLO8FJdn/DCKzcMmAahdRQqTybzw1RV0JjYRxKDG76BMpxm6qxNb/lecvmtsr S/4+iWeMeWdhM/YvjKA/zWJTAWTC1clTs8cc9miD4LGp75FaoippDjLfrL/jkjsnc7VC /1dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=FTU6CSqrp7DECxkTqb/AE1XQIYdEoYBefLf+WHNblFM=; b=FuSDJoZyao8WdZ3eIo/I4lDSCW2Za8aOLBxVDScIw4FYR15fNN+gkqaiSsIxSs+pge oLrT0Hw/0zN2/9yS68wmMT8clnW8J5NV7pNPq49U3vjBDEry0IPVD1PipboT7EofJKop am5nRQx9KoLO3BCKMvYCnuIfQPE86o2wyOJ3SQ2N7KYrvFZl2EYNK4wehsKMp29OJeGf RPckCKFOLhaR7ebcb0rZkVgO2F74dBFSlrQwxezuOmZeTHEbWbEE5W3N5k2NqMSYyqB6 mkXB16N3FhRA41j48u8EXyvc13o5YPOyZ89urHUq0oD1PsrbXhcvV2YyNxVXAzA4azbu jgYA== X-Gm-Message-State: AOAM530jcFvh0yoKErZNg5jij/do9Z+IjKD5VQ4bn0eWBWCBwMjcYk9p 9cefBHct30qieWAcDdsArNIdRL9J0cEYUw== X-Google-Smtp-Source: ABdhPJxb55AxwmtyTuAs7vxF6VmP+xZuD0GtKqHhar0QAyrrbhO+2IAjEEilbi+r85BLtnxb3/p8Sg== X-Received: by 2002:a05:6512:3053:: with SMTP id b19mr7633465lfb.167.1625834268701; Fri, 09 Jul 2021 05:37:48 -0700 (PDT) Received: from adacore.com ([2a02:2ab8:224:2ce:72b5:e8ff:feef:ee60]) by smtp.gmail.com with ESMTPSA id j26sm404599ljg.91.2021.07.09.05.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 05:37:47 -0700 (PDT) Date: Fri, 9 Jul 2021 12:37:46 +0000 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Avoid unnecessary call in preanalysis without freezing Message-ID: <20210709123746.GA3875462@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Cleanup related to preanalysis in GNATprove mode; behaviour is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_res.adb (Preanalyze_And_Resolve): Only call Set_Must_Not_Freeze when it is necessary to restore the previous value. diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -1886,9 +1886,9 @@ package body Sem_Res is Expander_Mode_Restore; Full_Analysis := Save_Full_Analysis; - Set_Must_Not_Freeze (N, Save_Must_Not_Freeze); if not With_Freezing then + Set_Must_Not_Freeze (N, Save_Must_Not_Freeze); Inside_Preanalysis_Without_Freezing := Inside_Preanalysis_Without_Freezing - 1; end if;