From patchwork Mon May 13 08:36:24 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: 1934631 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=Ftg8GJd6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4VdCpv4Lxcz1ymw for ; Mon, 13 May 2024 18:49:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA9F838708E3 for ; Mon, 13 May 2024 08:49:41 +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 5F41A384AB66 for ; Mon, 13 May 2024 08:36:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F41A384AB66 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 5F41A384AB66 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=1715589446; cv=none; b=i6Lhw6bklX0qbDuUoqq393Tiu+gkF7RcBVP81FMGMYTZYY/k/mp+WUtWaAOVTzyS/M0WJflJkfFzqRaPCwFH3MtBrcYbA6FFbjdlJfewE0iOSlU8ejov1D2kZr6KdBy1lXhySSP8G6oZdDMOPgIBVQ1mVVU7+HnbbOuRY+jZP0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715589446; c=relaxed/simple; bh=t0lJ9facgnM877EIIZondQoXARkOg0m6q3KLuDeKbo4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ciQjvFIj1sRO5dFU4RGkBobpTpDX6XFtfMHRvq7oAczOBW7b88fo/xWlUFCXSidrxLBgzBr5Qe28Q3kQ2Q2ant3s+2fXSMhckbAqqzTGYdamYPb4dwCUBZk8EpDjTgDFQqdRGqilTJIwBwh4JPHkr8V0yKlq8L2IJqMyVgoPAO8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41fd5dc04e2so23599805e9.3 for ; Mon, 13 May 2024 01:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715589386; x=1716194186; 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=3Tw5WoOX6veUQL4D1t7L+0GWu6RL7bG3vHein0wsmA0=; b=Ftg8GJd6qYY0vZSI/YyOhoPydVbRC84tNdhEdOMD+yyBIYlqjYIewYw745zWNQYsH7 bkHmaT8RmUlzC4KMc8awys0yFHkf4W94r2J+62e7tEIFfRx3XoyKUtxYpF+vQl/E2sQ9 8vPOjuSMpi1MHyspL1A5V3pbYUd8qgrP93XAPsehk1ofkvbS1Fp29+4XZPl8Iead4M39 Vj4evPIkOl2OsiSps0M7tBZbg0sHkDf2SJ+QtQPrpFxzXE4xt+oB7PUKm+a1BOHQ+raG OfBB2zEF1L9RgJh5y6vZR9t1ePcNgzUYSQyAXVHfx+LUc6zdTgrjMQAJjShrIRdaQOSx y9GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715589386; x=1716194186; 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=3Tw5WoOX6veUQL4D1t7L+0GWu6RL7bG3vHein0wsmA0=; b=vsVzsikHvvLcQ8gle57+4Fsd9CFZLJyw2NCRGsyLMxre9XDBRQWIm+lm8OmvYSMHY9 0vIL0cOIiildVKV1BffM64AxUxx4Ipy8ydl1Q1ZIxD5MUOnRT1vksOLkJooeyYEJIMB2 hYwu/5bi7P5xAP30RekCFFr9GbO3DdnSRO9tO8Bh+AS1X6NbT7Vavp1IjOyTX/F4PtcU AXD0DaC/hm6L8+zsutITsj/AqIDf/6q6yHSrp/da2cl6Vagst6TyUu+0IKJA0vihjsF5 B+gY3NQGoEeVOEiEI88OWYlKV0X4UWvHf+HIHIsf2FlkZQiPAOvc0MqPQMydS3NScBuX NQHw== X-Gm-Message-State: AOJu0YzydW7H+xFHTm4cjfBCQGZmzH6TLJjgbq7eiVF2H1ZKXuv0Kab8 TFRsRoDisFe8kLl0dDDmYfjbhMkhMJfc8TWTrmO8YWqsXEmavE+2zwOjqKZNEL5cXUI00UqIk5k = X-Google-Smtp-Source: AGHT+IH/z2WV6dwj51SfwihNJ9FjmbFYyCQ2nJydHIgACAimoz69Axpm41rq5h+yJ9vaNzOHdtwQNQ== X-Received: by 2002:adf:c589:0:b0:351:b7fa:ccd1 with SMTP id ffacd0b85a97d-351b7face38mr3179761f8f.55.1715589386199; Mon, 13 May 2024 01:36:26 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:cf0f:cd6c:7a6a:cbed]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502bbc5654sm10601468f8f.115.2024.05.13.01.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:36:25 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Deconstruct unused flag Is_Expanded_Contract Date: Mon, 13 May 2024 10:36:24 +0200 Message-ID: <20240513083624.165520-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Spam-Status: No, score=-14.0 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.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 Flag Is_Expanded_Contract was introduced together with N_Contract field (when implementing freezing of contracts), but was never actually used. gcc/ada/ * gen_il-fields.ads (Opt_Field_Enum): Remove Is_Expanded_Contract from the list of flags. * gen_il-gen-gen_nodes.adb (N_Contract): Remove Is_Expanded_Contract from the list of N_Contract fields. * sinfo.ads (Is_Expanded_Contract): Remove comments for the flag and its single occurrence in N_Contract. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gen_il-fields.ads | 1 - gcc/ada/gen_il-gen-gen_nodes.adb | 1 - gcc/ada/sinfo.ads | 5 ----- 3 files changed, 7 deletions(-) diff --git a/gcc/ada/gen_il-fields.ads b/gcc/ada/gen_il-fields.ads index 594aeb68819..67074c60250 100644 --- a/gcc/ada/gen_il-fields.ads +++ b/gcc/ada/gen_il-fields.ads @@ -254,7 +254,6 @@ package Gen_IL.Fields is Is_Elsif, Is_Entry_Barrier_Function, Is_Expanded_Build_In_Place_Call, - Is_Expanded_Contract, Is_Folded_In_Parser, Is_Generic_Contract_Pragma, Is_Homogeneous_Aggregate, diff --git a/gcc/ada/gen_il-gen-gen_nodes.adb b/gcc/ada/gen_il-gen-gen_nodes.adb index fb00993a95e..3a78ffb2009 100644 --- a/gcc/ada/gen_il-gen-gen_nodes.adb +++ b/gcc/ada/gen_il-gen-gen_nodes.adb @@ -1330,7 +1330,6 @@ begin -- Gen_IL.Gen.Gen_Nodes Cc (N_Contract, Node_Kind, (Sm (Classifications, Node_Id), Sm (Contract_Test_Cases, Node_Id), - Sm (Is_Expanded_Contract, Flag), Sm (Pre_Post_Conditions, Node_Id))); Cc (N_Derived_Type_Definition, Node_Kind, diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 06b9ad0884e..bee4491efde 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -1720,10 +1720,6 @@ package Sinfo is -- actuals to support a build-in-place style of call have been added to -- the call. - -- Is_Expanded_Contract - -- Present in N_Contract nodes. Set if the contract has already undergone - -- expansion activities. - -- Is_Generic_Contract_Pragma -- This flag is present in N_Pragma nodes. It is set when the pragma is -- a source construct, applies to a generic unit or its body, and denotes @@ -7959,7 +7955,6 @@ package Sinfo is -- Pre_Post_Conditions (set to Empty if none) -- Contract_Test_Cases (set to Empty if none) -- Classifications (set to Empty if none) - -- Is_Expanded_Contract -- Pre_Post_Conditions contains a collection of pragmas that correspond -- to pre- and postconditions associated with an entry or a subprogram