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/d-namespace.c | |
| parent | 5eae7aeaf754549d3645a0c590c5ef9f0134a32d (diff) | |
| download | gdb-167b0be1b5ef36a5605fcdfba0c84db2ed475e1e.zip gdb-167b0be1b5ef36a5605fcdfba0c84db2ed475e1e.tar.gz gdb-167b0be1b5ef36a5605fcdfba0c84db2ed475e1e.tar.bz2 | |
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/d-namespace.c')
| -rw-r--r-- | gdb/d-namespace.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c index bc791f7..6842a29 100644 --- a/gdb/d-namespace.c +++ b/gdb/d-namespace.c @@ -356,16 +356,6 @@ d_lookup_nested_symbol (struct type *parent_type, } } -/* Used for cleanups to reset the "searched" flag incase - 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. */ @@ -376,7 +366,6 @@ d_lookup_symbol_imports (const char *scope, const char *name, { struct using_direct *current; struct block_symbol sym; - struct cleanup *searched_cleanup; /* First, try to find the symbol in the given module. */ sym = d_lookup_symbol_in_module (scope, name, block, domain, 1); @@ -399,9 +388,8 @@ d_lookup_symbol_imports (const char *scope, const char *name, { /* 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 restore_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) @@ -419,9 +407,6 @@ d_lookup_symbol_imports (const char *scope, const char *name, declaration, the search of this import is complete. */ if (sym.symbol != NULL || current->declaration) { - current->searched = 0; - discard_cleanups (searched_cleanup); - if (sym.symbol != NULL) return sym; @@ -433,10 +418,7 @@ d_lookup_symbol_imports (const char *scope, const char *name, if (strcmp (name, *excludep) == 0) break; if (*excludep) - { - discard_cleanups (searched_cleanup); - continue; - } + continue; /* If the import statement is creating an alias. */ if (current->alias != NULL) @@ -476,8 +458,6 @@ d_lookup_symbol_imports (const char *scope, const char *name, sym = d_lookup_symbol_in_module (current->import_src, name, block, domain, 1); } - current->searched = 0; - discard_cleanups (searched_cleanup); if (sym.symbol != NULL) return sym; |