diff options
| author | markj <markj@FreeBSD.org> | 2015-08-28 00:38:18 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-08-28 00:38:18 +0000 |
| commit | 251669654ae50bb6b39f71a6524c152123e2bcc8 (patch) | |
| tree | ebd9a16f739b05722bf3e06e09307bbadc0e4d4e /cddl | |
| parent | c72177e471c9cc05ee69bc29d21438009fd3b847 (diff) | |
| download | FreeBSD-src-251669654ae50bb6b39f71a6524c152123e2bcc8.zip FreeBSD-src-251669654ae50bb6b39f71a6524c152123e2bcc8.tar.gz | |
Re-apply r274569. It was reverted in r276848 since that appeared to fix
some ctfmerge crashes that started to occur on i386 weeks after r274569 was
committed. Some later investigation indicated that the crashes were caused
by malformed CTF info that led to a stack overflow. The issue with CTF
info in i386 kernels seems to have been resolved by r261246, which updated
libdwarf and libelf.
r274569 fixes a bug which caused duplicate types to appear in the kernel's
CTF info. This duplication generally does not cause problems when using
DTrace, but makes it easier to hit the limit of 2^15 - 1 distinct type
definitions in a CTF container.
MFC after: 2 weeks
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c index 27966af..d366f31 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c @@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, equiv_data_t *ed) int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; - if (ctdp->t_emark > ed->ed_clear_mark || + if (ctdp->t_emark > ed->ed_clear_mark && mtdp->t_emark > ed->ed_clear_mark) return (ctdp->t_emark == mtdp->t_emark); |
