diff options
Diffstat (limited to 'gdb/guile')
| -rw-r--r-- | gdb/guile/scm-frame.c | 9 | ||||
| -rw-r--r-- | gdb/guile/scm-symbol.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index 64ac0c0..de77c21 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -855,6 +855,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) SCM block_scm = SCM_UNDEFINED; struct frame_info *frame = NULL; struct symbol *var = NULL; + const struct block *block = NULL; struct value *value = NULL; f_smob = frscm_get_frame_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); @@ -909,9 +910,13 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) TRY { + struct block_symbol lookup_sym; + if (block == NULL) block = get_frame_block (frame, NULL); - var = lookup_symbol (var_name, block, VAR_DOMAIN, NULL).symbol; + lookup_sym = lookup_symbol (var_name, block, VAR_DOMAIN, NULL); + var = lookup_sym.symbol; + block = lookup_sym.block; } CATCH (ex, RETURN_MASK_ALL) { @@ -940,7 +945,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) TRY { - value = read_var_value (var, frame); + value = read_var_value (var, block, frame); } CATCH (except, RETURN_MASK_ALL) { diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index 01c9eb1..0970a72 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -550,7 +550,11 @@ gdbscm_symbol_value (SCM self, SCM rest) if (symbol_read_needs_frame (symbol) && frame_info == NULL) error (_("Symbol requires a frame to compute its value")); - value = read_var_value (symbol, frame_info); + /* TODO: currently, we have no way to recover the block in which SYMBOL + was found, so we have no block to pass to read_var_value. This will + yield an incorrect value when symbol is not local to FRAME_INFO (this + can happen with nested functions). */ + value = read_var_value (symbol, NULL, frame_info); } CATCH (except, RETURN_MASK_ALL) { |