Merge GDB 7.5.1

gdb/dictionary.c

 /* Routines for name->symbol lookups in GDB.
    
    Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc.
 
    Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
    Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
@@ skipping 480 matching lines @@
 }
 
 /* Add SYM to DICT.  DICT had better be expandable.  */
 
 void
 dict_add_symbol (struct dictionary *dict, struct symbol *sym)
 {
   (DICT_VECTOR (dict))->add_symbol (dict, sym);
 }
 
+/* Utility to add a list of symbols to a dictionary.
+   DICT must be an expandable dictionary.  */
+
+void
+dict_add_pending (struct dictionary *dict, const struct pending *symbol_list)
+{
+  const struct pending *list;
+  int i;
+
+  for (list = symbol_list; list != NULL; list = list->next)
+    {
+      for (i = 0; i < list->nsyms; ++i)
+        dict_add_symbol (dict, list->symbol[i]);
+    }
+}
+
 /* Initialize ITERATOR to point at the first symbol in DICT, and
    return that first symbol, or NULL if DICT is empty.  */
 
 struct symbol *
 dict_iterator_first (const struct dictionary *dict,
                      struct dict_iterator *iterator)
 {
   return (DICT_VECTOR (dict))->iterator_first (dict, iterator);
 }
 
@@ skipping 282 matching lines @@
     {
       if (strncmp (string, "_ada_", 5) == 0)
         string += 5;
       else
         return msymbol_hash_iw (string0);
     }
 
   hash = 0;
   while (*string)
     {
+      /* Ignore "TKB" suffixes.
+
+         These are used by Ada for subprograms implementing a task body.
+         For instance for a task T inside package Pck, the name of the
+         subprogram implementing T's body is `pck__tTKB'.  We need to
+         ignore the "TKB" suffix because searches for this task body
+         subprogram are going to be performed using `pck__t' (the encoded
+         version of the natural name `pck.t').  */
+      if (strcmp (string, "TKB") == 0)
+        return hash;
+
       switch (*string)
         {
         case '$':
         case '.':
         case 'X':
           if (string0 == string)
             return msymbol_hash_iw (string0);
           else
             return hash;
         case ' ':
@@ skipping 103 matching lines @@
     {
       DICT_LINEAR_EXPANDABLE_CAPACITY (dict) *= 2;
       DICT_LINEAR_SYMS (dict)
         = xrealloc (DICT_LINEAR_SYMS (dict),
                     DICT_LINEAR_EXPANDABLE_CAPACITY (dict)
                     * sizeof (struct symbol *));
     }
 
   DICT_LINEAR_SYM (dict, nsyms - 1) = sym;
 }