From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-55257-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 29126 invoked by alias); 18 Apr 2008 00:42:29 -0000
Received: (qmail 29118 invoked by uid 22791); 18 Apr 2008 00:42:29 -0000
X-Spam-Check-By: sourceware.org
Received: from imr2.ericy.com (HELO imr2.ericy.com) (198.24.6.3)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 18 Apr 2008 00:42:08 +0000
Received: from eusrcmw750.eamcs.ericsson.se (eusrcmw750.exu.ericsson.se [138.85.77.50]) 	by imr2.ericy.com (8.13.1/8.13.1) with ESMTP id m3I0fgKt006052; 	Thu, 17 Apr 2008 19:41:42 -0500
Received: from ecamlmw720.eamcs.ericsson.se ([142.133.1.72]) by eusrcmw750.eamcs.ericsson.se with Microsoft SMTPSVC(6.0.3790.1830); 	 Thu, 17 Apr 2008 19:41:42 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain; 	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Subject: RE: [Patch] Watchpoint condition fix
Date: Fri, 18 Apr 2008 10:10:00 -0000
Message-ID: <6D19CA8D71C89C43A057926FE0D4ADAA04E1BCEC@ecamlmw720.eamcs.ericsson.se>
References: <6D19CA8D71C89C43A057926FE0D4ADAA04E1BCD0@ecamlmw720.eamcs.ericsson.se> <20080416213350.GC3626@adacore.com> <6D19CA8D71C89C43A057926FE0D4ADAA04E1BCE9@ecamlmw720.eamcs.ericsson.se> <20080417205708.GA12735@adacore.com>
From: "Marc Khouzam" <marc.khouzam@ericsson.com>
To: "Joel Brobecker" <brobecker@adacore.com>
Cc: <gdb-patches@sourceware.org>
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2008-04/txt/msg00381.txt.bz2


> Reformat the comment to avoid the '*' at the beginning of each line
> and put the final '*/' at the end of the last line, not on a new line:

Forgot about that.  Eclipse does the comments in its own way.
I fixed it.

I committed the following:

2008-04-17  Marc Khouzam  <marc.khouzam@ericsson.com>

       * breakpoint.c (update_watchpoint): Always reparse
       condition.


Index: gdb/breakpoint.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.309
diff -u -r1.309 breakpoint.c
--- gdb/breakpoint.c    17 Apr 2008 22:43:17 -0000      1.309
+++ gdb/breakpoint.c    18 Apr 2008 00:35:22 -0000
@@ -994,14 +994,13 @@
            value_free (v);
        }
=20
-      if (reparse && b->cond_string !=3D NULL)
+      /* We just regenerated the list of breakpoint locations.
+         The new location does not have its condition field set to anything
+         and therefore, we must always reparse the cond_string, independen=
tly
+         of the value of the reparse flag.  */
+      if (b->cond_string !=3D NULL)
        {
          char *s =3D b->cond_string;
-         if (b->loc->cond)
-           {
-             xfree (b->loc->cond);
-             b->loc->cond =3D NULL;
-           }
          b->loc->cond =3D parse_exp_1 (&s, b->exp_valid_block, 0);
        }
     }