d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of forward enum declarations in the CTF tools.

Browse Source 
Reported by:	mmacy
MFC after:	2 weeks
This commit is contained in:
Mark Johnston 2016-08-13 19:51:00 +00:00
parent 842ee21e20
commit eb9da1ada8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
View File

@ -816,6 +816,11 @@ die_enum_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
Dwarf_Unsigned uval;
Dwarf_Signed sval;
if (die_isdecl(dw, die)) {
tdp->t_type = FORWARD;
return;
}
debug(3, "die %llu: creating enum\n", off);
tdp->t_type = ENUM;

3
cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
View File

@ -338,7 +338,8 @@ fwd_equiv(tdesc_t *ctdp, tdesc_t *mtdp)
{
tdesc_t *defn = (ctdp->t_type == FORWARD ? mtdp : ctdp);
return (defn->t_type == STRUCT || defn->t_type == UNION);
return (defn->t_type == STRUCT || defn->t_type == UNION ||
defn->t_type == ENUM);
}
static int