FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert exp_uses_objfile to a method of expression

Browse source 
This changes the exp_uses_objfile function to be a method of
'expression'.

Reviewed-By: Lancelot Six <lancelot.six@amd.com>
This commit is contained in:
Tom Tromey 2022-12-19 11:14:02 -07:00
parent 4b9728bec1
commit aa9bd44528
6 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/eval.c
View file

@ -89,6 +89,15 @@ parse_to_comma_and_eval (const char **expp)
/* See expression.h. */
bool
expression::uses_objfile (struct objfile *objfile) const
{
gdb_assert (objfile->separate_debug_objfile_backlink == nullptr);
return op->uses_objfile (objfile);
}
/* See expression.h. */
struct value *
expression::evaluate (struct type *expect_type, enum noside noside)
{

5
gdb/expression.h
View file

@ -214,6 +214,11 @@ struct expression
op->dump (stream, 0);
}
/* Return true if this expression uses OBJFILE (and will become
dangling when OBJFILE is unloaded), otherwise return false.
OBJFILE must not be a separate debug info file. */
bool uses_objfile (struct objfile *objfile) const;
/* Evaluate the expression. EXPECT_TYPE is the context type of the
expression; normally this should be nullptr. NOSIDE controls how
evaluation is performed. */

12
gdb/parse.c
View file

@ -667,18 +667,6 @@ parser_fprintf (FILE *x, const char *y, ...)
va_end (args);
}
/* Return rue if EXP uses OBJFILE (and will become dangling when
OBJFILE is unloaded), otherwise return false. OBJFILE must not be
a separate debug info file. */
bool
exp_uses_objfile (struct expression *exp, struct objfile *objfile)
{
gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
return exp->op->uses_objfile (objfile);
}
void _initialize_parse ();
void
_initialize_parse ()

2
gdb/parser-defs.h
View file

@ -421,7 +421,5 @@ extern bool fits_in_type (int n_sign, ULONGEST n, int type_bits,
extern void parser_fprintf (FILE *, const char *, ...) ATTRIBUTE_PRINTF (2, 3);
extern bool exp_uses_objfile (struct expression *exp, struct objfile *objfile);
#endif /* PARSER_DEFS_H */

2
gdb/printcmd.c
View file

@ -2360,7 +2360,7 @@ clear_dangling_display_expressions (struct objfile *objfile)
}
if (bl_objf == objfile
|| (d->exp != NULL && exp_uses_objfile (d->exp.get (), objfile)))
|| (d->exp != nullptr && d->exp->uses_objfile (objfile)))
{
d->exp.reset ();
d->block = NULL;

3
gdb/varobj.c
View file

@ -2412,8 +2412,7 @@ varobj_invalidate_if_uses_objfile (struct objfile *objfile)
}
}
if (var->root->exp != nullptr
&& exp_uses_objfile (var->root->exp.get (), objfile))
if (var->root->exp != nullptr && var->root->exp->uses_objfile (objfile))
{
/* The varobj's current expression references the objfile. For
globals and floating, it is possible that when we try to