From: Sami Wagiaalla <swagiaal@redhat.com>
To: GDB Patches <gdb-patches@sourceware.org>
Subject: [PATCH 2/2] namespace support
Date: Fri, 22 May 2009 14:52:00 -0000 [thread overview]
Message-ID: <4A16BBC7.3080608@redhat.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 7193 bytes --]
Import data structure ( struct using_direct) is limited to
representing import statements where the destination is a parent
of the source (true for anonymous namespaces). This patch removes
this limitation, allowing each import to represent independent
import source and destination.
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4614659..d38e105 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-21 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * dwarf2read.c (read_import_statement): Properly set import location
+ and destenation.
+ * cp-support.h (cp_add_using, cp_add_using_directive): Now take char*
+ inner, char* outer arguments. Updated callers.
+
2009-05-21 Sami Wagiaalla <swagiaal@redhat.com>
* dwarf2read.c (process_die): Handle import statements
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 8bb341f..17c4838 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -103,14 +103,17 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
"(anonymous namespace)",
ANONYMOUS_NAMESPACE_LEN) == 0)
{
+ int outer_len = (previous_component == 0 ? 0 : previous_component - 2);
+ char outer[outer_len+1];
+
+ strncpy(outer, name, outer_len);
+
+ outer[outer_len] = '\0';
/* We've found a component of the name that's an
anonymous namespace. So add symbols in it to the
namespace given by the previous component if there is
one, or to the global namespace if there isn't. */
- cp_add_using_directive (name,
- previous_component == 0
- ? 0 : previous_component - 2,
- next_component);
+ cp_add_using_directive (outer, name);
}
/* The "+ 2" is for the "::". */
previous_component = next_component + 2;
@@ -121,16 +124,11 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
}
}
-/* Add a using directive to using_list. NAME is the start of a string
- that should contain the namespaces we want to add as initial
- substrings, OUTER_LENGTH is the end of the outer namespace, and
- INNER_LENGTH is the end of the inner namespace. If the using
- directive in question has already been added, don't add it
- twice. */
+/* Add a using directive to using_list. If the using directive in question
+ has already been added, don't add it twice. */
void
-cp_add_using_directive (const char *name, unsigned int outer_length,
- unsigned int inner_length)
+cp_add_using_directive (const char *outer, const char *inner)
{
struct using_direct *current;
struct using_direct *new;
@@ -139,13 +137,12 @@ cp_add_using_directive (const char *name, unsigned int outer_length,
for (current = using_directives; current != NULL; current = current->next)
{
- if ((strncmp (current->inner, name, inner_length) == 0)
- && (strlen (current->inner) == inner_length)
- && (strlen (current->outer) == outer_length))
+ if (strcmp (current->inner, inner) == 0
+ && strcmp (current->outer, outer) == 0)
return;
}
- using_directives = cp_add_using (name, inner_length, outer_length,
+ using_directives = cp_add_using (outer, inner,
using_directives);
}
@@ -197,26 +194,22 @@ cp_is_anonymous (const char *namespace)
!= NULL);
}
-/* Create a new struct using direct whose inner namespace is the
- initial substring of NAME of leng INNER_LEN and whose outer
- namespace is the initial substring of NAME of length OUTER_LENGTH.
+/* Create a new struct using direct whose inner namespace is INNER
+ and whose outer namespace is OUTER.
Set its next member in the linked list to NEXT; allocate all memory
using xmalloc. It copies the strings, so NAME can be a temporary
string. */
struct using_direct *
-cp_add_using (const char *name,
- unsigned int inner_len,
- unsigned int outer_len,
+cp_add_using (const char *outer,
+ const char *inner,
struct using_direct *next)
{
struct using_direct *retval;
- gdb_assert (outer_len < inner_len);
-
retval = xmalloc (sizeof (struct using_direct));
- retval->inner = savestring (name, inner_len);
- retval->outer = savestring (name, outer_len);
+ retval->inner = savestring (inner, strlen(inner));
+ retval->outer = savestring (outer, strlen(outer));
retval->next = next;
return retval;
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index e577f7d..ea36608 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -76,13 +76,11 @@ extern struct type *cp_lookup_rtti_type (const char *name,
extern int cp_is_anonymous (const char *namespace);
-extern void cp_add_using_directive (const char *name,
- unsigned int outer_length,
- unsigned int inner_length);
+extern void cp_add_using_directive (const char *outer,
+ const char *inner);
-extern struct using_direct *cp_add_using (const char *name,
- unsigned int inner_len,
- unsigned int outer_len,
+extern struct using_direct *cp_add_using (const char *outer,
+ const char *inner,
struct using_direct *next);
extern void cp_initialize_namespace (void);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index dd7cf67..777b096 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2941,8 +2941,11 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
struct attribute *import_attr;
struct die_info *imported_die;
const char *imported_name;
+ const char *imported_name_prefix;
+ const char *import_prefix;
+ char *canonical_name;
int is_anonymous = 0;
-
+
import_attr = dwarf2_attr (die, DW_AT_import, cu);
if (import_attr == NULL)
{
@@ -2961,8 +2964,28 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
/* FIXME: dwarf2_name (die); for the local name after import. */
- using_directives = cp_add_using (imported_name, strlen (imported_name), 0,
- using_directives);
+ /* Figure out where the statement is being imported to */
+ import_prefix = determine_prefix (die, cu);
+
+ /*
+ Figure out what the scope of the imported die is and prepend it
+ to the name of the imported die
+ */
+ imported_name_prefix = determine_prefix (imported_die, cu);
+
+
+ if(strlen (imported_name_prefix) > 0){
+ canonical_name = alloca (strlen (imported_name_prefix) + 2 + strlen (imported_name) + 1);
+ strcpy (canonical_name, imported_name_prefix);
+ strcat (canonical_name, "::");
+ strcat (canonical_name, imported_name);
+ }else{
+ canonical_name = alloca (strlen (imported_name) + 1);
+ strcpy (canonical_name, imported_name);
+ }
+
+ using_directives = cp_add_using (import_prefix,canonical_name, using_directives);
+
}
static void
@@ -4902,9 +4925,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
if (is_anonymous)
{
const char *previous_prefix = determine_prefix (die, cu);
- cp_add_using_directive (TYPE_NAME (type),
- strlen (previous_prefix),
- strlen (TYPE_NAME (type)));
+ cp_add_using_directive (previous_prefix, TYPE_NAME (type));
}
}
[-- Attachment #2: namespace-2.patch --]
[-- Type: text/plain, Size: 6883 bytes --]
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4614659..d38e105 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-21 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * dwarf2read.c (read_import_statement): Properly set import location
+ and destenation.
+ * cp-support.h (cp_add_using, cp_add_using_directive): Now take char*
+ inner, char* outer arguments. Updated callers.
+
2009-05-21 Sami Wagiaalla <swagiaal@redhat.com>
* dwarf2read.c (process_die): Handle import statements
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 8bb341f..17c4838 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -103,14 +103,17 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
"(anonymous namespace)",
ANONYMOUS_NAMESPACE_LEN) == 0)
{
+ int outer_len = (previous_component == 0 ? 0 : previous_component - 2);
+ char outer[outer_len+1];
+
+ strncpy(outer, name, outer_len);
+
+ outer[outer_len] = '\0';
/* We've found a component of the name that's an
anonymous namespace. So add symbols in it to the
namespace given by the previous component if there is
one, or to the global namespace if there isn't. */
- cp_add_using_directive (name,
- previous_component == 0
- ? 0 : previous_component - 2,
- next_component);
+ cp_add_using_directive (outer, name);
}
/* The "+ 2" is for the "::". */
previous_component = next_component + 2;
@@ -121,16 +124,11 @@ cp_scan_for_anonymous_namespaces (const struct symbol *symbol)
}
}
-/* Add a using directive to using_list. NAME is the start of a string
- that should contain the namespaces we want to add as initial
- substrings, OUTER_LENGTH is the end of the outer namespace, and
- INNER_LENGTH is the end of the inner namespace. If the using
- directive in question has already been added, don't add it
- twice. */
+/* Add a using directive to using_list. If the using directive in question
+ has already been added, don't add it twice. */
void
-cp_add_using_directive (const char *name, unsigned int outer_length,
- unsigned int inner_length)
+cp_add_using_directive (const char *outer, const char *inner)
{
struct using_direct *current;
struct using_direct *new;
@@ -139,13 +137,12 @@ cp_add_using_directive (const char *name, unsigned int outer_length,
for (current = using_directives; current != NULL; current = current->next)
{
- if ((strncmp (current->inner, name, inner_length) == 0)
- && (strlen (current->inner) == inner_length)
- && (strlen (current->outer) == outer_length))
+ if (strcmp (current->inner, inner) == 0
+ && strcmp (current->outer, outer) == 0)
return;
}
- using_directives = cp_add_using (name, inner_length, outer_length,
+ using_directives = cp_add_using (outer, inner,
using_directives);
}
@@ -197,26 +194,22 @@ cp_is_anonymous (const char *namespace)
!= NULL);
}
-/* Create a new struct using direct whose inner namespace is the
- initial substring of NAME of leng INNER_LEN and whose outer
- namespace is the initial substring of NAME of length OUTER_LENGTH.
+/* Create a new struct using direct whose inner namespace is INNER
+ and whose outer namespace is OUTER.
Set its next member in the linked list to NEXT; allocate all memory
using xmalloc. It copies the strings, so NAME can be a temporary
string. */
struct using_direct *
-cp_add_using (const char *name,
- unsigned int inner_len,
- unsigned int outer_len,
+cp_add_using (const char *outer,
+ const char *inner,
struct using_direct *next)
{
struct using_direct *retval;
- gdb_assert (outer_len < inner_len);
-
retval = xmalloc (sizeof (struct using_direct));
- retval->inner = savestring (name, inner_len);
- retval->outer = savestring (name, outer_len);
+ retval->inner = savestring (inner, strlen(inner));
+ retval->outer = savestring (outer, strlen(outer));
retval->next = next;
return retval;
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index e577f7d..ea36608 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -76,13 +76,11 @@ extern struct type *cp_lookup_rtti_type (const char *name,
extern int cp_is_anonymous (const char *namespace);
-extern void cp_add_using_directive (const char *name,
- unsigned int outer_length,
- unsigned int inner_length);
+extern void cp_add_using_directive (const char *outer,
+ const char *inner);
-extern struct using_direct *cp_add_using (const char *name,
- unsigned int inner_len,
- unsigned int outer_len,
+extern struct using_direct *cp_add_using (const char *outer,
+ const char *inner,
struct using_direct *next);
extern void cp_initialize_namespace (void);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index dd7cf67..777b096 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2941,8 +2941,11 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
struct attribute *import_attr;
struct die_info *imported_die;
const char *imported_name;
+ const char *imported_name_prefix;
+ const char *import_prefix;
+ char *canonical_name;
int is_anonymous = 0;
-
+
import_attr = dwarf2_attr (die, DW_AT_import, cu);
if (import_attr == NULL)
{
@@ -2961,8 +2964,28 @@ read_import_statement (struct die_info *die, struct dwarf2_cu *cu)
/* FIXME: dwarf2_name (die); for the local name after import. */
- using_directives = cp_add_using (imported_name, strlen (imported_name), 0,
- using_directives);
+ /* Figure out where the statement is being imported to */
+ import_prefix = determine_prefix (die, cu);
+
+ /*
+ Figure out what the scope of the imported die is and prepend it
+ to the name of the imported die
+ */
+ imported_name_prefix = determine_prefix (imported_die, cu);
+
+
+ if(strlen (imported_name_prefix) > 0){
+ canonical_name = alloca (strlen (imported_name_prefix) + 2 + strlen (imported_name) + 1);
+ strcpy (canonical_name, imported_name_prefix);
+ strcat (canonical_name, "::");
+ strcat (canonical_name, imported_name);
+ }else{
+ canonical_name = alloca (strlen (imported_name) + 1);
+ strcpy (canonical_name, imported_name);
+ }
+
+ using_directives = cp_add_using (import_prefix,canonical_name, using_directives);
+
}
static void
@@ -4902,9 +4925,7 @@ read_namespace (struct die_info *die, struct dwarf2_cu *cu)
if (is_anonymous)
{
const char *previous_prefix = determine_prefix (die, cu);
- cp_add_using_directive (TYPE_NAME (type),
- strlen (previous_prefix),
- strlen (TYPE_NAME (type)));
+ cp_add_using_directive (previous_prefix, TYPE_NAME (type));
}
}
next reply other threads:[~2009-05-22 14:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 14:52 Sami Wagiaalla [this message]
2009-06-05 21:20 ` Tom Tromey
2009-06-24 20:43 ` Sami Wagiaalla
2009-06-25 15:59 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A16BBC7.3080608@redhat.com \
--to=swagiaal@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox