From 446d2c032d387a75020ecb41b5d89dd93158beb0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 11 Dec 2020 09:33:36 -0700 Subject: [PATCH] Remove varobj_clear_saved_item One call to varobj_clear_saved_item is from the varobj destructor. This is no longer needed, so this patch removes the call; then inlines the function into the sole remaining caller. gdb/ChangeLog 2020-12-11 Tom Tromey * varobj.c (varobj_clear_saved_item): Remove. (update_dynamic_varobj_children): Update. (varobj::~varobj): Don't call varobj_clear_saved_item. --- gdb/ChangeLog | 6 ++++++ gdb/varobj.c | 14 +------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3b6569a308..f61cfda48d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-12-11 Tom Tromey + + * varobj.c (varobj_clear_saved_item): Remove. + (update_dynamic_varobj_children): Update. + (varobj::~varobj): Don't call varobj_clear_saved_item. + 2020-12-11 Tom Tromey * varobj.c (install_dynamic_child, varobj_clear_saved_item) diff --git a/gdb/varobj.c b/gdb/varobj.c index 4cbf007845..941c38c1ce 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -673,15 +673,6 @@ varobj_get_iterator (struct varobj *var) requested an iterator from a non-dynamic varobj")); } -/* Release and clear VAR's saved item, if any. */ - -static void -varobj_clear_saved_item (struct varobj_dynamic *var) -{ - if (var->saved_item != NULL) - var->saved_item.reset (nullptr); -} - static bool update_dynamic_varobj_children (struct varobj *var, std::vector *changed, @@ -700,8 +691,7 @@ update_dynamic_varobj_children (struct varobj *var, if (update_children || var->dynamic->child_iter == NULL) { var->dynamic->child_iter = varobj_get_iterator (var); - - varobj_clear_saved_item (var->dynamic); + var->dynamic->saved_item.reset (nullptr); i = 0; @@ -1864,8 +1854,6 @@ varobj::~varobj () } #endif - varobj_clear_saved_item (var->dynamic); - if (is_root_p (var)) delete var->root; -- 2.34.1