From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25528 invoked by alias); 5 Mar 2008 17:36:16 -0000 Received: (qmail 25519 invoked by uid 22791); 5 Mar 2008 17:36:15 -0000 X-Spam-Check-By: sourceware.org Received: from qnxmail.qnx.com (HELO qnxmail.qnx.com) (209.226.137.76) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 05 Mar 2008 17:35:57 +0000 Received: from smtp.ott.qnx.com (smtp.ott.qnx.com [10.42.96.5]) by hub.ott.qnx.com (8.9.3/8.9.3) with ESMTP id MAA02227 for ; Wed, 5 Mar 2008 12:18:12 -0500 Received: from [10.42.100.129] (dhcp-100-129 [10.42.100.129]) by smtp.ott.qnx.com (8.8.8/8.6.12) with ESMTP id MAA18208 for ; Wed, 5 Mar 2008 12:35:55 -0500 Message-ID: <47CED9FB.7090904@qnx.com> Date: Wed, 05 Mar 2008 17:36:00 -0000 From: Aleksandar Ristovski User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: [patch] fix for PR2424 Content-Type: multipart/mixed; boundary="------------040205080804060807070800" X-IsSubscribed: yes 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: 2008-03/txt/msg00035.txt.bz2 This is a multi-part message in MIME format. --------------040205080804060807070800 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 518 Hello, With the attached patch for testsuite and the patch itself, the PR should be fixed. Thanks, Aleksandar Ristovski QNX Software Systems Testsuite: 2008-03-05 Aleksandar Ristovski * gdb.mi/mi-support.exp: Add "reason" to the matching pattern. This is to support fix for PR2424. infrun.c: 2008-03-05 Aleksandar Ristovski * infrun.c (normal_stop) Move breakpoint_auto_delete further down to allow printing to 'see' real reason of stop. This fixes PR 2424. --------------040205080804060807070800 Content-Type: text/plain; name="mi-support.exp.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="mi-support.exp.diff" Content-length: 645 Index: gdb/testsuite/lib/mi-support.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v retrieving revision 1.51 diff -r1.51 mi-support.exp 893c893 < -re ".*000\\*stopped,thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" { --- > -re ".*000\\*stopped,reason=.*thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" { --------------040205080804060807070800 Content-Type: text/plain; name="infrun.c.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="infrun.c.diff" Content-length: 1007 Index: gdb/infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.266 diff -u -p -r1.266 infrun.c --- gdb/infrun.c 29 Jan 2008 22:47:19 -0000 1.266 +++ gdb/infrun.c 5 Mar 2008 16:08:02 -0000 @@ -3151,11 +3151,6 @@ Further execution is probably impossible } } - /* Delete the breakpoint we stopped at, if it wants to be deleted. - Delete any breakpoint that is to be deleted at the next stop. */ - - breakpoint_auto_delete (stop_bpstat); - /* If an auto-display called a function and that got a signal, delete that auto-display to avoid an infinite recursion. */ @@ -3292,6 +3287,9 @@ Further execution is probably impossible } done: + /* Delete the breakpoint we stopped at, if it wants to be deleted. + Delete any breakpoint that is to be deleted at the next stop. */ + breakpoint_auto_delete (stop_bpstat); annotate_stopped (); observer_notify_normal_stop (stop_bpstat); } --------------040205080804060807070800--