Re: [RFA] Fix c++/16253 (tag/variable name collision)

[Keith Seitz <keiths@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

On 03/26/2014 06:40 AM, Joel Brobecker wrote:
> Hey again, Keith,
>
> Would you mind committing the ada-tasks.c change now, and separately
> from the rest? It's an improvement on its own. FTR, I tested this part
> of the patch isolated from the rest on x86_64-linux.

Sure. I've pushed the following patch/ChangeLog.

Keith

ChangeLog
2014-03-26  Keith Seitz  <keiths@redhat.com>

	* ada-tasks.c (get_tcb_types_info): Search STRUCT_DOMAIN for
	types, not VAR_DOMAIN.


[-- Attachment #2: ada-tasks.c-STRUCT_DOMAIN.patch --]
[-- Type: text/x-patch, Size: 1590 bytes --]

diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 8b37f51..585c1f6 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -470,24 +470,24 @@ get_tcb_types_info (void)
      C-like) lookups to get the first match.  */
 
   struct symbol *atcb_sym =
-    lookup_symbol_in_language (atcb_name, NULL, VAR_DOMAIN,
+    lookup_symbol_in_language (atcb_name, NULL, STRUCT_DOMAIN,
 			       language_c, NULL);
   const struct symbol *common_atcb_sym =
-    lookup_symbol_in_language (common_atcb_name, NULL, VAR_DOMAIN,
+    lookup_symbol_in_language (common_atcb_name, NULL, STRUCT_DOMAIN,
 			       language_c, NULL);
   const struct symbol *private_data_sym =
-    lookup_symbol_in_language (private_data_name, NULL, VAR_DOMAIN,
+    lookup_symbol_in_language (private_data_name, NULL, STRUCT_DOMAIN,
 			       language_c, NULL);
   const struct symbol *entry_call_record_sym =
-    lookup_symbol_in_language (entry_call_record_name, NULL, VAR_DOMAIN,
+    lookup_symbol_in_language (entry_call_record_name, NULL, STRUCT_DOMAIN,
 			       language_c, NULL);
 
   if (atcb_sym == NULL || atcb_sym->type == NULL)
     {
       /* In Ravenscar run-time libs, the  ATCB does not have a dynamic
          size, so the symbol name differs.  */
-      atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL, VAR_DOMAIN,
-					    language_c, NULL);
+      atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL,
+					    STRUCT_DOMAIN, language_c, NULL);
 
       if (atcb_sym == NULL || atcb_sym->type == NULL)
         error (_("Cannot find Ada_Task_Control_Block type. Aborting"));