Have parser reset the innermost block tracker

[external/binutils.git] / gdb / varobj.c

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 3715bb6..b2975be 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -309,13 +309,13 @@ varobj_create (const char *objname,
        }
 
       p = expression;
-      innermost_block.reset (INNERMOST_BLOCK_FOR_SYMBOLS
-                            | INNERMOST_BLOCK_FOR_REGISTERS);
       /* Wrap the call to parse expression, so we can 
          return a sensible error.  */
       TRY
        {
-         var->root->exp = parse_exp_1 (&p, pc, block, 0);
+         var->root->exp = parse_exp_1 (&p, pc, block, 0,
+                                       INNERMOST_BLOCK_FOR_SYMBOLS
+                                       | INNERMOST_BLOCK_FOR_REGISTERS);
        }
 
       CATCH (except, RETURN_MASK_ERROR)