From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24612 invoked by alias); 10 Dec 2010 20:07:11 -0000 Received: (qmail 24596 invoked by uid 22791); 10 Dec 2010 20:07:09 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 10 Dec 2010 20:07:04 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBAK73wU013643 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 10 Dec 2010 15:07:03 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oBAK73UE021078; Fri, 10 Dec 2010 15:07:03 -0500 Received: from opsy.redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBAK72ZF021725; Fri, 10 Dec 2010 15:07:02 -0500 Received: by opsy.redhat.com (Postfix, from userid 500) id 320D8378142; Fri, 10 Dec 2010 13:07:02 -0700 (MST) From: Tom Tromey To: Jan Kratochvil Cc: gdb-patches@sources.redhat.com Subject: Re: RFC: next/finish/etc -vs- exceptions References: <20101210045230.GA29751@host0.dyn.jankratochvil.net> Date: Fri, 10 Dec 2010 20:07:00 -0000 In-Reply-To: <20101210045230.GA29751@host0.dyn.jankratochvil.net> (Jan Kratochvil's message of "Fri, 10 Dec 2010 05:52:30 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-12/txt/msg00145.txt.bz2 >>>>> "Jan" == Jan Kratochvil writes: Jan> The new field `tp->control.exception_resume_breakpoint' should be Jan> probably handled by existing save_infcall_control_state, Jan> restore_infcall_control_state and discard_infcall_control_state Jan> somehow like step_resume_breakpoint is. Thanks for the test case. Here is what I am testing. It just mirrors the existing step_resume_breakpoint code. I think that this is the right thing to do -- stash any exception-related breakpoint while doing the infcall, then restore it if the infcall succeeds. Tom diff --git a/gdb/infrun.c b/gdb/infrun.c index 1bc00a4..f72a18d 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6379,6 +6379,7 @@ save_infcall_control_state (void) 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 @@ restore_infcall_control_state (struct infcall_control_state *inf_status) 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 @@ discard_infcall_control_state (struct infcall_control_state *inf_status) 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); diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.cc b/gdb/testsuite/gdb.cp/nextoverthrow.cc index b25cb34..c3da516 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.cc +++ b/gdb/testsuite/gdb.cp/nextoverthrow.cc @@ -19,8 +19,9 @@ using namespace std; -void dummy () +int dummy () { + return 0; } class NextOverThrowDerivates @@ -89,6 +90,18 @@ public: function1 (val); // until here } + void resumebpt (int val) + { + try + { + throw val; + } + catch (int x) + { + dummy (); + } + } + }; NextOverThrowDerivates next_cases; @@ -198,6 +211,18 @@ int main () testval = val; // End: advance } + // Test of "resumebpt". + try + { + next_cases.resumebpt (10); // Start: resumebpt + next_cases.resumebpt (11); // Second: resumebpt + } + catch (int val) + { + dummy (); + testval = val; // End: resumebpt + } + testval = 32; // done } diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp index 960ea0d..c19674f 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.exp +++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp @@ -149,5 +149,14 @@ gdb_test "advance $line" ".*" "advance-over-throw" 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