Re: RFC: next/finish/etc -vs- exceptions

[Tom Tromey <tromey@redhat.com>]

>>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:

Tom> Here is what I am testing.

Jan> OK.  Included a ChangeLog entry.

Thanks.

I had to modify the test a little to make it pass with gcc svn trunk.
It seems the test was a bit confused about the line number it was on.

Here is what I am checking in.

Tom

2010-12-15  Tom Tromey  <tromey@redhat.com>

	* infrun.c (save_infcall_control_state): Handle the
	exception-resume breakpoint.
	(restore_infcall_control_state): Likewise.
	(discard_infcall_control_state): Likewise.

2010-12-15  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.cp/nextoverthrow.cc (dummy): Return int 0.
	(NextOverThrowDerivates) <resumebpt>: New.
	(resumebpt_test): New.
	(main): Call resumebpt_test.
	* gdb.cp/nextoverthrow.exp: New block for test of "resumebpt".

Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.461
diff -u -r1.461 infrun.c
--- infrun.c	9 Dec 2010 16:09:52 -0000	1.461
+++ infrun.c	15 Dec 2010 21:15:45 -0000
@@ -6379,6 +6379,7 @@
   inf_status->inferior_control = inf->control;
 
   tp->control.step_resume_breakpoint = NULL;
+  tp->control.exception_resume_breakpoint = NULL;
 
   /* Save original bpstat chain to INF_STATUS; replace it in TP with copy of
      chain.  If caller's caller is walking the chain, they'll be happier if we
@@ -6428,6 +6429,10 @@
   if (tp->control.step_resume_breakpoint)
     tp->control.step_resume_breakpoint->disposition = disp_del_at_next_stop;
 
+  if (tp->control.exception_resume_breakpoint)
+    tp->control.exception_resume_breakpoint->disposition
+      = disp_del_at_next_stop;
+
   /* Handle the bpstat_copy of the chain.  */
   bpstat_clear (&tp->control.stop_bpstat);
 
@@ -6476,6 +6481,10 @@
     inf_status->thread_control.step_resume_breakpoint->disposition
       = disp_del_at_next_stop;
 
+  if (inf_status->thread_control.exception_resume_breakpoint)
+    inf_status->thread_control.exception_resume_breakpoint->disposition
+      = disp_del_at_next_stop;
+
   /* See save_infcall_control_state for info on stop_bpstat. */
   bpstat_clear (&inf_status->thread_control.stop_bpstat);
 
Index: testsuite/gdb.cp/nextoverthrow.cc
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/nextoverthrow.cc,v
retrieving revision 1.1
diff -u -r1.1 nextoverthrow.cc
--- testsuite/gdb.cp/nextoverthrow.cc	9 Dec 2010 16:09:53 -0000	1.1
+++ testsuite/gdb.cp/nextoverthrow.cc	15 Dec 2010 21:15:47 -0000
@@ -19,8 +19,9 @@
 
 using namespace std;
 
-void dummy ()
+int dummy ()
 {
+  return 0;
 }
 
 class NextOverThrowDerivates
@@ -89,10 +90,39 @@
     function1 (val);		// until here
   }
 
+  void resumebpt (int val)
+  {
+    try
+      {
+	throw val;
+      }
+    catch (int x)
+      {
+	dummy ();
+      }
+  }
+
 };
 NextOverThrowDerivates next_cases;
 
 
+int
+resumebpt_test (int x)
+{
+  try
+    {
+      next_cases.resumebpt (x);	    // Start: resumebpt
+      next_cases.resumebpt (x + 1); // Second: resumebpt
+    }
+  catch (int val)
+    {
+      dummy ();
+      x = val;
+    }
+
+  return x;
+}
+
 int main () 
 { 
   int testval = -1;
@@ -198,6 +228,8 @@
       testval = val;		// End: advance
     }
 
+  // Test of "resumebpt".
+  testval = resumebpt_test (10);
+
   testval = 32;			// done
 }
-
Index: testsuite/gdb.cp/nextoverthrow.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/nextoverthrow.exp,v
retrieving revision 1.1
diff -u -r1.1 nextoverthrow.exp
--- testsuite/gdb.cp/nextoverthrow.exp	9 Dec 2010 16:09:53 -0000	1.1
+++ testsuite/gdb.cp/nextoverthrow.exp	15 Dec 2010 21:15:47 -0000
@@ -149,5 +149,14 @@
 tbreak_and_cont "End: advance"
 verify_testval "pre-check - advance" 8
 
+tbreak_and_cont "Start: resumebpt"
+gdb_test "tbreak _Unwind_RaiseException"
+gdb_test "continue" "Temporary breakpoint.*" "continuing to _Unwind_RaiseException"
+gdb_test "finish" "Run till exit .*"
+gdb_test {set $retpc=$pc}
+gdb_test {break *$retpc if dummy ()}
+tbreak_and_cont "Second: resumebpt"
+gdb_test "next"
+
 tbreak_and_cont "done"
-verify_testval "post-check - advance" 9
+verify_testval "post-check - advance" 10