From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KMalNbnJGWqcUycAWB0awg (envelope-from ) for ; Fri, 29 May 2026 13:15:37 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=EtV953gA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CA6041E062; Fri, 29 May 2026 13:15:37 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 035931E062 for ; Fri, 29 May 2026 13:15:37 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2E1244BA7980 for ; Fri, 29 May 2026 17:15:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E1244BA7980 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=EtV953gA Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by sourceware.org (Postfix) with ESMTPS id 33BE14BA23D7 for ; Fri, 29 May 2026 17:15:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 33BE14BA23D7 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 33BE14BA23D7 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780074911; cv=none; b=U40RIVWuedV7ke2LzNV2DARtgTHyDxmU48mzlHFjkSOB+4dFsTUKFh7C40COrFqs9j0Q83vs7nOKShojcJ6W7GnzhlRI1iidnUz5KU+mtpJpuIELaAMiykx918BwORp4KRzguh8VhzmkkpI4bztiWLmG1w4zfDqoGjf1dH6zxNE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780074911; c=relaxed/simple; bh=0/poYsiY3N6B/Tp07hG822OKpM+jI+KhogfjEpDPJzQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=mr6cKDG4vdaUQbpE84FyvPI5jMEO847ZUixRmaweH0MxycOUQWmyGdOd/6uYQp5ABlEFTtZ25V6Jrfnf2BL8Xg3WoIdNunzMhintwPkt/U18QQDXrxziohekDV/bH6rHyN9XiZhmQ0LRRY35dgWycVPPSWJ81M9zGFbKxzOqrOE= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=EtV953gA DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33BE14BA23D7 Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-69d8ff0ca12so4828637eaf.2 for ; Fri, 29 May 2026 10:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1780074910; x=1780679710; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kVMoaosVbMkjHqqiikbt8WpvvTj1GtH3aoU6PDyTEZE=; b=EtV953gAwUeM/8VfVh15hz8jUo2O4KdOKnHcshKr38JTTYKzKouhwvl7GTNJYZFzSH /IdAvToEjIZBNBeVCIQ1MKvdCXx4lTwnaZ46ogLJnZpe3lap2L9o3rVJHl799xxykxQM uCLAdQgGjKKI8mscNv47iq1ufYPfd63yViMvKqG5IqFMW0MpRXbOAzlwvJvctkpchwz9 2RXAQdlpkjawf97goNrKUAc6WVVLPq/60CXk/BUXxwjhctnNnmB24rR4FkJFq2PpJuer itGsT/wWvpEF9XZ+simYFz9XC+Mno8JgHlOJGwGD3+0xtfXQLtkWtVfnd6zhoxoiZ/I9 RwuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780074910; x=1780679710; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kVMoaosVbMkjHqqiikbt8WpvvTj1GtH3aoU6PDyTEZE=; b=idxH+Z9seuJRcSpEKpiVDNF8HTaGdp86P11jiazLJr/xMSjow0IhvA6CivGf95SB3b Bd97ZFT1Ns9dTdulm8mcSCwgm4Zy0tZ7GXmxMghx7Bqfkxi0rRa6PunCqCHO3ugKwVQm afQFoIe5pobl4ogF3oiNfq4pmec1qQ/UcT5xO9J9CosJsqdBWlC6JlkNoLHx0+/XYd6N YABfBUcqy+Srx0yi+SWX8ZKhABLRUgUUUQQsowUydmucegmZWWGED3Phjs43JemLAVsy pVLXBp4narVNmfvhn83iUCXnsJ+wWFHrdH1n3sB+XvyDYa3tG+0AP28c2yDFs2UwQ8BN coGA== X-Gm-Message-State: AOJu0YwDmD604Cpg84wwkvs1EG9hQRz1KHIW/NEtzivo+PcQpq/hII/H m8ZTxqj0rfnPDrYJMqFJfSqzqAboTohbDmEg9RoguZn8NKdLhGhq8wwaDGNGctswovY8h6EIAgd 81PA= X-Gm-Gg: Acq92OF7HBW7BtfF1jqOkFEPQgFkl2s3X8LwpqkdOVdJQv0jPKr20NLiFymZdO4lhlj SWxRg/ypKvkyogPiRgPHX/gCd0M8OCuz+33jd6YY+VMIJicopX/IflF1D95Biwh161KbgGWHNKe hgXnx9e8jc6AeVBeat0uL2d8/sE5gMr6Mqer506Zq44SY1tkOEBafg9GdbF/v7iCu7wTaPHg12x MtkNFtaoZNuGBpjitDDr6DAHOQO7MD2vZCTFSPuD3bKuYMqfNRhTrwEdOZliaPB1peXztkmMVH2 5PlxWIJXSsNFTwQcZ3tPWcm+nOqnuEChuD3BAtDMgphMkFJ8B3xxmad61aZUlg0Am035l22KdSv Xd1CfBYSqVR91oLXymcCqWvXzDsB7U5im1QHDm2fPsXzAi6B7FudxhYk6Fd5s+dwFLHLq6UOghP 4CjuQQKusjkfpWdkTNHxcBt6SMOvBO/tHzhi+X1MW5jthE1rTulbYpQA== X-Received: by 2002:a05:6820:200e:b0:69e:14a:f314 with SMTP id 006d021491bc7-69e1059e2ccmr79155eaf.41.1780074910416; Fri, 29 May 2026 10:15:10 -0700 (PDT) Received: from bapiya (75-166-225-82.hlrn.qwest.net. [75.166.225.82]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-69e0696923bsm1530686eaf.11.2026.05.29.10.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 10:15:10 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Remove ada-lang.c:eval_ternop_in_range Date: Fri, 29 May 2026 11:15:00 -0600 Message-ID: <20260529171500.2854619-1-tromey@adacore.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org ada-lang.c:eval_ternop_in_range is only used in a single spot. This patch merges it into its sole caller. Helper functions like this are still sometimes left over from the big expression rewrite. I'm checking this in as obvious. --- gdb/ada-lang.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 0ecc6712677..cb741647d47 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10056,24 +10056,6 @@ ada_value_cast (struct type *type, struct value *arg2) entity. Results in this case are unpredictable, as we usually read past the buffer containing the data =:-o. */ -/* A helper function for TERNOP_IN_RANGE. */ - -static value * -eval_ternop_in_range (struct type *expect_type, struct expression *exp, - enum noside noside, - value *arg1, value *arg2, value *arg3) -{ - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); - binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); - struct type *type = language_bool_type (exp->language_defn, exp->gdbarch); - return - value_from_longest (type, - (value_less (arg1, arg3) - || value_equal (arg1, arg3)) - && (value_less (arg2, arg1) - || value_equal (arg2, arg1))); -} - /* A helper function for UNOP_NEG. */ value * @@ -10659,10 +10641,17 @@ ada_ternop_range_operation::evaluate (struct type *expect_type, struct expression *exp, enum noside noside) { - value *arg0 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); - value *arg1 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); - value *arg2 = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); - return eval_ternop_in_range (expect_type, exp, noside, arg0, arg1, arg2); + value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + value *arg3 = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); + struct type *type = language_bool_type (exp->language_defn, exp->gdbarch); + return value_from_longest (type, + (value_less (arg1, arg3) + || value_equal (arg1, arg3)) + && (value_less (arg2, arg1) + || value_equal (arg2, arg1))); } value * base-commit: b083976272bd663ed036692e54796870b3bf6c89 -- 2.54.0