From 16ff73dbec5b712d9c2db0b086d1bd8b16bb2f69 Mon Sep 17 00:00:00 2001 From: markj Date: Fri, 11 Sep 2015 02:53:22 +0000 Subject: MFC r274569, r276848, r287234: Only compare visitation counters if they've both been set for the current type graph walk. --- cddl/contrib/opensolaris/tools/ctf/cvt/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c index 2ef37d4..26b8d82 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c @@ -357,7 +357,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); -- cgit v1.1