aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2015-03-30 16:39:56 +0100
committerPedro Alves <palves@redhat.com>2015-04-01 15:35:38 +0100
commit6b403daae993621542c249c00ca1e6d3cfef1aa4 (patch)
tree02d4f353b0972a35e4ba80ddae77cae75ad26c1d
parenta14711808ece04167523a42f063ddb741e8ca866 (diff)
downloadgdb-6b403daae993621542c249c00ca1e6d3cfef1aa4.zip
gdb-6b403daae993621542c249c00ca1e6d3cfef1aa4.tar.gz
gdb-6b403daae993621542c249c00ca1e6d3cfef1aa4.tar.bz2
infrun.c:resume: currently_stepping after clearing stepped_breakpoint
My all-stop-on-top-of-non-stop series manages to shows regressions due to this latent bug. currently_stepping returns true if stepped_breakpoint is set. Obviously we should clear it before checking currently_stepping, not after. Tested on x86_64 Fedora 20. gdb/ChangeLog: 2015-04-01 Pedro Alves <palves@redhat.com> * infrun.c (resume): Check currently_stepping after clearing stepped_breakpoint, not before.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f9cc43..b85b437 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2015-04-01 Pedro Alves <palves@redhat.com>
+ * infrun.c (resume): Check currently_stepping after clearing
+ stepped_breakpoint, not before.
+
+2015-04-01 Pedro Alves <palves@redhat.com>
+
* infrun.c (print_target_wait_results): Print all the ptid
elements.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4b38fce..f5faa0a 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2084,12 +2084,15 @@ resume (enum gdb_signal sig)
This can decay from a step to a continue, if e.g., we need to
implement single-stepping with breakpoints (software
single-step). */
- int step = currently_stepping (tp);
+ int step;
tp->stepped_breakpoint = 0;
QUIT;
+ /* Depends on stepped_breakpoint. */
+ step = currently_stepping (tp);
+
if (current_inferior ()->waiting_for_vfork_done)
{
/* Don't try to single-step a vfork parent that is waiting for