gdb/

	PR backtrace/13716
	* infcmd.c (finish_forward): New variable frame_id, initialize it, use
	it after set_momentary_breakpoint.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f0e350f4478386f634951930f6bd5638475fe4c..3ce3c12eb499bf00ad85f3f17fe25b5103987958 100644 (file)
--- 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 7d929dfa1f334f86bc33c2f4f01b8b421644fff5..8dfa4fdf9445d3945044479a1d62541b19b26702 100644 (file)
--- 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...  */