From patchwork Tue Jan 9 13:15:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 1884457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=CswH9yVw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T8Wl33JsZz1yPf for ; Wed, 10 Jan 2024 00:20:31 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7384D3861811 for ; Tue, 9 Jan 2024 13:20:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id DD4C4386103D for ; Tue, 9 Jan 2024 13:15:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD4C4386103D Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DD4C4386103D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::331 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704806146; cv=none; b=ITh3ZIuc+azau9LIyIif0OYR6UjwQk3ev9XnwoscqjNxSpBJjPs93bqqMlWY40HA7zDz2hXQbHAyY9+EmUJCgrjgBvHAKFkvrg7s9zfKD9hTt1qy+fkL6BicVNabZ3NM58MqVHbE7cEQknJ3jH2DgxR6nkGzrP66okRzhhAwmM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704806146; c=relaxed/simple; bh=wda39lW66IvqfdwSziFR6nddAGTvFOqftRGgzQRqNLc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=I+XBJt011q/vsZML5EDQCt5EuOilpsWCoH0TTXFyp8F4HhUuBiRNfFBWjAm4PgSe4HwamIJ79NkIn4TLWz5tp59xzNZRF9+ASX/BoNrH2tqY2BLwMyN1c5EcdSAIxlfcmg/6dbv+qI+3RiqqcBFi4M/NSwuaBxHkkCYZHEaikMA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40e47dc8b0eso16954305e9.3 for ; Tue, 09 Jan 2024 05:15:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1704806139; x=1705410939; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Kcjm/HdgMbzxfmk1wtt1zqFJ7FGLAJtX0Sctet37hFA=; b=CswH9yVwEFlIv+zrZszzIxLYZiCh+PYvqz1MLswAkj+syPgvq+mM6YINXgZLT4sTgc n5dbkvXOD/WA6JxkhzpG1qas0eiVnnN3Pak1piUe/37Bf9BhRhauoRQGV1t84q2mLd3D yMuav1mxCIFHLsgfBi5K1beWq0p7g8ZrTd+fqQ9RqOmqLr8L6j3HUcQa6WfllJv163Qa bTBX4kcwS6ox0qvZvqvMZvmfOsb0K2dNqsprElxapsibmiwnX20KcMsQ3N/D3WpWlbc4 xDbKA23vAlltlBOfpjvSw9Sses9AcsNx5Z+tgNQDCLpO93LZWIz0IBRNcDa+n/Nl8OWz O1Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704806139; x=1705410939; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Kcjm/HdgMbzxfmk1wtt1zqFJ7FGLAJtX0Sctet37hFA=; b=X2FbZqF6myGKx53dv9TfBWP1mv2dGnHJXSb/00VPkeIshc7KnZyk1cYzredaWYSSKo goGEpMcQbDhpNMfoES3S1GyfD+SDlexF48Rz5v3Xvq2EnEVIwycsFoEHeRjlQeNtkoIN 2ruU1eYvjPkcKS1nWNLOw7LPZiougXpkp/1nATBjSOpn/7PMiJvIiiAsHhkBdksa0xPS RkN0jOcl0wAx31CkvhwDqX4GKxgnUhXIQlkvhwnD0f3l5vLgZluc5H/NEQsIg//GxPRb WEQCPE/DRd6W/l6/Ko9Joo9EPQmhtFEtgUtNFEHbDpXuQ1ma1aVd9d8hLhe7yNb/86ar 96tQ== X-Gm-Message-State: AOJu0YxzrLcDM4nNhHcZcN3z044DkRwz+nc0ZvnM6knSvfnSVOfK5BJ1 N+rVvOAE3rnYsHfYagvP2la9Kvx7a/WENiw0KfiZZ6uIXQ== X-Google-Smtp-Source: AGHT+IHvVQNNfL0/qgHLDy2xtKqzXh65N6vX4uqTiJIhhL66Fpi7znByB1/QBXsnLc6+TY9ZBzbfBQ== X-Received: by 2002:a05:600c:35d1:b0:40d:87da:3150 with SMTP id r17-20020a05600c35d100b0040d87da3150mr3170864wmq.76.1704806139664; Tue, 09 Jan 2024 05:15:39 -0800 (PST) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id m1-20020a05600c4f4100b0040d5b849f38sm15002949wmq.0.2024.01.09.05.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 05:15:39 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Remove dead code for GNATprove inlining Date: Tue, 9 Jan 2024 14:15:38 +0100 Message-ID: <20240109131538.744194-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Piotr Trojanek Removed code was dead because it could only be executed when Back_End_Inlining is True and that flag is always false in GNATprove_Mode. gcc/ada/ * inline.adb (Cannot_Inline): Cleanup use of 'Length; remove dead code. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/inline.adb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index cc2bc3ac18a..f6bed4d26e3 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -1983,9 +1983,9 @@ package body Inline is then declare Len1 : constant Positive := - String (String'("cannot inline"))'Length; + String'("cannot inline")'Length; Len2 : constant Positive := - String (String'("info: no contextual analysis of"))'Length; + String'("info: no contextual analysis of")'Length; New_Msg : String (1 .. Msg'Length + Len2 - Len1); @@ -2044,17 +2044,6 @@ package body Inline is Error_Msg_NE (Msg (Msg'First .. Msg'Last - 1), N, Subp); - -- In GNATprove mode, issue an info message when -gnatd_f is set and - -- Suppress_Info is False, and indicate that the subprogram is not - -- always inlined by setting flag Is_Inlined_Always to False. - - elsif GNATprove_Mode then - Set_Is_Inlined_Always (Subp, False); - - if Debug_Flag_Underscore_F and not Suppress_Info then - Error_Msg_NE (Msg, N, Subp); - end if; - else -- Do not emit warning if this is a predefined unit which is not