Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-11-16 04:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ada_binop_in_bounds

Browse Source 
ada_binop_in_bounds can be merged with its sole caller.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
Tom Tromey
2025-09-08 10:27:40 -06:00
parent 118245e166
commit ea1bd34d53
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdb/ada-exp.h
View File

@@ -38,11 +38,6 @@ extern struct value *ada_mult_binop (struct type *expect_type,
struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2);
extern struct value *ada_binop_in_bounds (struct expression *exp,
enum noside noside,
struct value *arg1,
struct value *arg2,
int n);
extern struct value *ada_binop_minmax (struct type *expect_type,
struct expression *exp,
enum noside noside, enum exp_opcode op,
@@ -304,13 +299,7 @@ public:
value *evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside) override
{
value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
return ada_binop_in_bounds (exp, noside, arg1, arg2,
std::get<2> (m_storage));
}
enum noside noside) override;
enum exp_opcode opcode () const override
{ return BINOP_IN_BOUNDS; }

15
gdb/ada-lang.c
View File

@@ -10284,14 +10284,17 @@ ada_ternop_slice_operation::evaluate (struct type *expect_type,
longest_to_int (high_bound));
}
} /* namespace expr */
/* A helper function for BINOP_IN_BOUNDS. */
/* Implement BINOP_IN_BOUNDS. */
value *
ada_binop_in_bounds (struct expression *exp, enum noside noside,
struct value *arg1, struct value *arg2, int n)
ada_binop_in_bounds_operation::evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside)
{
value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
int n = std::get<2> (m_storage);
if (noside == EVAL_AVOID_SIDE_EFFECTS)
{
struct type *type = language_bool_type (exp->language_defn,
@@ -10316,6 +10319,8 @@ ada_binop_in_bounds (struct expression *exp, enum noside noside,
|| value_equal (arg2, arg1)));
}
} /* namespace expr */
/* A helper function for some attribute operations. */
static value *