Merge GDB 7.5.1

gdb/cp-namespace.c

 /* Helper routines for C++ support in GDB.
    Copyright (C) 2003-2004, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by David Carlton and by Kealia, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 642 matching lines @@
         sym = lookup_symbol_aux_block (name, global_block, domain);
     }
   else
     {
       sym = lookup_symbol_global (name, block, domain);
     }
 
   return sym;
 }
 
-/* Look up a type named NESTED_NAME that is nested inside the C++
+/* Look up a symbol named NESTED_NAME that is nested inside the C++
    class or namespace given by PARENT_TYPE, from within the context
    given by BLOCK.  Return NULL if there is no such nested type.  */
 
-struct type *
-cp_lookup_nested_type (struct type *parent_type,
-                       const char *nested_name,
-                       const struct block *block)
+struct symbol *
+cp_lookup_nested_symbol (struct type *parent_type,
+                         const char *nested_name,
+                         const struct block *block)
 {
   /* type_name_no_tag_required provides better error reporting using the
      original type.  */
   struct type *saved_parent_type = parent_type;
 
   CHECK_TYPEDEF (parent_type);
 
   switch (TYPE_CODE (parent_type))
     {
     case TYPE_CODE_STRUCT:
     case TYPE_CODE_NAMESPACE:
     case TYPE_CODE_UNION:
       {
         /* NOTE: carlton/2003-11-10: We don't treat C++ class members
            of classes like, say, data or function members.  Instead,
            they're just represented by symbols whose names are
            qualified by the name of the surrounding class.  This is
            just like members of namespaces; in particular,
            lookup_symbol_namespace works when looking them up.  */
 
         const char *parent_name = type_name_no_tag_or_error (saved_parent_type);
         struct symbol *sym
           = cp_lookup_symbol_in_namespace (parent_name, nested_name,
                                            block, VAR_DOMAIN);
         char *concatenated_name;
 
-        if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
-          return SYMBOL_TYPE (sym);
+        if (sym != NULL)
+          return sym;
 
         /* Now search all static file-level symbols.  Not strictly
            correct, but more useful than an error.  We do not try to
            guess any imported namespace as even the fully specified
            namespace seach is is already not C++ compliant and more
            assumptions could make it too magic.  */
 
         concatenated_name = alloca (strlen (parent_name) + 2
                                     + strlen (nested_name) + 1);
         sprintf (concatenated_name, "%s::%s",
                  parent_name, nested_name);
-        sym = lookup_static_symbol_aux (concatenated_name,
-                                        VAR_DOMAIN);
-        if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
-          return SYMBOL_TYPE (sym);
+        sym = lookup_static_symbol_aux (concatenated_name, VAR_DOMAIN);
+        if (sym != NULL)
+          return sym;
 
         return NULL;
       }
     default:
       internal_error (__FILE__, __LINE__,
-                      _("cp_lookup_nested_type called "
+                      _("cp_lookup_nested_symbol called "
                         "on a non-aggregate type."));
     }
 }
 
 /* The C++-version of lookup_transparent_type.  */
 
 /* FIXME: carlton/2004-01-16: The problem that this is trying to
    address is that, unfortunately, sometimes NAME is wrong: it may not
    include the name of namespaces enclosing the type in question.
    lookup_transparent_type gets called when the type in question
@@ skipping 77 matching lines @@
 _initialize_cp_namespace (void)
 {
   struct cmd_list_element *cmd;
 
   cmd = add_cmd ("namespace", class_maintenance,
                  maintenance_cplus_namespace,
                  _("Deprecated placeholder for removed functionality."),
                  &maint_cplus_cmd_list);
   deprecate_cmd (cmd, NULL);
 }