From b5cc3923def975c28d44421a11bac671ede5b92c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Mon, 8 Mar 2021 07:27:57 -0700
Subject: [PATCH] Introduce var_entry_value_operation

This adds class var_entry_value_operation, which implements
OP_VAR_ENTRY_VALUE.

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

	* expop.h (class var_entry_value_operation): New.
	* eval.c (eval_op_var_entry_value): No longer static.
---
 gdb/ChangeLog |  5 +++++
 gdb/eval.c    |  2 +-
 gdb/expop.h   | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 129a2383da8..f35cb4babab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* expop.h (class var_entry_value_operation): New.
+	* eval.c (eval_op_var_entry_value): No longer static.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* expression.h (class operation) <set_outermost>: New method.
diff --git a/gdb/eval.c b/gdb/eval.c
index 85e67f3fb93..7645291a801 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1201,7 +1201,7 @@ eval_op_scope (struct type *expect_type, struct expression *exp,
 
 /* Helper function that implements the body of OP_VAR_ENTRY_VALUE.  */
 
-static struct value *
+struct value *
 eval_op_var_entry_value (struct type *expect_type, struct expression *exp,
 			 enum noside noside, symbol *sym)
 {
diff --git a/gdb/expop.h b/gdb/expop.h
index 345cac29976..033ea0b1f0c 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -51,6 +51,9 @@ extern struct value *eval_op_var_msym_value (struct type *expect_type,
 					     bool outermost_p,
 					     minimal_symbol *msymbol,
 					     struct objfile *objfile);
+extern struct value *eval_op_var_entry_value (struct type *expect_type,
+					      struct expression *exp,
+					      enum noside noside, symbol *sym);
 
 namespace expr
 {
@@ -533,6 +536,25 @@ protected:
     override;
 };
 
+class var_entry_value_operation
+  : public tuple_holding_operation<symbol *>
+{
+public:
+
+  using tuple_holding_operation::tuple_holding_operation;
+
+  value *evaluate (struct type *expect_type,
+		   struct expression *exp,
+		   enum noside noside) override
+  {
+    return eval_op_var_entry_value (expect_type, exp, noside,
+				    std::get<0> (m_storage));
+  }
+
+  enum exp_opcode opcode () const override
+  { return OP_VAR_ENTRY_VALUE; }
+};
+
 } /* namespace expr */
 
 #endif /* EXPOP_H */
-- 
2.30.2