[binutils-gdb] Introduce concat_operation

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e51e26a090053f8f8354692fff6dce20ed2e47ba

commit e51e26a090053f8f8354692fff6dce20ed2e47ba
Author: Tom Tromey <tom@tromey.com>
Date:   Mon Mar 8 07:27:57 2021 -0700

    Introduce concat_operation
    
    This adds class concat_operation, which implements BINOP_CONCAT.
    
    gdb/ChangeLog
    2021-03-08  Tom Tromey  <tom@tromey.com>
    
            * expop.h (class concat_operation): New.
            * eval.c (eval_op_concat): No longer static.  Remove "op"
            parameter.
            (evaluate_subexp_standard): Update.

Diff:
---
 gdb/ChangeLog |  7 +++++++
 gdb/eval.c    | 11 +++++------
 gdb/expop.h   | 26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 42a8e1c8f88..59cdff7ad81 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* expop.h (class concat_operation): New.
+	* eval.c (eval_op_concat): No longer static.  Remove "op"
+	parameter.
+	(evaluate_subexp_standard): Update.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* expop.h (class structop_member_operation)
diff --git a/gdb/eval.c b/gdb/eval.c
index de7863138b3..b78fa3b4c8a 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1313,15 +1313,14 @@ eval_op_objc_selector (struct type *expect_type, struct expression *exp,
 
 /* Helper function that implements the body of BINOP_CONCAT.  */
 
-static struct value *
+struct value *
 eval_op_concat (struct type *expect_type, struct expression *exp,
-		enum noside noside,
-		enum exp_opcode op, struct value *arg1, struct value *arg2)
+		enum noside noside, struct value *arg1, struct value *arg2)
 {
   if (noside == EVAL_SKIP)
     return eval_skip_value (exp);
-  if (binop_user_defined_p (op, arg1, arg2))
-    return value_x_binop (arg1, arg2, op, OP_NULL, noside);
+  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);
 }
@@ -2791,7 +2790,7 @@ evaluate_subexp_standard (struct type *expect_type,
     case BINOP_CONCAT:
       arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
       arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
-      return eval_op_concat (expect_type, exp, noside, op, arg1, arg2);
+      return eval_op_concat (expect_type, exp, noside, arg1, arg2);
 
     case BINOP_ASSIGN:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);
diff --git a/gdb/expop.h b/gdb/expop.h
index cbd4d6267da..16ee30d8d10 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -84,6 +84,10 @@ 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);
 
 namespace expr
 {
@@ -935,6 +939,28 @@ public:
   { return STRUCTOP_MPTR; }
 };
 
+class concat_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_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);
+  }
+
+  enum exp_opcode opcode () const override
+  { return BINOP_CONCAT; }
+};
+
 } /* namespace expr */
 
 #endif /* EXPOP_H */