diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2009-11-13 22:05:06 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2009-11-13 22:05:06 +0000 |
| commit | a937f8f036e385944af9538b4eeac00a2054670d (patch) | |
| tree | 39b9bee2c46656949fb2cc1d177163ea08878a1c /gdb/breakpoint.c | |
| parent | 25d78cec2f0c0d43e28f52737cc21be68e2f4387 (diff) | |
| download | gdb-a937f8f036e385944af9538b4eeac00a2054670d.tar.gz | |
2009-11-13 Maciej W. Rozycki <macro@codesourcery.com>
* breakpoint.c (update_watchpoint): Only fiddle with frames for
local watchpoints.
Diffstat (limited to 'gdb/breakpoint.c')
| -rw-r--r-- | gdb/breakpoint.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 757c76d424d..cadc5364596 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1000,6 +1000,7 @@ update_watchpoint (struct breakpoint *b, int reparse) int within_current_scope; struct frame_id saved_frame_id; struct bp_location *loc; + int frame_saved; bpstat bs; struct program_space *frame_pspace; @@ -1011,12 +1012,7 @@ update_watchpoint (struct breakpoint *b, int reparse) if (b->disposition == disp_del_at_next_stop) return; - /* Save the current frame's ID so we can restore it after - evaluating the watchpoint expression on its own frame. */ - /* FIXME drow/2003-09-09: It would be nice if evaluate_expression - took a frame parameter, so that we didn't have to change the - selected frame. */ - saved_frame_id = get_frame_id (get_selected_frame (NULL)); + frame_saved = 0; /* Determine if the watchpoint is within scope. */ if (b->exp_valid_block == NULL) @@ -1024,6 +1020,15 @@ update_watchpoint (struct breakpoint *b, int reparse) else { struct frame_info *fi; + + /* Save the current frame's ID so we can restore it after + evaluating the watchpoint expression on its own frame. */ + /* FIXME drow/2003-09-09: It would be nice if evaluate_expression + took a frame parameter, so that we didn't have to change the + selected frame. */ + frame_saved = 1; + saved_frame_id = get_frame_id (get_selected_frame (NULL)); + fi = frame_find_by_id (b->watchpoint_frame); within_current_scope = (fi != NULL); if (within_current_scope) @@ -1169,7 +1174,8 @@ in which its expression is valid.\n"), } /* Restore the selected frame. */ - select_frame (frame_find_by_id (saved_frame_id)); + if (frame_saved) + select_frame (frame_find_by_id (saved_frame_id)); } |