* [PATCH] Remove some unnecessary Ada expression code
@ 2024-03-06 16:06 Tom Tromey
2024-03-18 14:31 ` Tom Tromey
0 siblings, 1 reply; 2+ messages in thread
From: Tom Tromey @ 2024-03-06 16:06 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
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<enum exp_opcode OP>
-class ada_bitwise_operation
- : public maybe_constant_operation<operation_up, operation_up>
-{
-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<BINOP_BITWISE_AND>;
-using ada_bitwise_ior_operation = ada_bitwise_operation<BINOP_BITWISE_IOR>;
-using ada_bitwise_xor_operation = ada_bitwise_operation<BINOP_BITWISE_XOR>;
-
/* Ada array- or string-slice operation. */
class ada_ternop_slice_operation
: public maybe_constant_operation<operation_up, operation_up, operation_up>,
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_bitwise_and_operation>
+ { ada_wrap2<bitwise_and_operation>
(BINOP_BITWISE_AND); }
| and_exp _AND_ relation
- { ada_wrap2<ada_bitwise_and_operation>
+ { ada_wrap2<bitwise_and_operation>
(BINOP_BITWISE_AND); }
;
@@ -818,10 +818,10 @@ and_then_exp :
or_exp :
relation OR relation
- { ada_wrap2<ada_bitwise_ior_operation>
+ { ada_wrap2<bitwise_ior_operation>
(BINOP_BITWISE_IOR); }
| or_exp OR relation
- { ada_wrap2<ada_bitwise_ior_operation>
+ { ada_wrap2<bitwise_ior_operation>
(BINOP_BITWISE_IOR); }
;
@@ -833,10 +833,10 @@ or_else_exp :
;
xor_exp : relation XOR relation
- { ada_wrap2<ada_bitwise_xor_operation>
+ { ada_wrap2<bitwise_xor_operation>
(BINOP_BITWISE_XOR); }
| xor_exp XOR relation
- { ada_wrap2<ada_bitwise_xor_operation>
+ { ada_wrap2<bitwise_xor_operation>
(BINOP_BITWISE_XOR); }
;
--
2.43.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Remove some unnecessary Ada expression code
2024-03-06 16:06 [PATCH] Remove some unnecessary Ada expression code Tom Tromey
@ 2024-03-18 14:31 ` Tom Tromey
0 siblings, 0 replies; 2+ messages in thread
From: Tom Tromey @ 2024-03-18 14:31 UTC (permalink / raw)
To: Tom Tromey; +Cc: gdb-patches
>>>>> "Tom" == Tom Tromey <tromey@adacore.com> writes:
Tom> ada_bitwise_operation differs from the "usual" bitwise operations only
Tom> in that it calls value_cast at the end. However, because gdb is
Tom> generally fairly lax about integer types, and because (perhaps oddly)
Tom> C-style binary promotion is done here anyway, it seems to me that this
Tom> code isn't needed.
I'm checking this in.
Tom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-18 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-06 16:06 [PATCH] Remove some unnecessary Ada expression code Tom Tromey
2024-03-18 14:31 ` Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox