[PATCH,V2 4/5] CTF: add all members of an enum type to psymtab

[Weimin Pan via Gdb-patches <gdb-patches@sourceware.org>]

With the following change which was made last April:

    [gdb] Use partial symbol table to find language for main
    commit d3214198119c1a2f9a6a2b8fcc56d8c324e1a245

The ctf reader was modified to enter all members of an enum type,
similar to what the dwarf2 reader did, into the psymtab or gdb
won't be able to find them. In addition, the empty name checking
needed to be moved down so members of a unnamed enum were not left
out. 

---
 gdb/ChangeLog |  5 +++++
 gdb/ctfread.c | 30 +++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dac61a3..31cac5c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2021-02-26  Weimin Pan  <weimin.pan@oracle.com>
 
+	* ctfread.c (ctf_psymtab_add_enums): New function.
+	(ctf_psymtab_type_cb): call ctf_psymtab_add_enums.
+
+2021-02-26  Weimin Pan  <weimin.pan@oracle.com>
+
 	* ctfread.c (fetch_tid_type): New function, use throughout file.
 	(read_forward_type): New function.
 	(read_type_record): Call read_forward_type.
diff --git a/gdb/ctfread.c b/gdb/ctfread.c
index d3e6ad5..bb73949 100644
--- a/gdb/ctfread.c
+++ b/gdb/ctfread.c
@@ -1294,6 +1294,27 @@ struct ctf_tid_and_type
   return result;
 }
 
+/* Add all members of an enum with type TID to partial symbol table.  */
+
+static void
+ctf_psymtab_add_enums (struct ctf_context *ccp, ctf_id_t tid)
+{
+  int val;
+  const char *ename;
+  ctf_next_t *i = NULL;
+
+  while ((ename = ctf_enum_next (ccp->fp, tid, &i, &val)) != NULL)
+    {
+      ccp->pst->add_psymbol (ename, true,
+			     VAR_DOMAIN, LOC_CONST, -1,
+			     psymbol_placement::GLOBAL,
+			     0, language_c, ccp->of);
+    }
+  if (ctf_errno (ccp->fp) != ECTF_NEXT_END)
+    complaint (_("ctf_enum_next ctf_psymtab_add_enums failed - %s"),
+	       ctf_errmsg (ctf_errno (ccp->fp)));
+}
+
 /* Read in full symbols for PST, and anything it depends on.  */
 
 void
@@ -1415,17 +1436,17 @@ struct ctf_tid_and_type
 
   ccp = (struct ctf_context *) arg;
   gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (ccp->fp, tid));
-  if (name == NULL || strlen (name.get ()) == 0)
-    return 0;
 
   domain_enum domain = UNDEF_DOMAIN;
   enum address_class aclass = LOC_UNDEF;
   kind = ctf_type_kind (ccp->fp, tid);
   switch (kind)
     {
+      case CTF_K_ENUM:
+	ctf_psymtab_add_enums (ccp, tid);
+	/* FALL THROUGH */
       case CTF_K_STRUCT:
       case CTF_K_UNION:
-      case CTF_K_ENUM:
 	domain = STRUCT_DOMAIN;
 	aclass = LOC_TYPEDEF;
 	break;
@@ -1456,6 +1477,9 @@ struct ctf_tid_and_type
 	return 0;
     }
 
+  if (name == NULL || strlen (name.get ()) == 0)
+    return 0;
+
   ccp->pst->add_psymbol (name.get (), true,
 			 domain, aclass, section,
 			 psymbol_placement::GLOBAL,
-- 
1.8.3.1