From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18082 invoked by alias); 22 May 2009 14:52:36 -0000 Received: (qmail 18068 invoked by uid 22791); 22 May 2009 14:52:34 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_26,J_CHICKENPOX_75,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 22 May 2009 14:52:19 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n4MEqIRZ031470 for ; Fri, 22 May 2009 10:52:18 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n4MEqHY0002376 for ; Fri, 22 May 2009 10:52:17 -0400 Received: from toner.yyz.redhat.com (toner.yyz.redhat.com [10.15.16.55]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n4MEqGif027210 for ; Fri, 22 May 2009 10:52:16 -0400 Message-ID: <4A16BBC7.3080608@redhat.com> Date: Fri, 22 May 2009 14:52:00 -0000 From: Sami Wagiaalla User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: GDB Patches Subject: [PATCH 2/2] namespace support Content-Type: multipart/mixed; boundary="------------080805060306040202040002" X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-05/txt/msg00492.txt.bz2 This is a multi-part message in MIME format. --------------080805060306040202040002 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 7193 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 + + * 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 * 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)); } } --------------080805060306040202040002 Content-Type: text/plain; name="namespace-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="namespace-2.patch" Content-length: 6883 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 + + * 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 * 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)); } } --------------080805060306040202040002--