Fix PR 19494: hang when killing unfollowed fork children

[deliverable/binutils-gdb.git] / gdb / d-namespace.c

diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c
index 9e0071089ee60394ad5218e66451b9a6972cf297..bcd0f45e7521606fb937375e2f78965f54e7c1d2 100644 (file)
--- a/gdb/d-namespace.c
+++ b/gdb/d-namespace.c
@@ -1,6 +1,6 @@
 /* Helper routines for D support in GDB.
 
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
+   Copyright (C) 2014-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -74,7 +74,8 @@ d_entire_prefix_len (const char *name)
    symbol.  Other arguments are as in d_lookup_symbol_nonlocal.  */
 
 static struct block_symbol
-d_lookup_symbol (const char *name, const struct block *block,
+d_lookup_symbol (const struct language_defn *langdef,
+                const char *name, const struct block *block,
                 const domain_enum domain, int search)
 {
   struct block_symbol sym;
@@ -83,6 +84,23 @@ d_lookup_symbol (const char *name, const struct block *block,
   if (sym.symbol != NULL)
     return sym;
 
+  /* If we didn't find a definition for a builtin type in the static block,
+     such as "ucent" which is a specialist type, search for it now.  */
+  if (langdef != NULL && domain == VAR_DOMAIN)
+    {
+      struct gdbarch *gdbarch;
+
+      if (block == NULL)
+       gdbarch = target_gdbarch ();
+      else
+       gdbarch = block_gdbarch (block);
+      sym.symbol
+       = language_lookup_primitive_type_as_symbol (langdef, gdbarch, name);
+      sym.block = NULL;
+      if (sym.symbol != NULL)
+       return sym;
+    }
+
   sym = lookup_global_symbol (name, block, domain);
 
   if (sym.symbol != NULL)
@@ -114,7 +132,7 @@ d_lookup_symbol (const char *name, const struct block *block,
          if (lang_this.symbol == NULL)
            {
              do_cleanups (cleanup);
-             return (struct block_symbol) {NULL, NULL};
+             return null_block_symbol;
            }
 
          type = check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (lang_this.symbol)));
@@ -141,7 +159,7 @@ d_lookup_symbol (const char *name, const struct block *block,
       if (class_sym.symbol == NULL)
        {
          do_cleanups (cleanup);
-         return (struct block_symbol) {NULL, NULL};
+         return null_block_symbol;
        }
 
       /* Look for a symbol named NESTED in this class.  */
@@ -174,7 +192,7 @@ d_lookup_symbol_in_module (const char *module, const char *name,
       name = concatenated_name;
     }
 
-  return d_lookup_symbol (name, block, domain, search);
+  return d_lookup_symbol (NULL, name, block, domain, search);
 }
 
 /* Lookup NAME at module scope.  SCOPE is the module that the current
@@ -190,7 +208,8 @@ d_lookup_symbol_in_module (const char *module, const char *name,
    and if that call fails, then the first call looks for "x".  */
 
 static struct block_symbol
-lookup_module_scope (const char *name, const struct block *block,
+lookup_module_scope (const struct language_defn *langdef,
+                    const char *name, const struct block *block,
                     const domain_enum domain, const char *scope,
                     int scope_len)
 {
@@ -210,14 +229,22 @@ lookup_module_scope (const char *name, const struct block *block,
          new_scope_len++;
        }
       new_scope_len += d_find_first_component (scope + new_scope_len);
-      sym = lookup_module_scope (name, block, domain,
+      sym = lookup_module_scope (langdef, name, block, domain,
                                 scope, new_scope_len);
       if (sym.symbol != NULL)
        return sym;
     }
 
   /* Okay, we didn't find a match in our children, so look for the
-     name in the current module.  */
+     name in the current module.
+
+     If we there is no scope and we know we have a bare symbol, then short
+     circuit everything and call d_lookup_symbol directly.
+     This isn't an optimization, rather it allows us to pass LANGDEF which
+     is needed for primitive type lookup.  */
+
+  if (scope_len == 0 && strchr (name, '.') == NULL)
+    return d_lookup_symbol (langdef, name, block, domain, 1);
 
   module = (char *) alloca (scope_len + 1);
   strncpy (module, scope, scope_len);
@@ -343,7 +370,7 @@ d_lookup_nested_symbol (struct type *parent_type,
 
     case TYPE_CODE_FUNC:
     case TYPE_CODE_METHOD:
-      return (struct block_symbol) {NULL, NULL};
+      return null_block_symbol;
 
     default:
       gdb_assert_not_reached ("called with non-aggregate type.");
@@ -465,7 +492,7 @@ d_lookup_symbol_imports (const char *scope, const char *name,
                  /* If the alias matches the sought name.  Pass
                     current->import_src as the NAME to direct the
                     search towards the aliased module.  */
-                 sym = lookup_module_scope (current->import_src, block,
+                 sym = lookup_module_scope (NULL, current->import_src, block,
                                             domain, scope, 0);
                }
              else
@@ -503,7 +530,7 @@ d_lookup_symbol_imports (const char *scope, const char *name,
        }
     }
 
-  return (struct block_symbol) {NULL, NULL};
+  return null_block_symbol;
 }
 
 /* Searches for NAME in the current module, and by applying relevant
@@ -535,7 +562,7 @@ d_lookup_symbol_module (const char *scope, const char *name,
       block = BLOCK_SUPERBLOCK (block);
     }
 
-  return (struct block_symbol) {NULL, NULL};
+  return null_block_symbol;
 }
 
 /* The D-specific version of name lookup for static and global names
@@ -554,7 +581,7 @@ d_lookup_symbol_nonlocal (const struct language_defn *langdef,
   struct block_symbol sym;
   const char *scope = block_scope (block);
 
-  sym = lookup_module_scope (name, block, domain, scope, 0);
+  sym = lookup_module_scope (langdef, name, block, domain, scope, 0);
   if (sym.symbol != NULL)
     return sym;