From: Pedro Alves <palves@redhat.com>
Date: Thu, 11 Feb 2010 21:00:12 +0000 (+0000)
Subject: 	* tracepoint.c (tfile_open): Remove spurious discard_cleanups.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10ef8d6a8dfca5731b2f4eb4dec945a299050e3c;p=binutils-gdb.git

	* tracepoint.c (tfile_open): Remove spurious discard_cleanups.
	Merge uploaded TSVs before merging uploaded tracepoints.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddf66153dbf..a679110dbea 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-11  Pedro Alves  <pedro@codesourcery.com>
+
+	* tracepoint.c (tfile_open): Remove spurious discard_cleanups.
+	Merge uploaded TSVs before merging uploaded tracepoints.
+
 2010-02-11  Pedro Alves  <pedro@codesourcery.com>
 
 	* ax-gdb.c (gen_deref): Don't allow dereferencing void pointers.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 73fd547d6cd..e27b6905a18 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2824,7 +2824,6 @@ tfile_open (char *filename, int from_tty)
   unpush_target (&tfile_ops);
 
   push_target (&tfile_ops);
-  discard_cleanups (old_chain);
 
   trace_filename = xstrdup (filename);
   trace_fd = scratch_chan;
@@ -2881,10 +2880,12 @@ tfile_open (char *filename, int from_tty)
 
   /* Add the file's tracepoints and variables into the current mix.  */
 
-  merge_uploaded_tracepoints (&uploaded_tps);
-
+  /* Get trace state variables first, they may be checked when parsing
+     uploaded commands.  */
   merge_uploaded_trace_state_variables (&uploaded_tsvs);
 
+  merge_uploaded_tracepoints (&uploaded_tps);
+
   /* Record the starting offset of the binary trace data.  */
   trace_frames_offset = bytes;