Use block_symbol in var_value_operation

[thirdparty/binutils-gdb.git] / gdb / m2-exp.y

diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index b19bbeb3fb258e46d6b70bb0812ba9dc18bd9e2e..f4d4eecda104cdd85cfcbd5ebf930834fc5862df 100644 (file)
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -517,8 +517,8 @@ fblock      :       block COLONCOLON BLOCKNAME
 /* Useful for assigning to PROCEDURE variables */
 variable:      fblock
                        {
-                         pstate->push_new<var_value_operation>
-                           ($1, nullptr);
+                         block_symbol sym { $1, nullptr };
+                         pstate->push_new<var_value_operation> (sym);
                        }
        ;
 
@@ -539,8 +539,7 @@ variable:   block COLONCOLON NAME
                          if (symbol_read_needs_frame (sym.symbol))
                            pstate->block_tracker->update (sym);
 
-                         pstate->push_new<var_value_operation>
-                           (sym.symbol, sym.block);
+                         pstate->push_new<var_value_operation> (sym);
                        }
        ;