aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/symtab.c18
2 files changed, 8 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ed9fc6a..ed697b3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-24 Pedro Alves <palves@redhat.com>
+
+ * symtab.c (make_file_symbol_completion_list_1): Use
+ add_symtab_completions.
+
2017-02-24 Alan Hayward <alan.hayward@arm.com>
* stack.c (frame_info): Use frame_unwind_register_value to avoid buf.
diff --git a/gdb/symtab.c b/gdb/symtab.c
index b9f4f77..c0fd0fd 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5391,10 +5391,7 @@ static VEC (char_ptr) *
make_file_symbol_completion_list_1 (const char *text, const char *word,
const char *srcfile)
{
- struct symbol *sym;
struct symtab *s;
- struct block *b;
- struct block_iterator iter;
/* The symbol we are completing on. Points in same buffer as text. */
const char *sym_text;
/* Length of sym_text. */
@@ -5464,18 +5461,9 @@ make_file_symbol_completion_list_1 (const char *text, const char *word,
/* Go through this symtab and check the externs and statics for
symbols which match. */
-
- b = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (s), GLOBAL_BLOCK);
- ALL_BLOCK_SYMBOLS (b, iter, sym)
- {
- COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
- }
-
- b = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (s), STATIC_BLOCK);
- ALL_BLOCK_SYMBOLS (b, iter, sym)
- {
- COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
- }
+ add_symtab_completions (SYMTAB_COMPUNIT (s),
+ sym_text, sym_text_len,
+ text, word, TYPE_CODE_UNDEF);
return (return_val);
}