gdb: remove VALUE_NEXT_FRAME_ID, add value::next_frame_id

[thirdparty/binutils-gdb.git] / gdb / valops.c

diff --git a/gdb/valops.c b/gdb/valops.c
index 049314cf7db5d6679bd6e3ddbfa595971321f49a..5a5b3f14ad44f354134c7bacd9e20dc882151b39 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1193,7 +1193,7 @@ value_assign (struct value *toval, struct value *fromval)
 
     case lval_register:
       {
-       frame_info_ptr next_frame = frame_find_by_id (VALUE_NEXT_FRAME_ID (toval));
+       frame_info_ptr next_frame = frame_find_by_id (toval->next_frame_id ());
 
        int value_reg = VALUE_REGNUM (toval);
 
@@ -1410,11 +1410,10 @@ address_of_variable (struct symbol *var, const struct block *b)
     {
     case lval_register:
       {
-       frame_info_ptr frame;
        const char *regname;
 
-       frame = frame_find_by_id (VALUE_NEXT_FRAME_ID (val));
-       gdb_assert (frame);
+       frame_info_ptr frame = frame_find_by_id (val->next_frame_id ());
+       gdb_assert (frame != nullptr);
 
        regname = gdbarch_register_name (get_frame_arch (frame),
                                         VALUE_REGNUM (val));