From: Michael Snyder <msnyder@vmware.com>
Date: Tue, 10 Jun 2008 18:08:10 +0000 (+0000)
Subject: 2007-04-18  Daniel Jacobowitz  <dan@codesourcery.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f615c4d9dc098894c3fea016d8b1c25823ed8c75;p=thirdparty%2Fbinutils-gdb.git

2007-04-18  Daniel Jacobowitz  <dan@codesourcery.com>

	* infcmd.c (finish_backwards): Correct check for whether to back
	up after finishing.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8a9b31ae3c4..ab9a2c66485 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -36,6 +36,9 @@
 
 2007-04-18  Daniel Jacobowitz  <dan@codesourcery.com>
 
+	* infcmd.c (finish_backwards): Correct check for whether to back
+	up after finishing.
+
 	* arm-tdep.c (arm_scan_epilogue): New.
 	(arm_make_prologue_cache): Use it.
 	(arm_epilogue_unwind_sniffer): New.
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 9fcf8ceebaf..e223829199c 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1491,8 +1491,8 @@ finish_backwards (struct symbol *function)
       old_chain = make_cleanup_delete_breakpoint (breakpoint);
       proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0);
       /* We will be stopped when proceed returns.  */
-      do_cleanups (old_chain);
       back_up = bpstat_find_breakpoint (stop_bpstat, breakpoint) != NULL;
+      do_cleanups (old_chain);
     }
   else
     back_up = 1;