svn commit: r274569 - head/cddl/contrib/opensolaris/tools/ctf/cvt

[Mark Johnston]

Author: markj
Date: Sun Nov 16 04:13:42 2014
New Revision: 274569
URL: https://svnweb.freebsd.org/changeset/base/274569

Log:
  Only compare visitation counters if they've both been set for the current
  type graph walk.
  
  Reviewed by:	Robert Mustacchi <rm at joyent.com>
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c	Sun Nov 16 04:13:09 2014	(r274568)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c	Sun Nov 16 04:13:42 2014	(r274569)
@@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp,
 	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);