mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove a use of print_expression

Browse Source 
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.
This commit is contained in:
Tom Tromey 2021-01-09 10:06:25 -07:00
parent 66beed0227
commit bc167b6b3e
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
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.
2021-01-08 Tom Tromey <tromey@adacore.com>
* parse.c (parse_expression): Add void_context_p parameter. Use

17
gdb/tracepoint.c
View File

@ -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 */

2
gdb/tracepoint.h
View File

@ -257,7 +257,7 @@ class collection_list
void add_wholly_collected (const char *print_name);
void append_exp (struct expression *exp);
void append_exp (std::string &&exp);
/* Add AEXPR to the list, taking ownership. */
void add_aexpr (agent_expr_up aexpr);