From 2d5a88dc5005a4f4b0584d02719e479645409e92 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Sun, 25 Oct 2015 09:17:24 +0100 Subject: [PATCH] Re-apply change for handling non-local references in nested functions. gdb/ChangeLog: * d-exp.y: Remove an obsolete comment and propagate the block information to the produced expression. --- gdb/ChangeLog | 5 +++++ gdb/d-exp.y | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 56499c9499..1afb8fd48b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-10-25 Iain Buclaw + + * d-exp.y: Remove an obsolete comment and propagate the block + information to the produced expression. + 2015-10-24 Simon Marchi * tui/tui-data.c (tui_add_to_source_windows): Remove void * diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 9e84a47de0..0481b14d5f 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -487,9 +487,7 @@ PrimaryExpression: } write_exp_elt_opcode (pstate, OP_VAR_VALUE); - /* We want to use the selected frame, not another more inner frame - which happens to be in the same block. */ - write_exp_elt_block (pstate, NULL); + write_exp_elt_block (pstate, sym.block); write_exp_elt_sym (pstate, sym.symbol); write_exp_elt_opcode (pstate, OP_VAR_VALUE); }