X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=libctf%2Fctf-lookup.c;h=d95e53706c132419b688925e41638139b779c76e;hb=4c6ee6465acc58f0f86c44668c4e862901186239;hp=4089ad9ffa4f86253722f83eb0d90b401f5c5f84;hpb=942d35f72bea5a0d19a5d0e0a5ca533e37a88b2c;p=deliverable%2Fbinutils-gdb.git

diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c
index 4089ad9ffa..d95e53706c 100644
--- a/libctf/ctf-lookup.c
+++ b/libctf/ctf-lookup.c
@@ -1,5 +1,5 @@
-/* Type lookup.
-   Copyright (C) 2019 Free Software Foundation, Inc.
+/* Symbol, variable and name lookup.
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
    This file is part of libctf.
 
@@ -161,8 +161,8 @@ ctf_lookup_by_name (ctf_file_t *fp, const char *name)
 		    }
 		}
 
-	      if ((type = ctf_hash_lookup_type (lp->ctl_hash, fp,
-						fp->ctf_tmp_typeslice)) == 0)
+	      if ((type = ctf_lookup_by_rawhash (fp, lp->ctl_hash,
+						 fp->ctf_tmp_typeslice)) == 0)
 		{
 		  (void) ctf_set_errno (fp, ECTF_NOTYPE);
 		  goto err;
@@ -322,13 +322,6 @@ ctf_lookup_by_id (ctf_file_t **fpp, ctf_id_t type)
       return NULL;
     }
 
-  idx = LCTF_TYPE_TO_INDEX (fp, type);
-  if (idx > 0 && (unsigned long) idx <= fp->ctf_typemax)
-    {
-      *fpp = fp;		/* Function returns ending CTF container.  */
-      return (LCTF_INDEX_TO_TYPEPTR (fp, idx));
-    }
-
   /* If this container is writable, check for a dynamic type.  */
 
   if (fp->ctf_flags & LCTF_RDWR)
@@ -340,7 +333,19 @@ ctf_lookup_by_id (ctf_file_t **fpp, ctf_id_t type)
 	  *fpp = fp;
 	  return &dtd->dtd_data;
 	}
+      (void) ctf_set_errno (*fpp, ECTF_BADID);
+      return NULL;
     }
+
+  /* Check for a type in the static portion.  */
+
+  idx = LCTF_TYPE_TO_INDEX (fp, type);
+  if (idx > 0 && (unsigned long) idx <= fp->ctf_typemax)
+    {
+      *fpp = fp;		/* Function returns ending CTF container.  */
+      return (LCTF_INDEX_TO_TYPEPTR (fp, idx));
+    }
+
   (void) ctf_set_errno (*fpp, ECTF_BADID);
   return NULL;
 }