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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 56499c9499bd392fb2a767a499e170607fbf5ec2..1afb8fd48b7588d69d37c714bfed5939a02e1441 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-25  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+       * d-exp.y: Remove an obsolete comment and propagate the block
+       information to the produced expression.
+
 2015-10-24  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * tui/tui-data.c (tui_add_to_source_windows): Remove void *

diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index 9e84a47de0fa4b0c5b38575b06ec17d730b4bb52..0481b14d5ffb0ddecc8b59d5d663c593a91b1671 100644 (file)
--- 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);
                    }