From: Tom Tromey <tom@tromey.com>
Date: Mon, 8 Mar 2021 14:27:57 +0000 (-0700)
Subject: Split out eval_op_concat
X-Git-Tag: binutils-2_37~1719
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c2f201e8d6cd3e4d9526d9d2833fa0cbaa93e67;p=thirdparty%2Fbinutils-gdb.git

Split out eval_op_concat

This splits BINOP_CONCAT into a new function for future use.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* eval.c (eval_op_concat): New function.
	(evaluate_subexp_standard): Use it.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fa52286b635..72118628e31 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* eval.c (eval_op_concat): New function.
+	(evaluate_subexp_standard): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* eval.c (eval_op_objc_selector): New function.
diff --git a/gdb/eval.c b/gdb/eval.c
index b9437837d9e..3fc4422b9ba 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1309,6 +1309,21 @@ 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.  */
+
+static 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)
+{
+  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);
+  else
+    return value_concat (arg1, arg2);
+}
+
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
 			  struct expression *exp, int *pos,
@@ -2026,12 +2041,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);
-      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);
-      else
-	return value_concat (arg1, arg2);
+      return eval_op_concat (expect_type, exp, noside, op, arg1, arg2);
 
     case BINOP_ASSIGN:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);