From: Tom Tromey <tom@tromey.com>
Date: Mon, 8 Mar 2021 14:27:57 +0000 (-0700)
Subject: Split out eval_op_f_allocated
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9cbd1c2011286ac8982f9d606390d3359f78f9c8;p=deliverable%2Fbinutils-gdb.git

Split out eval_op_f_allocated

This splits out a helper function, eval_op_f_allocated, that will be
used in a later patch.

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

	* f-lang.c (eval_op_f_allocated): New function.
	(evaluate_subexp_f): Use it.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6450bbe05f..e72feb8add 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* f-lang.c (eval_op_f_allocated): New function.
+	(evaluate_subexp_f): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* f-lang.c (fortran_require_array): New function.
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 0ee2806f1a..1fb4e630bc 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1175,6 +1175,22 @@ eval_op_f_kind (struct type *expect_type, struct expression *exp,
 			     TYPE_LENGTH (TYPE_TARGET_TYPE (type)));
 }
 
+/* A helper function for UNOP_FORTRAN_ALLOCATED.  */
+
+static struct value *
+eval_op_f_allocated (struct type *expect_type, struct expression *exp,
+		     enum noside noside, enum exp_opcode op,
+		     struct value *arg1)
+{
+  struct type *type = check_typedef (value_type (arg1));
+  if (type->code () != TYPE_CODE_ARRAY)
+    error (_("ALLOCATED can only be applied to arrays"));
+  struct type *result_type
+    = builtin_f_type (exp->gdbarch)->builtin_logical;
+  LONGEST result_value = type_not_allocated (type) ? 0 : 1;
+  return value_from_longest (result_type, result_value);
+}
+
 /* Special expression evaluation cases for Fortran.  */
 
 static struct value *
@@ -1218,13 +1234,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
 	arg1 = evaluate_subexp (nullptr, exp, pos, noside);
 	if (noside == EVAL_SKIP)
 	  return eval_skip_value (exp);
-	type = check_typedef (value_type (arg1));
-	if (type->code () != TYPE_CODE_ARRAY)
-	  error (_("ALLOCATED can only be applied to arrays"));
-	struct type *result_type
-	  = builtin_f_type (exp->gdbarch)->builtin_logical;
-	LONGEST result_value = type_not_allocated (type) ? 0 : 1;
-	return value_from_longest (result_type, result_value);
+	return eval_op_f_allocated (expect_type, exp, noside, op, arg1);
       }
 
     case BINOP_FORTRAN_MODULO: