Date: Wed, 31 Aug 2016 01:26:21 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r305105 - stable/11/cddl/contrib/opensolaris/tools/ctf/cvt Message-ID: <201608310126.u7V1QL5H059078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Wed Aug 31 01:26:21 2016 New Revision: 305105 URL: https://svnweb.freebsd.org/changeset/base/305105 Log: MFC r304055: Fix handling of forward enum declarations in the CTF tools. Modified: stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Aug 31 01:04:57 2016 (r305104) +++ stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Wed Aug 31 01:26:21 2016 (r305105) @@ -816,6 +816,11 @@ die_enum_create(dwarf_t *dw, Dwarf_Die d 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; Modified: stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Aug 31 01:04:57 2016 (r305104) +++ stable/11/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Wed Aug 31 01:26:21 2016 (r305105) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608310126.u7V1QL5H059078>