diff options
| -rw-r--r-- | gdb/eval.c | 12 | ||||
| -rw-r--r-- | gdb/expop.h | 6 | ||||
| -rw-r--r-- | gdb/valarith.c | 2 |
3 files changed, 2 insertions, 18 deletions
@@ -1106,18 +1106,6 @@ eval_op_objc_selector (struct type *expect_type, struct expression *exp, lookup_child_selector (exp->gdbarch, sel)); } -/* Helper function that implements the body of BINOP_CONCAT. */ - -struct value * -eval_op_concat (struct type *expect_type, struct expression *exp, - enum noside noside, struct value *arg1, struct value *arg2) -{ - if (binop_user_defined_p (BINOP_CONCAT, arg1, arg2)) - return value_x_binop (arg1, arg2, BINOP_CONCAT, OP_NULL, noside); - else - return value_concat (arg1, arg2); -} - /* A helper function for TERNOP_SLICE. */ struct value * diff --git a/gdb/expop.h b/gdb/expop.h index 1592568..d903ab0 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -83,10 +83,6 @@ extern struct value *eval_op_member (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2); -extern struct value *eval_op_concat (struct type *expect_type, - struct expression *exp, - enum noside noside, - struct value *arg1, struct value *arg2); extern struct value *eval_op_add (struct type *expect_type, struct expression *exp, enum noside noside, @@ -1158,7 +1154,7 @@ public: = std::get<0> (m_storage)->evaluate_with_coercion (exp, noside); value *rhs = std::get<1> (m_storage)->evaluate_with_coercion (exp, noside); - return eval_op_concat (expect_type, exp, noside, lhs, rhs); + return value_concat (lhs, rhs); } enum exp_opcode opcode () const override diff --git a/gdb/valarith.c b/gdb/valarith.c index e13db10..791c1cd 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -252,7 +252,7 @@ int binop_types_user_defined_p (enum exp_opcode op, struct type *type1, struct type *type2) { - if (op == BINOP_ASSIGN || op == BINOP_CONCAT) + if (op == BINOP_ASSIGN) return 0; type1 = check_typedef (type1); |