aboutsummaryrefslogtreecommitdiff
path: root/gdb/tracepoint.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2021-01-09 10:06:25 -0700
committerTom Tromey <tom@tromey.com>2021-01-09 10:06:25 -0700
commitbc167b6b3eb81de168c54aed4a8f0d1fdaa065e2 (patch)
tree591a934ffe792f7efe7b3b28db7e838257bbda36 /gdb/tracepoint.c
parent66beed0227b1a9c29bcf22c47bd2803b5d595509 (diff)
downloadgdb-bc167b6b3eb81de168c54aed4a8f0d1fdaa065e2.zip
gdb-bc167b6b3eb81de168c54aed4a8f0d1fdaa065e2.tar.gz
gdb-bc167b6b3eb81de168c54aed4a8f0d1fdaa065e2.tar.bz2
Remove a use of print_expression
The tracepoint code uses print_expression to reconstruct an expression string. However, the original expression is already available -- it was just parsed a bit earlier in the same function. This patch changes this code to simply save the already-parsed expression, rather than attempt to reconstruct it. gdb/ChangeLog 2021-01-09 Tom Tromey <tom@tromey.com> * tracepoint.h (class collection_list) <append_exp>: Take a std::string. * tracepoint.c (collection_list::append_exp): Take a std::string. (encode_actions_1): Update.
Diffstat (limited to 'gdb/tracepoint.c')
-rw-r--r--gdb/tracepoint.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 7109fd8..17d70a6 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1266,16 +1266,12 @@ collection_list::stringify ()
return str_list;
}
-/* Add the printed expression EXP to *LIST. */
+/* Add the expression STR to M_COMPUTED. */
void
-collection_list::append_exp (struct expression *exp)
+collection_list::append_exp (std::string &&str)
{
- string_file tmp_stream;
-
- print_expression (exp, &tmp_stream);
-
- m_computed.push_back (std::move (tmp_stream.string ()));
+ m_computed.push_back (std::move (str));
}
void
@@ -1379,6 +1375,7 @@ encode_actions_1 (struct command_line *action,
{
unsigned long addr;
+ const char *exp_start = action_exp;
expression_up exp = parse_exp_1 (&action_exp, tloc->address,
block_for_pc (tloc->address),
1);
@@ -1412,7 +1409,8 @@ encode_actions_1 (struct command_line *action,
memrange_absolute, addr,
TYPE_LENGTH (exp->elts[1].type),
tloc->address);
- collect->append_exp (exp.get ());
+ collect->append_exp (std::string (exp_start,
+ action_exp));
break;
case OP_VAR_VALUE:
@@ -1441,7 +1439,8 @@ encode_actions_1 (struct command_line *action,
collect->add_ax_registers (aexpr.get ());
collect->add_aexpr (std::move (aexpr));
- collect->append_exp (exp.get ());
+ collect->append_exp (std::string (exp_start,
+ action_exp));
break;
} /* switch */
} /* do */