From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6145 invoked by alias); 17 Dec 2007 11:35:36 -0000 Received: (qmail 6135 invoked by uid 22791); 17 Dec 2007 11:35:36 -0000 X-Spam-Check-By: sourceware.org Received: from igw3.br.ibm.com (HELO igw3.br.ibm.com) (32.104.18.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 17 Dec 2007 11:35:28 +0000 Received: from mailhub3.br.ibm.com (unknown [9.18.232.110]) by igw3.br.ibm.com (Postfix) with ESMTP id 40A58390020 for ; Mon, 17 Dec 2007 09:28:50 -0200 (BRDT) Received: from d24av02.br.ibm.com (d24av02.br.ibm.com [9.18.232.47]) by mailhub3.br.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id lBHBZO5p4251652 for ; Mon, 17 Dec 2007 09:35:25 -0200 Received: from d24av02.br.ibm.com (loopback [127.0.0.1]) by d24av02.br.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id lBHBZOuI017413 for ; Mon, 17 Dec 2007 09:35:24 -0200 Received: from [9.8.1.101] ([9.8.1.101]) by d24av02.br.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id lBHBZN2p017395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 17 Dec 2007 09:35:24 -0200 Subject: Re: [PATCH] Watchpoints + conditionals problem From: Luis Machado Reply-To: luisgpm@linux.vnet.ibm.com To: Daniel Jacobowitz Cc: gdb-patches@sourceware.org In-Reply-To: <20071216214500.GD2618@caradoc.them.org> References: <1196272755.15925.11.camel@gargoyle> <20071216214500.GD2618@caradoc.them.org> Content-Type: multipart/mixed; boundary="=-h9z+Md6dh3+B8AMLsNkC" Date: Mon, 17 Dec 2007 12:36:00 -0000 Message-Id: <1197891325.24027.5.camel@gargoyle> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 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: 2007-12/txt/msg00265.txt.bz2 --=-h9z+Md6dh3+B8AMLsNkC Content-Type: text/plain Content-Transfer-Encoding: 7bit Content-length: 119 > Seems OK to me. I've checked this in now. Regards, -- Luis Machado Software Engineer IBM Linux Technology Center --=-h9z+Md6dh3+B8AMLsNkC Content-Disposition: attachment; filename=watch_condition_fix.diff Content-Type: text/x-patch; name=watch_condition_fix.diff; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 713 2007-12-17 Luis Machado * breakpoint.c (bpstat_stop_status): Check an additional condition before evaluating an expression value. Index: gdb/breakpoint.c =================================================================== --- gdb.orig/breakpoint.c 2007-12-17 03:18:27.000000000 -0800 +++ gdb/breakpoint.c 2007-12-17 03:18:50.000000000 -0800 @@ -2823,7 +2823,7 @@ if (b->type == bp_watchpoint_scope) b->related_breakpoint->watchpoint_triggered = watch_triggered_yes; - if (bl->cond) + if (bl->cond && bl->owner->disposition != disp_del_at_next_stop) { /* Need to select the frame, with all that implies so that the conditions will have the right context. */ --=-h9z+Md6dh3+B8AMLsNkC--