* linespec.c (convert_linespec_to_sal): Don't add

any symbols to the result vector if symbol_to_sal
	returns zero.
This commit is contained in:
Keith Seitz 2012-07-23 20:40:07 +00:00
parent 0f5f4ffe7a
commit 64b92e45d3
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2012-07-23 Keith Seitz <keiths@redhat.com>
* linespec.c (convert_linespec_to_sal): Don't add
any symbols to the result vector if symbol_to_sal
returns zero.
2012-07-23 Keith Seitz <keiths@redhat.com>
* linespec.c (decode_objc): Record the function name

View File

@ -1860,9 +1860,9 @@ convert_linespec_to_sals (struct linespec_state *state, linespec_p ls)
for (i = 0; VEC_iterate (symbolp, ls->labels.label_symbols, i, sym); ++i)
{
symbol_to_sal (&sal, state->funfirstline, sym);
add_sal_to_sals (state, &sals, &sal,
SYMBOL_NATURAL_NAME (sym), 0);
if (symbol_to_sal (&sal, state->funfirstline, sym))
add_sal_to_sals (state, &sals, &sal,
SYMBOL_NATURAL_NAME (sym), 0);
}
}
else if (ls->function_symbols != NULL || ls->minimal_symbols != NULL)
@ -1886,8 +1886,8 @@ convert_linespec_to_sals (struct linespec_state *state, linespec_p ls)
{
pspace = SYMTAB_PSPACE (SYMBOL_SYMTAB (sym));
set_current_program_space (pspace);
symbol_to_sal (&sal, state->funfirstline, sym);
if (maybe_add_address (state->addr_set, pspace, sal.pc))
if (symbol_to_sal (&sal, state->funfirstline, sym)
&& maybe_add_address (state->addr_set, pspace, sal.pc))
add_sal_to_sals (state, &sals, &sal,
SYMBOL_NATURAL_NAME (sym), 0);
}