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

[Mark Johnston]

Author: markj
Date: Sun Nov 16 04:07:53 2014
New Revision: 274564
URL: https://svnweb.freebsd.org/changeset/base/274564

Log:
  Fix a couple of bugs around the handling of structs and unions of size zero.
  These would cause ctfconvert(1) to return an error when attempting to
  resolve valid C types.
  
  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/dwarf.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c	Sun Nov 16 04:02:50 2014	(r274563)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c	Sun Nov 16 04:07:53 2014	(r274564)
@@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t 
 	debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
 	    tdp->t_ardef->ad_contents->t_id);
 
-	if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0) {
+	if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 &&
+	    (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) {
 		debug(3, "unable to resolve array %s (%d) contents %d\n",
 		    tdesc_name(tdp), tdp->t_id,
 		    tdp->t_ardef->ad_contents->t_id);
@@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **
 
 			/*
 			 * For empty members, or GCC/C99 flexible array
-			 * members, a size of 0 is correct.
+			 * members, a size of 0 is correct. Structs and unions
+			 * consisting of flexible array members will also have
+			 * size 0.
 			 */
 			if (mt->t_members == NULL)
 				continue;
 			if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
 				continue;
+			if ((mt->t_flags & TDESC_F_RESOLVED) != 0 &&
+			    (mt->t_type == STRUCT || mt->t_type == UNION))
+				continue;
 
 			dw->dw_nunres++;
 			return (1);