Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-25 16:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce expression::evaluate

Browse Source 
This introduces a new method, expression::evaluate, and changes the
top-level expression-evaluation functions to use it.  Stack temporary
handling is moved into this new method, which makes sense because that
handling was only done when "*pos == 0".

This patch avoids some temporary regressions related to stack
temporary in the larger expression rewrite series.  I've pulled it out
separately because it seems like a reasonable change in its own right,
and because it's better to avoid making that series even longer.

Regression tested on x86-64 Fedora 32.

gdb/ChangeLog
2021-02-18  Tom Tromey  <tom@tromey.com>

	* expression.h (struct expression) <evaluate>: Declare method.
	* eval.c (evaluate_subexp): Simplify.
	(expression::evaluate): New method.
	(evaluate_expression, evaluate_type): Use expression::evaluate.
This commit is contained in:
Tom Tromey
2021-02-18 11:23:33 -07:00
parent 8568422270
commit 26f53cd385
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gdb/eval.c
View File

@@ -61,22 +61,8 @@ struct value *
evaluate_subexp (struct type *expect_type, struct expression *exp,
int *pos, enum noside noside)
{
struct value *retval;
gdb::optional<enable_thread_stack_temporaries> stack_temporaries;
if (*pos == 0 && target_has_execution ()
&& exp->language_defn->la_language == language_cplus
&& !thread_stack_temporaries_enabled_p (inferior_thread ()))
stack_temporaries.emplace (inferior_thread ());
retval = (*exp->language_defn->expression_ops ()->evaluate_exp)
(expect_type, exp, pos, noside);
if (stack_temporaries.has_value ()
&& value_in_thread_stack_temporaries (retval, inferior_thread ()))
retval = value_non_lval (retval);
return retval;
return ((*exp->language_defn->expression_ops ()->evaluate_exp)
(expect_type, exp, pos, noside));
}
/* Parse the string EXP as a C expression, evaluate it,
@@ -121,14 +107,33 @@ parse_to_comma_and_eval (const char **expp)
}
/* See expression.h. */
struct value *
expression::evaluate (struct type *expect_type, enum noside noside)
{
gdb::optional<enable_thread_stack_temporaries> stack_temporaries;
if (target_has_execution ()
&& language_defn->la_language == language_cplus
&& !thread_stack_temporaries_enabled_p (inferior_thread ()))
stack_temporaries.emplace (inferior_thread ());
int pos = 0;
struct value *retval = evaluate_subexp (expect_type, this, &pos, noside);
if (stack_temporaries.has_value ()
&& value_in_thread_stack_temporaries (retval, inferior_thread ()))
retval = value_non_lval (retval);
return retval;
}
/* See value.h. */
struct value *
evaluate_expression (struct expression *exp, struct type *expect_type)
{
int pc = 0;
return evaluate_subexp (expect_type, exp, &pc, EVAL_NORMAL);
return exp->evaluate (expect_type, EVAL_NORMAL);
}
/* Evaluate an expression, avoiding all memory references
@@ -137,9 +142,7 @@ evaluate_expression (struct expression *exp, struct type *expect_type)
struct value *
evaluate_type (struct expression *exp)
{
int pc = 0;
return evaluate_subexp (nullptr, exp, &pc, EVAL_AVOID_SIDE_EFFECTS);
return exp->evaluate (nullptr, EVAL_AVOID_SIDE_EFFECTS);
}
/* Evaluate a subexpression, avoiding all memory references and