diff options
| -rw-r--r-- | gdb/ada-lang.c | 8 | ||||
| -rw-r--r-- | gdb/compile/compile-c-symbols.c | 7 | ||||
| -rw-r--r-- | gdb/guile/scm-block.c | 7 |
3 files changed, 5 insertions, 17 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 0361730..a25fc33 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -6070,18 +6070,14 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, const lookup_name_info &lookup_name, domain_enum domain, struct objfile *objfile) { - struct block_iterator iter; /* A matching argument symbol, if any. */ struct symbol *arg_sym; /* Set true when we find a matching non-argument symbol. */ bool found_sym; - struct symbol *sym; arg_sym = NULL; found_sym = false; - for (sym = block_iterator_first (block, &iter, &lookup_name); - sym != NULL; - sym = block_iterator_next (&iter)) + for (struct symbol *sym : block_iterator_range (block, &lookup_name)) { if (symbol_matches_domain (sym->language (), sym->domain (), domain)) { @@ -6115,6 +6111,8 @@ ada_add_block_symbols (std::vector<struct block_symbol> &result, const std::string &ada_lookup_name = lookup_name.ada ().lookup_name (); const char *name = ada_lookup_name.c_str (); size_t name_len = ada_lookup_name.size (); + struct symbol *sym; + struct block_iterator iter; ALL_BLOCK_SYMBOLS (block, iter, sym) { diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index 73b4c4d..c47af4a 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -633,14 +633,9 @@ generate_c_for_variable_locations (compile_instance *compiler, while (1) { - struct symbol *sym; - struct block_iterator iter; - /* Iterate over symbols in this block, generating code to compute the location of each local variable. */ - for (sym = block_iterator_first (block, &iter); - sym != NULL; - sym = block_iterator_next (&iter)) + for (struct symbol *sym : block_iterator_range (block)) { if (!symbol_seen (symhash.get (), sym)) generate_c_for_for_one_variable (compiler, stream, gdbarch, diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index c9d847a..02b7a48 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -501,20 +501,15 @@ gdbscm_block_symbols (SCM self) block_smob *b_smob = bkscm_get_valid_block_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); const struct block *block = b_smob->block; - struct block_iterator iter; - struct symbol *sym; SCM result; result = SCM_EOL; - sym = block_iterator_first (block, &iter); - - while (sym != NULL) + for (struct symbol *sym : block_iterator_range (block)) { SCM s_scm = syscm_scm_from_symbol (sym); result = scm_cons (s_scm, result); - sym = block_iterator_next (&iter); } return scm_reverse_x (result, SCM_EOL); |