binutils: Make DWARF register name lookup be via a function pointer

[deliverable/binutils-gdb.git] / binutils / debug.c

diff --git a/binutils/debug.c b/binutils/debug.c
index ee0d62e8ff9218cc3b854ed04d80112088402b94..925d84c07ca2adedf8a70476eccf8ca6fd9d716f 100644 (file)
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -1,6 +1,5 @@
 /* debug.c -- Handle generic debugging information.
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2005, 2007,
-   2009  Free Software Foundation, Inc.
+   Copyright (C) 1995-2019 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
    This file is part of GNU Binutils.
@@ -2420,6 +2419,9 @@ debug_write_type (struct debug_handle *info,
   int is;
   const char *tag = NULL;
 
+  if (type == DEBUG_TYPE_NULL)
+    return (*fns->empty_type) (fhandle);
+
   /* If we have a name for this type, just output it.  We only output
      typedef names after they have been defined.  We output type tags
      whenever we are not actually defining them.  */
@@ -2482,8 +2484,6 @@ debug_write_type (struct debug_handle *info,
       debug_error (_("debug_write_type: illegal type encountered"));
       return FALSE;
     case DEBUG_KIND_INDIRECT:
-      if (*type->u.kindirect->slot == DEBUG_TYPE_NULL)
-       return (*fns->empty_type) (fhandle);
       return debug_write_type (info, fns, fhandle, *type->u.kindirect->slot,
                               name);
     case DEBUG_KIND_VOID:
@@ -3156,6 +3156,7 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
             && t1->u.krange->upper == t2->u.krange->upper
             && debug_type_samep (info, t1->u.krange->type,
                                  t2->u.krange->type));
+      break;
 
     case DEBUG_KIND_ARRAY:
       ret = (t1->u.karray->lower == t2->u.karray->lower