Pass a frame to value_at_lazy and value_from_contents_and_address

This patch adds a 'frame' parameter to value_at_lazy and ensures that
it is passed down to the call to resolve_dynamic_type.  This required
also adding a frame parameter to value_from_contents_and_address.

Nothing passes this parameter to value_at_lazy yet, so this patch
should have no visible effect.

diff --git a/gdb/valops.c b/gdb/valops.c
index 02747543a53c406950dfc2ad68d12532817413a4..d002c9dca9b1b4aa9caa53262c0dff4c47c49648 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -980,14 +980,15 @@ value_one (struct type *type)
    e.g. in case the type is a variable length array.  */
 
 static struct value *
-get_value_at (struct type *type, CORE_ADDR addr, int lazy)
+get_value_at (struct type *type, CORE_ADDR addr, frame_info_ptr frame,
+             int lazy)
 {
   struct value *val;
 
   if (check_typedef (type)->code () == TYPE_CODE_VOID)
     error (_("Attempt to dereference a generic pointer."));
 
-  val = value_from_contents_and_address (type, NULL, addr);
+  val = value_from_contents_and_address (type, NULL, addr, frame);
 
   if (!lazy)
     val->fetch_lazy ();
@@ -1013,7 +1014,7 @@ get_value_at (struct type *type, CORE_ADDR addr, int lazy)
 struct value *
 value_at (struct type *type, CORE_ADDR addr)
 {
-  return get_value_at (type, addr, 0);
+  return get_value_at (type, addr, nullptr, 0);
 }
 
 /* See value.h.  */
@@ -1032,9 +1033,9 @@ value_at_non_lval (struct type *type, CORE_ADDR addr)
    e.g. in case the type is a variable length array.  */
 
 struct value *
-value_at_lazy (struct type *type, CORE_ADDR addr)
+value_at_lazy (struct type *type, CORE_ADDR addr, frame_info_ptr frame)
 {
-  return get_value_at (type, addr, 1);
+  return get_value_at (type, addr, frame, 1);
 }
 
 void

diff --git a/gdb/value.c b/gdb/value.c
index 7cb15ff54dbd53cacec77d63ec2152fad97ca46f..757f92572aaad12e5f40c24384857cb30be0172c 100644 (file)
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -3543,12 +3543,14 @@ value_from_contents_and_address_unresolved (struct type *type,
 struct value *
 value_from_contents_and_address (struct type *type,
                                 const gdb_byte *valaddr,
-                                CORE_ADDR address)
+                                CORE_ADDR address,
+                                frame_info_ptr frame)
 {
   gdb::array_view<const gdb_byte> view;
   if (valaddr != nullptr)
     view = gdb::make_array_view (valaddr, type->length ());
-  struct type *resolved_type = resolve_dynamic_type (type, view, address);
+  struct type *resolved_type = resolve_dynamic_type (type, view, address,
+                                                    &frame);
   struct type *resolved_type_no_typedef = check_typedef (resolved_type);
   struct value *v;
 

diff --git a/gdb/value.h b/gdb/value.h
index 1b4eff22f37c6950407023c7e49a5844a9b94450..e13f92c397bd25159cf8d00d5b47efdea9c9d4f4 100644 (file)
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -1084,7 +1084,13 @@ extern struct value *value_from_component (struct value *, struct type *,
 extern struct value *value_from_mpz (struct type *type, const gdb_mpz &v);
 
 extern struct value *value_at (struct type *type, CORE_ADDR addr);
-extern struct value *value_at_lazy (struct type *type, CORE_ADDR addr);
+
+/* Return a new value given a type and an address.  The new value is
+   lazy.  If FRAME is given, it is used when resolving dynamic
+   properties.  */
+
+extern struct value *value_at_lazy (struct type *type, CORE_ADDR addr,
+                                   frame_info_ptr frame = nullptr);
 
 /* Like value_at, but ensures that the result is marked not_lval.
    This can be important if the memory is "volatile".  */
@@ -1092,9 +1098,9 @@ extern struct value *value_at_non_lval (struct type *type, CORE_ADDR addr);
 
 extern struct value *value_from_contents_and_address_unresolved
      (struct type *, const gdb_byte *, CORE_ADDR);
-extern struct value *value_from_contents_and_address (struct type *,
-                                                     const gdb_byte *,
-                                                     CORE_ADDR);
+extern struct value *value_from_contents_and_address
+     (struct type *, const gdb_byte *, CORE_ADDR,
+      frame_info_ptr frame = nullptr);
 extern struct value *value_from_contents (struct type *, const gdb_byte *);
 
 extern struct value *default_value_from_register (struct gdbarch *gdbarch,