yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set varobj->path_expr in varobj_get_path_expr

Browse Source 
It seems like different languages are doing this differently (e.g.
C and Ada). For C, var->path_expr is set inside c_path_expr_of_child.
The next time the value is requested, is it therefore not recomputed.
Ada does not set this field, but just returns the value. Since the field
is never set, the value is recomputed every time it is requested.

This patch makes it so that path_expr_of_child's only job is to compute
the path expression, not save/cache the value. The field is set by the
varobj common code.

gdb/ChangeLog:

	* varobj.c (varobj_get_path_expr): Set var->path_expr.
	* c-varobj.c (c_path_expr_of_child): Set local var instead of
	child->path_expr.
	(cplus_path_expr_of_child): Same.
This commit is contained in:
Simon Marchi 2015-01-30 14:43:59 -05:00
parent ca83fa8189
commit 2568868e69
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2015-01-30 Simon Marchi <simon.marchi@ericsson.com>
* varobj.c (varobj_get_path_expr): Set var->path_expr.
* c-varobj.c (c_path_expr_of_child): Set local var instead of
child->path_expr.
(cplus_path_expr_of_child): Same.
2015-01-30 Simon Marchi <simon.marchi@ericsson.com>
* mi-cmd-var.c (print_varobj): Free varobj_get_expression

12
gdb/c-varobj.c
View File

@ -433,9 +433,11 @@ c_name_of_child (struct varobj *parent, int index)
static char *
c_path_expr_of_child (struct varobj *child)
{
char *path_expr;
c_describe_child (child->parent, child->index, NULL, NULL, NULL,
&child->path_expr);
return child->path_expr;
&path_expr);
return path_expr;
}
static struct value *
@ -906,9 +908,11 @@ cplus_name_of_child (struct varobj *parent, int index)
static char *
cplus_path_expr_of_child (struct varobj *child)
{
char *path_expr;
cplus_describe_child (child->parent, child->index, NULL, NULL, NULL,
&child->path_expr);
return child->path_expr;
&path_expr);
return path_expr;
}
static struct value *

9
gdb/varobj.c
View File

@ -1034,16 +1034,17 @@ varobj_get_path_expr_parent (struct varobj *var)
char *
varobj_get_path_expr (struct varobj *var)
{
if (var->path_expr != NULL)
return var->path_expr;
else
if (var->path_expr == NULL)
{
/* For root varobjs, we initialize path_expr
when creating varobj, so here it should be
child varobj. */
gdb_assert (!is_root_p (var));
return (*var->root->lang_ops->path_expr_of_child) (var);
var->path_expr = (*var->root->lang_ops->path_expr_of_child) (var);
}
return var->path_expr;
}
const struct language_defn *