diff options
Diffstat (limited to 'gdb/parse.c')
| -rw-r--r-- | gdb/parse.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/gdb/parse.c b/gdb/parse.c index bbe5cf1..221733a 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -344,26 +344,31 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc, if (tracker == nullptr) tracker = &local_tracker; - /* If no context specified, try using the current frame, if any. */ - if (!expression_context_block) - expression_context_block = get_selected_block (&expression_context_pc); - else if (pc == 0) - expression_context_pc = expression_context_block->entry_pc (); - else - expression_context_pc = pc; + if ((flags & PARSER_LEAVE_BLOCK_ALONE) == 0) + { + /* If no context specified, try using the current frame, if any. */ + if (!expression_context_block) + expression_context_block + = get_selected_block (&expression_context_pc); + else if (pc == 0) + expression_context_pc = expression_context_block->entry_pc (); + else + expression_context_pc = pc; - /* Fall back to using the current source static context, if any. */ + /* Fall back to using the current source static context, if any. */ - if (!expression_context_block) - { - struct symtab_and_line cursal = get_current_source_symtab_and_line (); + if (!expression_context_block) + { + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); - if (cursal.symtab) - expression_context_block - = cursal.symtab->compunit ()->blockvector ()->static_block (); + if (cursal.symtab) + expression_context_block + = cursal.symtab->compunit ()->blockvector ()->static_block (); - if (expression_context_block) - expression_context_pc = expression_context_block->entry_pc (); + if (expression_context_block) + expression_context_pc = expression_context_block->entry_pc (); + } } if (language_mode == language_mode_auto && block != NULL) |