From patchwork Mon Jan 10 09:41:35 2022 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: 49787 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B9ED73891C1E for ; Mon, 10 Jan 2022 09:45:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9ED73891C1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641807950; bh=Fb4REGa6tlSm0MCMcWdCFTgefxhruAvak2WnNr8EgNY=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=J8czXGvaDxq5BX1eZoLaxodZffT41c/viKG29oLsxA9gVuyzUtdupPNDrTnQvPowK UbBYaFXUDFkKOHCss4/LKQ7q7ml10QvFeO0Vd5uTMWLZ2snMFuKnIeI6ZultF7FXbp oRYHuaKMI55vclqMyNRTgbAmLqiFPwFh7ygOKdpA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id DF0413891C22 for ; Mon, 10 Jan 2022 09:41:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DF0413891C22 Received: by mail-wm1-x32f.google.com with SMTP id p1-20020a1c7401000000b00345c2d068bdso9321443wmc.3 for ; Mon, 10 Jan 2022 01:41:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=Fb4REGa6tlSm0MCMcWdCFTgefxhruAvak2WnNr8EgNY=; b=vvn8b8765yoV+zuspirfLCZJ2ePo2mcs6Z/j//yUzwgCrtAb2lY4XoqnQRMBK98PsB kicqPT4oKeQflstx1X3lyvBhljNLDYkUiGcWbEnXKAMzhOgMJ8MsmOqFi6/A0HBQftG4 UboL2tepNEAQ3GORrUSUkYS9gk7K432jDzKleCgYSgFsQMyQ7OUhsnRoWClG0hiBjIFu RbjyE2BK0KXKgvPn/P7REXB+7WXPtM2YYTywW2dx3fDuXuXlWeCX7TFdvE6mE4Rycjn3 zHRwC8Eho2Ixm347sLoj1Lpc3zPu5fHu7q1oYKZF21XdzM+Qza9S/BRFe/YtrWUAc45c xYUw== X-Gm-Message-State: AOAM5336qdLnxvhJWUTVeW7fAapUqVyKPYCIA1d4WJCG0xKEvCeb+USt 161UCSIkuoactqTZyCjKICL8K863KnGr3A== X-Google-Smtp-Source: ABdhPJxqWifWWs+VV0P5fCxuMdHU+GHwqIycnZTIOQHWsOdVUT0TbgBy9lg5PkcQesWYJAlRRpzLyw== X-Received: by 2002:a1c:545b:: with SMTP id p27mr11497801wmi.178.1641807696937; Mon, 10 Jan 2022 01:41:36 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id g84sm6278560wme.7.2022.01.10.01.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:41:36 -0800 (PST) Date: Mon, 10 Jan 2022 09:41:35 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Disable expansion of pragma Loop_Variant in CodePeer mode Message-ID: <20220110094135.GA586103@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Pragma Loop_Variant is expanded into code which is too complicated for CodePeer to handle and results in messages with internal names. Disable expansion. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_prag.adb (Expand_Pragma_Loop_Variant): Disable expansion in CodePeer mode. diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb --- a/gcc/ada/exp_prag.adb +++ b/gcc/ada/exp_prag.adb @@ -2692,8 +2692,11 @@ package body Exp_Prag is begin -- If pragma is not enabled, rewrite as Null statement. If pragma is -- disabled, it has already been rewritten as a Null statement. + -- + -- Likewise, do this in CodePeer mode, because the expanded code is too + -- complicated for CodePeer to analyse. - if Is_Ignored (N) then + if Is_Ignored (N) or else CodePeer_Mode then Rewrite (N, Make_Null_Statement (Loc)); Analyze (N); return;