[PR,symtab/17591] Better fix
Commit Message
Hi.
PR 17591 is about handling stripping parameters from the name
to be looked up when the string also contains "(anonymous namespace)".
[btw, I think an audit of gdb is in order: I'm finding more of these.]
This patch does this using the same mechanism psymtab.c does:
cp_remove_params.
Regression tested on amd64-linux, with gdb_index.
2014-11-26 Doug Evans <dje@google.com>
PR symtab/17591
* dwarf2read.c (find_slot_in_mapped_hash): Use cp_remove_params
to strip parameters.
Comments
Doug Evans writes:
> Hi.
>
> PR 17591 is about handling stripping parameters from the name
> to be looked up when the string also contains "(anonymous namespace)".
> [btw, I think an audit of gdb is in order: I'm finding more of these.]
>
> This patch does this using the same mechanism psymtab.c does:
> cp_remove_params.
>
> Regression tested on amd64-linux, with gdb_index.
>
> 2014-11-26 Doug Evans <dje@google.com>
>
> PR symtab/17591
> * dwarf2read.c (find_slot_in_mapped_hash): Use cp_remove_params
> to strip parameters.
Committed.
@@ -2918,22 +2918,16 @@ find_slot_in_mapped_hash (struct mapped_index *index, const char *name,
{
/* NAME is already canonical. Drop any qualifiers as .gdb_index does
not contain any. */
- const char *paren = NULL;
- /* Need to handle "(anonymous namespace)". */
- if (*name != '(')
- paren = strchr (name, '(');
-
- if (paren)
+ if (strchr (name, '(') != NULL)
{
- char *dup;
-
- dup = xmalloc (paren - name + 1);
- memcpy (dup, name, paren - name);
- dup[paren - name] = 0;
+ char *without_params = cp_remove_params (name);
- make_cleanup (xfree, dup);
- name = dup;
+ if (without_params != NULL)
+ {
+ make_cleanup (xfree, without_params);
+ name = without_params;
+ }
}
}