darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR symtab/12704

Browse source 
* cp-namespace.c (ANONYMOUS_NAMESPACE_LEN): Remove.
	(cp_scan_for_anonymous_namespaces): Use CP_ANONYMOUS_NAMESPACE_STR
	and CP_ANONYMOUS_NAMESPACE_LEN.
	(cp_is_anonymous): Likewise.
	* cp-support.h (CP_ANONYMOUS_NAMESPACE_STR): Define.
	(CP_ANONYMOUS_NAMESPACE_LEN): Define.
	* dwarf2read.c (namespace_name): Likewise.
	(fixup_partial_die): Likewise.
	* linespec.c (decode_compound): If CP_ANONYMOUS_NAMESPACE_STR is
	seen in the input, keep it.
This commit is contained in:
Keith Seitz 2011-05-31 21:54:07 +00:00
parent 0a5b1e09bf
commit 2b1dbab03d
5 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gdb/ChangeLog
View file

@ -1,3 +1,17 @@
2010-05-31 Keith Seitz <keiths@redhat.com>
PR symtab/12704
* cp-namespace.c (ANONYMOUS_NAMESPACE_LEN): Remove.
(cp_scan_for_anonymous_namespaces): Use CP_ANONYMOUS_NAMESPACE_STR
and CP_ANONYMOUS_NAMESPACE_LEN.
(cp_is_anonymous): Likewise.
* cp-support.h (CP_ANONYMOUS_NAMESPACE_STR): Define.
(CP_ANONYMOUS_NAMESPACE_LEN): Define.
* dwarf2read.c (namespace_name): Likewise.
(fixup_partial_die): Likewise.
* linespec.c (decode_compound): If CP_ANONYMOUS_NAMESPACE_STR is
seen in the input, keep it.
2011-05-30 Pedro Alves <pedro@codesourcery.com>
* target.h (enum inferior_event_type): Delete INF_QUIT_REQ.

13
gdb/cp-namespace.c
View file

@ -52,10 +52,6 @@ static struct type *cp_lookup_transparent_type_loop (const char *name,
/* Check to see if SYMBOL refers to an object contained within an
anonymous namespace; if so, add an appropriate using directive. */
/* Optimize away strlen ("(anonymous namespace)"). */
#define ANONYMOUS_NAMESPACE_LEN 21
void
cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
{
@ -76,10 +72,11 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
while (name[next_component] == ':')
{
if ((next_component - previous_component) == ANONYMOUS_NAMESPACE_LEN
if (((next_component - previous_component)
== CP_ANONYMOUS_NAMESPACE_LEN)
&& strncmp (name + previous_component,
"(anonymous namespace)",
ANONYMOUS_NAMESPACE_LEN) == 0)
CP_ANONYMOUS_NAMESPACE_STR,
CP_ANONYMOUS_NAMESPACE_LEN) == 0)
{
int dest_len = (previous_component == 0
? 0 : previous_component - 2);
@ -207,7 +204,7 @@ cp_set_block_scope (const struct symbol *symbol,
int
cp_is_anonymous (const char *namespace)
{
return (strstr (namespace, "(anonymous namespace)")
return (strstr (namespace, CP_ANONYMOUS_NAMESPACE_STR)
!= NULL);
}

8
gdb/cp-support.h
View file

@ -36,6 +36,14 @@ struct objfile;
struct type;
struct demangle_component;
/* A string representing the name of the anonymous namespace used in GDB. */
#define CP_ANONYMOUS_NAMESPACE_STR "(anonymous namespace)"
/* The length of the string representing the anonymous namespace. */
#define CP_ANONYMOUS_NAMESPACE_LEN 21
/* This struct is designed to store data from using directives. It
says that names from namespace IMPORT_SRC should be visible within
namespace IMPORT_DEST. These form a linked list; NEXT is the next

4
gdb/dwarf2read.c
View file

@ -7877,7 +7877,7 @@ namespace_name (struct die_info *die, int *is_anonymous, struct dwarf2_cu *cu)
*is_anonymous = (name == NULL);
if (*is_anonymous)
name = "(anonymous namespace)";
name = CP_ANONYMOUS_NAMESPACE_STR;
return name;
}
@ -9547,7 +9547,7 @@ fixup_partial_die (struct partial_die_info *part_die,
/* Set default names for some unnamed DIEs. */
if (part_die->name == NULL && part_die->tag == DW_TAG_namespace)
part_die->name = "(anonymous namespace)";
part_die->name = CP_ANONYMOUS_NAMESPACE_STR;
/* If there is no parent die to provide a namespace, and there are
children, see if we can determine the namespace from their linkage

11
gdb/linespec.c
View file

@ -1430,8 +1430,15 @@ decode_compound (char **argptr, int funfirstline,
{
/* PASS2: We'll keep getting here, until P points to one of the
break characters, at which point we exit this loop. */
if (*p && strchr (break_characters, *p) == NULL)
p++;
if (*p)
{
if (p[1] == '('
&& strncmp (&p[1], CP_ANONYMOUS_NAMESPACE_STR,
CP_ANONYMOUS_NAMESPACE_LEN) == 0)
p += CP_ANONYMOUS_NAMESPACE_LEN;
else if (strchr (break_characters, *p) == NULL)
++p;
}
}
}