Split out eval_op_equal

This splits BINOP_EQUAL into a new function for future use.

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dfbf126fab7710582f1b698e02a313cb872e225c..d03a24ec6098b3e885036f5431f0639d58509a08 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * eval.c (eval_op_equal): New function.
+       (evaluate_subexp_standard): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * eval.c (eval_op_subscript): New function.

diff --git a/gdb/eval.c b/gdb/eval.c
index 9ac3f39274912d539739b30e6e60bbb662aba6b4..139aeb80eeaca478ad037145f022a9afa8765c59 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1591,6 +1591,29 @@ eval_op_subscript (struct type *expect_type, struct expression *exp,
     }
 }
 
+/* A helper function for BINOP_EQUAL.  */
+
+static struct value *
+eval_op_equal (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
+    {
+      binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
+      int tem = value_equal (arg1, arg2);
+      struct type *type = language_bool_type (exp->language_defn,
+                                             exp->gdbarch);
+      return value_from_longest (type, (LONGEST) tem);
+    }
+}
+
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
                          struct expression *exp, int *pos,
@@ -2402,19 +2425,7 @@ evaluate_subexp_standard (struct type *expect_type,
     case BINOP_EQUAL:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);
       arg2 = evaluate_subexp (value_type (arg1), 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
-       {
-         binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2);
-         tem = value_equal (arg1, arg2);
-         type = language_bool_type (exp->language_defn, exp->gdbarch);
-         return value_from_longest (type, (LONGEST) tem);
-       }
+      return eval_op_equal (expect_type, exp, noside, op, arg1, arg2);
 
     case BINOP_NOTEQUAL:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);