summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/infcmd.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f0e350f447..3ce3c12eb49 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-23 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ PR backtrace/13716
+ * infcmd.c (finish_forward): New variable frame_id, initialize it, use
+ it after set_momentary_breakpoint.
+
2012-02-22 Sterling Augustine <saugustine@google.com>
PR 13689:
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 7d929dfa1f3..8dfa4fdf944 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1636,6 +1636,7 @@ finish_backward (struct symbol *function)
static void
finish_forward (struct symbol *function, struct frame_info *frame)
{
+ struct frame_id frame_id = get_frame_id (frame);
struct gdbarch *gdbarch = get_frame_arch (frame);
struct symtab_and_line sal;
struct thread_info *tp = inferior_thread ();
@@ -1653,7 +1654,7 @@ finish_forward (struct symbol *function, struct frame_info *frame)
old_chain = make_cleanup_delete_breakpoint (breakpoint);
- set_longjmp_breakpoint (tp, get_frame_id (frame));
+ set_longjmp_breakpoint (tp, frame_id);
make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
/* We want stop_registers, please... */