From 0fc9922abc6ac20739319e0ec1ca03eafa0ebb94 Mon Sep 17 00:00:00 2001 From: David Carlton Date: Fri, 13 Jun 2003 00:55:43 +0000 Subject: [PATCH] 2003-06-12 David Carlton * cp-namespace.c (cp_set_block_scope): Comment out processing_has_namespace_info branch. --- gdb/ChangeLog | 5 +++++ gdb/cp-namespace.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 613b6d2f075..4df86e14584 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2003-06-12 David Carlton + + * cp-namespace.c (cp_set_block_scope): Comment out + processing_has_namespace_info branch. + 2003-06-12 Jim Blandy Recognize and skip 64-bit PowerPC Linux linkage functions. diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index a4c7b8d3570..db0839fb837 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -38,6 +38,9 @@ unsigned char processing_has_namespace_info; contain the name of the current namespace. The string is temporary; copy it if you need it. */ +/* FIXME: carlton/2003-06-12: This isn't entirely reliable: currently, + we get mislead by DW_AT_specification. */ + const char *processing_current_namespace; /* List of using directives that are active in the current file. */ @@ -187,6 +190,12 @@ cp_set_block_scope (const struct symbol *symbol, if (SYMBOL_CPLUS_DEMANGLED_NAME (symbol) != NULL) { +#if 0 + /* FIXME: carlton/2003-06-12: As mentioned above, + 'processing_has_namespace_info' currently isn't entirely + reliable, so let's always use demangled names to get this + information for now. */ + if (processing_has_namespace_info) { block_set_scope @@ -196,6 +205,7 @@ cp_set_block_scope (const struct symbol *symbol, obstack); } else +#endif { /* Try to figure out the appropriate namespace from the demangled name. */ -- 2.30.2