From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UTv8BLSU6GV5ITsAWB0awg (envelope-from ) for ; Wed, 06 Mar 2024 11:07:16 -0500 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=Hx7ah3Nq; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 077FD1E0D2; Wed, 6 Mar 2024 11:07:16 -0500 (EST) 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 (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E98B61E092 for ; Wed, 6 Mar 2024 11:07:13 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 972283857C43 for ; Wed, 6 Mar 2024 16:07:13 +0000 (GMT) Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id 586AC3858D34 for ; Wed, 6 Mar 2024 16:06:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 586AC3858D34 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 586AC3858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709741217; cv=none; b=LxqX+0pZ59pUncPZJlrH3UHrXnkaNorJ0uMTQFJ3RxVx/c5bSMaJe/7LPgjW2KrJY9PPxrGSTVm+9IB7LPPPD6yeK03d26ACTvtlfst/hEa0k5SgPc2j1Sw+dAcrYa+YMzAaNKlUVAwwf+AlMsVIXfmoQHi4Vc+SZ6lvGZmMTqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709741217; c=relaxed/simple; bh=yBwc5MjkYyxtk5IxXNXh07MFLCWQhwlGJpmKv71+pks=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rvVCEHx0pBCJARf67hGpKydRCnUf5f+0XptnaH0oWFLFozZLNaPXcrjbVUz8R43SyE3ocE01YxbB/6LlQkcsX90oXAZn2ks3q+FYlUI9pthSIUIeFm33HdIInkbneWN1oCfH6//QdGygMn0/R5MV/dWnlMogTHXSPvN5zMEwGFc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-366019c21b4so23115ab.1 for ; Wed, 06 Mar 2024 08:06:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1709741214; x=1710346014; 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=hSaev+W5u0dn0bO3yctDoH6q9fZsvuCH6lq9N4h0FlM=; b=Hx7ah3NqUMC28KrXW41gyiAdhwuDVel2FsR2laD+2ba70atEj0PHyJoHm0UdbZJ271 9ai+vyMcWYyy79AtITcufRdGQIrVSxtgQhfyq1KCMcXnrVDQXu0RrQbrPa05x23eJXRI eyaALfeFYBgd8tF4nchhnKhLrq+8OQAJso9X6JuVC2ae6m8TXeiZjcswJVgA3POo2fMA QoIMNf9saOv0G7qdt2+6v+Mbj5QkymrcdJYj5lqLEaDlFuHYdaLjMrY/pI1efGNaphxS 8E94wT9n6tPWOxZntboLe3UMtAaG4l2xv5xGhu1PAHGtDMo/MzXNVFVyyznNLzLbL5xD /oNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709741214; x=1710346014; 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=hSaev+W5u0dn0bO3yctDoH6q9fZsvuCH6lq9N4h0FlM=; b=gdqnaKSs81JVXBoZESsAI5+4tPUgUWI9DN2219vYhU6AcGCXg/mTZQEozQ+8vMDT9U iYX1ryY8/mYViPEsRTXqLuLFiZZChDzy/r2mc1YbuRY/E3AuRZnBMTFPnQfN0kJ7a+Iy 8cha91mt0OkT4C+r/Dsw5JQGK4vDj26cUGwmjSzND+szvJYV5cfK8uktcKg9j5nnQW/5 nWmPXIWY/bXWzrEOWf/2SRc+hSE+6kCdJX/l1MibMheH+ZwjAKjPTxrRn1Pmdbuq591v GilI5PSDYsvwt8aaGigpUSkffYMmz6/omVoi+H7LMAqOCrax8ptguYGSEqQlgIhuBSSO 0Yxg== X-Gm-Message-State: AOJu0Yxe+Ot1BuYHl63uCaRcGv6w455PKTLdYIn3IZB5frgbiwdIdCof QTowjmkeUsKqmCMPx6TPFJBeZLs+O7FJGuiHQUT5idHRaaf8G8CEWoPbeS3YrcfL5jMcNoZTdE0 = X-Google-Smtp-Source: AGHT+IHJWc3MJzQgQ1TfdUZ6P4exSy6yXCpl7xc6NZc0sm4lMKA93nD6g+8dJOrYRXt3xtWch8YmQg== X-Received: by 2002:a05:6e02:1807:b0:365:2ad1:5fae with SMTP id a7-20020a056e02180700b003652ad15faemr17514703ilv.32.1709741214479; Wed, 06 Mar 2024 08:06:54 -0800 (PST) Received: from localhost.localdomain (71-211-170-195.hlrn.qwest.net. [71.211.170.195]) by smtp.gmail.com with ESMTPSA id r1-20020a056638044100b00474f698082bsm1508285jap.28.2024.03.06.08.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 08:06:54 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Remove some unnecessary Ada expression code Date: Wed, 6 Mar 2024 09:06:44 -0700 Message-ID: <20240306160644.3027294-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 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: 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_bitwise_operation differs from the "usual" bitwise operations only in that it calls value_cast at the end. However, because gdb is generally fairly lax about integer types, and because (perhaps oddly) C-style binary promotion is done here anyway, it seems to me that this code isn't needed. --- gdb/ada-exp.h | 27 --------------------------- gdb/ada-exp.y | 12 ++++++------ 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 1d8615b2e87..9abdd6f3f70 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -286,33 +286,6 @@ class ada_binop_equal_operation { return std::get<0> (m_storage); } }; -/* Bitwise operators for Ada. */ -template -class ada_bitwise_operation - : public maybe_constant_operation -{ -public: - - using maybe_constant_operation::maybe_constant_operation; - - value *evaluate (struct type *expect_type, - struct expression *exp, - enum noside noside) override - { - value *lhs = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); - value *rhs = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); - value *result = eval_op_binary (expect_type, exp, noside, OP, lhs, rhs); - return value_cast (lhs->type (), result); - } - - enum exp_opcode opcode () const override - { return OP; } -}; - -using ada_bitwise_and_operation = ada_bitwise_operation; -using ada_bitwise_ior_operation = ada_bitwise_operation; -using ada_bitwise_xor_operation = ada_bitwise_operation; - /* Ada array- or string-slice operation. */ class ada_ternop_slice_operation : public maybe_constant_operation, diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index ab936ae4733..26963f78884 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -800,10 +800,10 @@ exp : relation and_exp : relation _AND_ relation - { ada_wrap2 + { ada_wrap2 (BINOP_BITWISE_AND); } | and_exp _AND_ relation - { ada_wrap2 + { ada_wrap2 (BINOP_BITWISE_AND); } ; @@ -818,10 +818,10 @@ and_then_exp : or_exp : relation OR relation - { ada_wrap2 + { ada_wrap2 (BINOP_BITWISE_IOR); } | or_exp OR relation - { ada_wrap2 + { ada_wrap2 (BINOP_BITWISE_IOR); } ; @@ -833,10 +833,10 @@ or_else_exp : ; xor_exp : relation XOR relation - { ada_wrap2 + { ada_wrap2 (BINOP_BITWISE_XOR); } | xor_exp XOR relation - { ada_wrap2 + { ada_wrap2 (BINOP_BITWISE_XOR); } ; -- 2.43.0