diff options
| author | Tom Tromey <tom@tromey.com> | 2017-11-01 08:32:13 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-11-04 10:27:16 -0600 |
| commit | 167b0be1b5ef36a5605fcdfba0c84db2ed475e1e (patch) | |
| tree | 87acaf68f4d6149dcfc8640819ffe1f65d52925b /gdb/cp-namespace.c | |
| parent | 5eae7aeaf754549d3645a0c590c5ef9f0134a32d (diff) | |
| download | binutils-gdb-167b0be1b5ef36a5605fcdfba0c84db2ed475e1e.tar.gz | |
Remove directive-searched cleanups
This removes a few cleanups related to the "searched" field in
struct using_direct, replacing these with scoped_restore.
gdb/ChangeLog
2017-11-04 Tom Tromey <tom@tromey.com>
* cp-namespace.c (reset_directive_searched): Remove.
(cp_lookup_symbol_via_imports): Use scoped_restore.
* cp-support.c (reset_directive_searched): Remove.
(make_symbol_overload_list_using): Use scoped_restore.
* d-namespace.c (d_lookup_symbol_imports): Use scoped_restore.
(reset_directive_searched): Remove.
Diffstat (limited to 'gdb/cp-namespace.c')
| -rw-r--r-- | gdb/cp-namespace.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 214b7e1cf4e..d8817c03726 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -338,15 +338,6 @@ cp_lookup_symbol_in_namespace (const char *the_namespace, const char *name, return sym; } -/* Used for cleanups to reset the "searched" flag in case of an error. */ - -static void -reset_directive_searched (void *data) -{ - struct using_direct *direct = (struct using_direct *) data; - direct->searched = 0; -} - /* Search for NAME by applying all import statements belonging to BLOCK which are applicable in SCOPE. If DECLARATION_ONLY the search is restricted to using declarations. @@ -388,7 +379,6 @@ cp_lookup_symbol_via_imports (const char *scope, struct block_symbol sym; int len; int directive_match; - struct cleanup *searched_cleanup; sym.symbol = NULL; sym.block = NULL; @@ -425,9 +415,8 @@ cp_lookup_symbol_via_imports (const char *scope, { /* Mark this import as searched so that the recursive call does not search it again. */ - current->searched = 1; - searched_cleanup = make_cleanup (reset_directive_searched, - current); + scoped_restore reset_directive_searched + = make_scoped_restore (¤t->searched, 1); /* If there is an import of a single declaration, compare the imported declaration (after optional renaming by its alias) @@ -446,9 +435,6 @@ cp_lookup_symbol_via_imports (const char *scope, search of this import is complete. */ if (declaration_only || sym.symbol != NULL || current->declaration) { - current->searched = 0; - discard_cleanups (searched_cleanup); - if (sym.symbol != NULL) return sym; @@ -460,10 +446,7 @@ cp_lookup_symbol_via_imports (const char *scope, if (strcmp (name, *excludep) == 0) break; if (*excludep) - { - discard_cleanups (searched_cleanup); - continue; - } + continue; if (current->alias != NULL && strcmp (name, current->alias) == 0) @@ -484,8 +467,6 @@ cp_lookup_symbol_via_imports (const char *scope, name, block, domain, 1, 0, 0); } - current->searched = 0; - discard_cleanups (searched_cleanup); if (sym.symbol != NULL) return sym; |