Fix a dangling cleanup in linspec_parse_basic.

2014-05-05  Keith Seitz  <keiths@redhat.com>

	* linespec.c (linespec_parse_basic): Run cleanups if a convenience
	variable or history value is successfully parsed.

2014-05-05  Keith Seitz  <keiths@redhat.com>

	* gdb.linespec/ls-dollar.exp: Add test for linespec
	file:convenience_variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc8b44a59ff114ad4e39787735e052cc255ee247..e38a86a2fa94186e9c622f6c1000580efe009dc9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-05  Keith Seitz  <keiths@redhat.com>
+
+       * linespec.c (linespec_parse_basic): Run cleanups if a convenience
+       variable or history value is successfully parsed.
+
 2014-05-05  Yao Qi  <yao@codesourcery.com>
            Pedro Alves  <palves@redhat.com>
 

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 610809d44a099ce5255c203fe66f96628307e368..cb76b9c17284b0c11cc4ffc8b825b7228f6921a5 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1665,6 +1665,10 @@ linespec_parse_basic (linespec_parser *parser)
              discard_cleanups (cleanup);
              return;
            }
+
+         /* The convenience variable/history value parsed correctly.
+            NAME is no longer needed.  */
+         do_cleanups (cleanup);
        }
       else
        {

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 311b52862daec29d5e5c28225a7be98239725909..dbcf0ae1e138b55a3cb5312627153db3c271762f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-05  Keith Seitz  <keiths@redhat.com>
+
+       * gdb.linespec/ls-dollar.exp: Add test for linespec
+       file:convenience_variable.
+
 2014-05-05  Yao Qi  <yao@codesourcery.com>
 
        * gdb.trace/unavailable.exp (gdb_collect_args_test): Save

diff --git a/gdb/testsuite/gdb.linespec/ls-dollar.exp b/gdb/testsuite/gdb.linespec/ls-dollar.exp
index 2e35804e550fbca6db77b71a4590bf862f18e2ec..bccc40aa3185409f76d8dd41b06e2494174cf9d5 100644 (file)
--- a/gdb/testsuite/gdb.linespec/ls-dollar.exp
+++ b/gdb/testsuite/gdb.linespec/ls-dollar.exp
@@ -30,7 +30,16 @@ if {[prepare_for_testing $testfile $exefile $srcfile \
 
 gdb_test_no_output "set listsize 1"
 
+set line [gdb_get_line_number {dollar_func}]
+
 gdb_test "list \$dollar_var" \
     ".*static int [string_to_regexp {$dollar_var}] = 0;"
 gdb_test "break \$dollar_func" \
-    "Breakpoint $decimal at $hex: file .*$srcfile, line [gdb_get_line_number {dollar_func}]\\\."
+    "Breakpoint $decimal at $hex: file .*$srcfile, line $line\\\."
+
+gdb_test_no_output "set var \$theline = $line"
+gdb_test "list $srcfile:\$theline" \
+    ".*[string_to_regexp {/* dollar_func */}]"
+
+gdb_test "break $srcfile:\$theline" \
+    "Breakpoint $decimal at $hex: file .*$srcfile, line $line\\\."