From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10898 invoked by alias); 24 Nov 2009 19:12:02 -0000 Received: (qmail 10871 invoked by uid 22791); 24 Nov 2009 19:11:59 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 24 Nov 2009 19:11:51 +0000 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAOJBnZm025564 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Nov 2009 14:11:49 -0500 Received: from localhost.localdomain (toner.yyz.redhat.com [10.15.16.55]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAOJBm17002855 for ; Tue, 24 Nov 2009 14:11:49 -0500 Message-ID: <4B0C3011.4080000@redhat.com> Date: Tue, 24 Nov 2009 19:12:00 -0000 From: Sami Wagiaalla User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.4pre) Gecko/20090922 Fedora/3.0-3.9.b4.fc12 Thunderbird/3.0b4 MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: Re: [patch 2/2] Perform a namespace lookup at every block level References: <4A57512A.7090208@redhat.com> <20090710194949.GA2064@caradoc.them.org> <4A5B68A4.30006@redhat.com> <4A68B91D.2080206@redhat.com> <4A8B0FD9.7010603@redhat.com> <4AA14648.7090600@redhat.com> <4AE09A10.9040703@redhat.com> <4B019120.7090504@redhat.com> In-Reply-To: <4B019120.7090504@redhat.com> Content-Type: multipart/mixed; boundary="------------000508000506010605020000" 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-11/txt/msg00530.txt.bz2 This is a multi-part message in MIME format. --------------000508000506010605020000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 7456 Updating patch because of changes in patch 1/2 2009-11-16 Sami Wagiaalla * cp-namespace.c (cp_lookup_symbol_namespace): Added search_parent argument. (cp_add_using): Initialize 'searched' field. (cp_copy_usings): Copy searched field. * cp-support.h: Add 'searched' field to using_direct struct. (cp_lookup_symbol_imports): Ditto. * cp-namespace.c (cp_lookup_symbol_imports): Ditto. Perform recursive search. Implement non parent search. * valops.c (value_maybe_namespace_elt): Updated. 2009-11-16 Sami Wagiaalla * gdb.cp/namespace-stress.exp: New test. * gdb.cp/namespace-stress.cc: New test program. * gdb.cp/namespace-recursive.exp: New test. * gdb.cp/namespace-recursive.cc: New test program. * gdb.cp/namespace-stress.exp: New test. * gdb.cp/namespace-stress.cc: New test program. diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index f63cf8a..e2f1d43 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -217,6 +217,7 @@ cp_add_using (const char *dest, retval->import_src = savestring (src, strlen(src)); retval->import_dest = savestring (dest, strlen(dest)); retval->next = next; + retval->searched = 0; return retval; } @@ -243,6 +244,8 @@ cp_copy_usings (struct using_direct *using, obstack); retval->next = cp_copy_usings (using->next, obstack); + retval->searched = using->searched; + xfree (using->import_src); xfree (using->import_dest); xfree (using); @@ -272,7 +275,8 @@ cp_lookup_symbol_nonlocal (const char *name, if (sym != NULL) return sym; - return cp_lookup_symbol_namespace (scope, name, linkage_name, block, domain); + return cp_lookup_symbol_namespace (scope, name, linkage_name, block, domain, + 1); } /* Look up NAME in the C++ namespace NAMESPACE. Other arguments are as in @@ -302,19 +306,46 @@ cp_lookup_symbol_in_namespace (const char *namespace, } } -/* Search for NAME by applying all import statements belonging - to BLOCK which are applicable in SCOPE. */ +/* Used for cleanups to reset the "searched" flag incase + of an error. */ + +static void +reset_directive_searched (void *data) +{ + struct using_direct *direct = data; + direct->searched = 0; +} +/* Search for NAME by applying all import statements belonging + to BLOCK which are applicable in SCOPE. + If SEARCH_PARENTS the search will include imports which are applicable in + parents of SCOPE. + Example: + + namespace A{ + using namespace X; + namespace B{ + using namespace Y; + } + } + + If SCOPE is "A::B" and SEARCH_PARENTS is true the imports of namespaces X + and Y will be considered. If SEARCH_PARENTS is false only the import of Y + is considered. */ + static struct symbol * cp_lookup_symbol_imports (const char *scope, const char *name, const char *linkage_name, const struct block *block, - const domain_enum domain) + const domain_enum domain, + const int search_parents) { - const struct using_direct *current; + struct using_direct *current; struct symbol *sym; int len; + int directive_match; + struct cleanup *searched_cleanup; /* First, try to find the symbol in the given namespace. */ sym = cp_lookup_symbol_in_namespace (scope, name, linkage_name, block, @@ -330,24 +361,41 @@ cp_lookup_symbol_imports (const char *scope, current != NULL; current = current->next) { + len = strlen (current->import_dest); + directive_match = (search_parents + ? (strncmp (scope, current->import_dest, + strlen (current->import_dest)) == 0 + && (len == 0 + || scope[len] == ':' || scope[len] == '\0')) + : strcmp (scope, current->import_dest) == 0); /* If the import destination is the current scope or one of its ancestors then it is applicable. */ - len = strlen (current->import_dest); - if (strncmp (scope, current->import_dest, len) == 0 - && (len == 0 || scope[len] == ':' || scope[len] == '\0')) + if (directive_match && !current->searched) { - sym = cp_lookup_symbol_in_namespace (current->import_src, name, - linkage_name, block, domain); - if (sym != NULL) - return sym; + /* Mark this import as searched so that the recursive call does not + search it again. */ + current->searched = 1; + searched_cleanup = make_cleanup (reset_directive_searched, current); + + sym = cp_lookup_symbol_namespace (current->import_src, + name, + linkage_name, + block, + domain, + 0); + + current->searched = 0; + discard_cleanups (searched_cleanup); + + if (sym != NULL) + return sym; } } return NULL; } - /* Searches for NAME in the current namespace, and by applying relevant import statements belonging to BLOCK and its parents. SCOPE is the namespace scope of the context in which the search is being evaluated. */ @@ -357,14 +405,16 @@ cp_lookup_symbol_namespace (const char *scope, const char *name, const char *linkage_name, const struct block *block, - const domain_enum domain) + const domain_enum domain, + const int search_parents) { struct symbol *sym; /* Search for name in namespaces imported to this and parent blocks. */ while (block != NULL) { - sym = cp_lookup_symbol_imports (scope,name, linkage_name, block, domain); + sym = cp_lookup_symbol_imports (scope, name, linkage_name, block, domain, + search_parents); if (sym) return sym; diff --git a/gdb/cp-support.h b/gdb/cp-support.h index 7ecd201..9400469 100644 --- a/gdb/cp-support.h +++ b/gdb/cp-support.h @@ -47,6 +47,9 @@ struct using_direct char *import_src; char *import_dest; struct using_direct *next; + + /* Used during import search to temporarily mark this node as searched. */ + int searched; }; @@ -107,7 +110,8 @@ extern struct symbol *cp_lookup_symbol_namespace (const char *namespace, const char *name, const char *linkage_name, const struct block *block, - const domain_enum domain); + const domain_enum domain, + const int search_parents); extern struct type *cp_lookup_nested_type (struct type *parent_type, const char *nested_name, diff --git a/gdb/valops.c b/gdb/valops.c index 012ea6a..6fdea95 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -2765,7 +2765,7 @@ value_maybe_namespace_elt (const struct type *curtype, sym = cp_lookup_symbol_namespace (namespace_name, name, NULL, get_selected_block (0), - VAR_DOMAIN); + VAR_DOMAIN, 1); if (sym == NULL) return NULL; --------------000508000506010605020000 Content-Type: text/plain; name="sami2-recursive-search.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sami2-recursive-search.patch" Content-length: 7316 2009-11-16 Sami Wagiaalla * cp-namespace.c (cp_lookup_symbol_namespace): Added search_parent argument. (cp_add_using): Initialize 'searched' field. (cp_copy_usings): Copy searched field. * cp-support.h: Add 'searched' field to using_direct struct. (cp_lookup_symbol_imports): Ditto. * cp-namespace.c (cp_lookup_symbol_imports): Ditto. Perform recursive search. Implement non parent search. * valops.c (value_maybe_namespace_elt): Updated. 2009-11-16 Sami Wagiaalla * gdb.cp/namespace-stress.exp: New test. * gdb.cp/namespace-stress.cc: New test program. * gdb.cp/namespace-recursive.exp: New test. * gdb.cp/namespace-recursive.cc: New test program. * gdb.cp/namespace-stress.exp: New test. * gdb.cp/namespace-stress.cc: New test program. diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index f63cf8a..e2f1d43 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -217,6 +217,7 @@ cp_add_using (const char *dest, retval->import_src = savestring (src, strlen(src)); retval->import_dest = savestring (dest, strlen(dest)); retval->next = next; + retval->searched = 0; return retval; } @@ -243,6 +244,8 @@ cp_copy_usings (struct using_direct *using, obstack); retval->next = cp_copy_usings (using->next, obstack); + retval->searched = using->searched; + xfree (using->import_src); xfree (using->import_dest); xfree (using); @@ -272,7 +275,8 @@ cp_lookup_symbol_nonlocal (const char *name, if (sym != NULL) return sym; - return cp_lookup_symbol_namespace (scope, name, linkage_name, block, domain); + return cp_lookup_symbol_namespace (scope, name, linkage_name, block, domain, + 1); } /* Look up NAME in the C++ namespace NAMESPACE. Other arguments are as in @@ -302,19 +306,46 @@ cp_lookup_symbol_in_namespace (const char *namespace, } } -/* Search for NAME by applying all import statements belonging - to BLOCK which are applicable in SCOPE. */ +/* Used for cleanups to reset the "searched" flag incase + of an error. */ + +static void +reset_directive_searched (void *data) +{ + struct using_direct *direct = data; + direct->searched = 0; +} +/* Search for NAME by applying all import statements belonging + to BLOCK which are applicable in SCOPE. + If SEARCH_PARENTS the search will include imports which are applicable in + parents of SCOPE. + Example: + + namespace A{ + using namespace X; + namespace B{ + using namespace Y; + } + } + + If SCOPE is "A::B" and SEARCH_PARENTS is true the imports of namespaces X + and Y will be considered. If SEARCH_PARENTS is false only the import of Y + is considered. */ + static struct symbol * cp_lookup_symbol_imports (const char *scope, const char *name, const char *linkage_name, const struct block *block, - const domain_enum domain) + const domain_enum domain, + const int search_parents) { - const struct using_direct *current; + struct using_direct *current; struct symbol *sym; int len; + int directive_match; + struct cleanup *searched_cleanup; /* First, try to find the symbol in the given namespace. */ sym = cp_lookup_symbol_in_namespace (scope, name, linkage_name, block, @@ -330,24 +361,41 @@ cp_lookup_symbol_imports (const char *scope, current != NULL; current = current->next) { + len = strlen (current->import_dest); + directive_match = (search_parents + ? (strncmp (scope, current->import_dest, + strlen (current->import_dest)) == 0 + && (len == 0 + || scope[len] == ':' || scope[len] == '\0')) + : strcmp (scope, current->import_dest) == 0); /* If the import destination is the current scope or one of its ancestors then it is applicable. */ - len = strlen (current->import_dest); - if (strncmp (scope, current->import_dest, len) == 0 - && (len == 0 || scope[len] == ':' || scope[len] == '\0')) + if (directive_match && !current->searched) { - sym = cp_lookup_symbol_in_namespace (current->import_src, name, - linkage_name, block, domain); - if (sym != NULL) - return sym; + /* Mark this import as searched so that the recursive call does not + search it again. */ + current->searched = 1; + searched_cleanup = make_cleanup (reset_directive_searched, current); + + sym = cp_lookup_symbol_namespace (current->import_src, + name, + linkage_name, + block, + domain, + 0); + + current->searched = 0; + discard_cleanups (searched_cleanup); + + if (sym != NULL) + return sym; } } return NULL; } - /* Searches for NAME in the current namespace, and by applying relevant import statements belonging to BLOCK and its parents. SCOPE is the namespace scope of the context in which the search is being evaluated. */ @@ -357,14 +405,16 @@ cp_lookup_symbol_namespace (const char *scope, const char *name, const char *linkage_name, const struct block *block, - const domain_enum domain) + const domain_enum domain, + const int search_parents) { struct symbol *sym; /* Search for name in namespaces imported to this and parent blocks. */ while (block != NULL) { - sym = cp_lookup_symbol_imports (scope,name, linkage_name, block, domain); + sym = cp_lookup_symbol_imports (scope, name, linkage_name, block, domain, + search_parents); if (sym) return sym; diff --git a/gdb/cp-support.h b/gdb/cp-support.h index 7ecd201..9400469 100644 --- a/gdb/cp-support.h +++ b/gdb/cp-support.h @@ -47,6 +47,9 @@ struct using_direct char *import_src; char *import_dest; struct using_direct *next; + + /* Used during import search to temporarily mark this node as searched. */ + int searched; }; @@ -107,7 +110,8 @@ extern struct symbol *cp_lookup_symbol_namespace (const char *namespace, const char *name, const char *linkage_name, const struct block *block, - const domain_enum domain); + const domain_enum domain, + const int search_parents); extern struct type *cp_lookup_nested_type (struct type *parent_type, const char *nested_name, diff --git a/gdb/valops.c b/gdb/valops.c index 012ea6a..6fdea95 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -2765,7 +2765,7 @@ value_maybe_namespace_elt (const struct type *curtype, sym = cp_lookup_symbol_namespace (namespace_name, name, NULL, get_selected_block (0), - VAR_DOMAIN); + VAR_DOMAIN, 1); if (sym == NULL) return NULL; --------------000508000506010605020000--