From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30078 invoked by alias); 30 Jul 2013 16:55:31 -0000 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 Received: (qmail 30068 invoked by uid 89); 30 Jul 2013 16:55:30 -0000 X-Spam-SWARE-Status: No, score=0.6 required=5.0 tests=AWL,BAYES_50,KAM_STOCKTIP,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RDNS_NONE autolearn=no version=3.3.1 Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 30 Jul 2013 16:55:29 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1V4DCj-0007Hp-Uz from Ali_Anwar@mentor.com for gdb-patches@sourceware.org; Tue, 30 Jul 2013 09:55:21 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Tue, 30 Jul 2013 09:55:21 -0700 Received: from [137.202.157.39] (147.34.91.1) by mail-na.mentorg.com (147.34.97.43) with Microsoft SMTP Server (TLS) id 14.2.247.3; Tue, 30 Jul 2013 09:55:20 -0700 Message-ID: <51F7EFF1.6030609@codesourcery.com> Date: Tue, 30 Jul 2013 16:55:00 -0000 From: ali_anwar User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: Subject: [PATCH] Fix for PR15117 Content-Type: multipart/mixed; boundary="------------070702060202040305040101" X-Virus-Found: No X-SW-Source: 2013-07/txt/msg00780.txt.bz2 --------------070702060202040305040101 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Content-length: 128 Hi, Attached patch fixes PR15117. I did regression testing be executing gdb.base/* tests. Kindly review it. Regards, -Ali --------------070702060202040305040101 Content-Type: text/x-patch; name="PR15117.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="PR15117.patch" Content-length: 2705 Index: gdb/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/ChangeLog,v retrieving revision 1.15798 diff -u -r1.15798 ChangeLog --- gdb/ChangeLog 15 Jul 2013 11:14:32 -0000 1.15798 +++ gdb/ChangeLog 30 Jul 2013 16:35:10 -0000 @@ -1,3 +1,9 @@ +2013-07-30 Ali Anwar + + PR breakpoints/15117 + * linespec.c (linespec_parse_basic): Check for convenience + variable or history value while parsing. + 2013-07-15 Ali Anwar PR threads/13217 Index: gdb/linespec.c =================================================================== RCS file: /cvs/src/src/gdb/linespec.c,v retrieving revision 1.185 diff -u -r1.185 linespec.c --- gdb/linespec.c 30 May 2013 16:57:38 -0000 1.185 +++ gdb/linespec.c 30 Jul 2013 16:33:43 -0000 @@ -1660,6 +1660,17 @@ symbols = NULL; discard_cleanups (cleanup); } + else if (token.type == LSTOKEN_STRING && *LS_TOKEN_STOKEN (token).ptr == '$') + { + char *var; + + /* User specified a convenience variable or history value. */ + var = copy_token_string (token); + cleanup = make_cleanup (xfree, var); + PARSER_RESULT (parser)->line_offset + = linespec_parse_variable (PARSER_STATE (parser), var); + do_cleanups (cleanup); + } else { /* The name is also not a label. Abort parsing. Do not throw Index: gdb/testsuite/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v retrieving revision 1.3727 diff -u -r1.3727 ChangeLog --- gdb/testsuite/ChangeLog 10 Jul 2013 00:10:36 -0000 1.3727 +++ gdb/testsuite/ChangeLog 30 Jul 2013 16:29:01 -0000 @@ -1,3 +1,7 @@ +2013-07-30 Ali Anwar + + * gdb.base/break.exp: Test break via convenience variable. + 2013-07-09 Joel Brobecker Index: gdb/testsuite/gdb.base/break.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/break.exp,v retrieving revision 1.58 diff -u -r1.58 break.exp --- gdb/testsuite/gdb.base/break.exp 7 Jun 2013 17:31:07 -0000 1.58 +++ gdb/testsuite/gdb.base/break.exp 30 Jul 2013 16:29:01 -0000 @@ -957,6 +957,18 @@ } } +# +# test break via convenience variable +# +send_gdb "set \$l = 92\n" +gdb_expect { + -re ".*$gdb_prompt $" { pass "Set convenience variable" } + timeout { fail "Set convenience variable (timeout)" } +} + +gdb_test "break $srcfile:\$l" \ + "Breakpoint.*at.* file .*$srcfile, line 92." \ + "breakpoint convenience variable" # Reset the default arguments for VxWorks if [istarget "*-*-vxworks*"] { --------------070702060202040305040101--