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@joyent.com> MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
2c30bc1fcf
commit
7e00348e76
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=274564
@ -766,7 +766,8 @@ die_array_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private)
|
|||||||
debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
|
debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
|
||||||
tdp->t_ardef->ad_contents->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",
|
debug(3, "unable to resolve array %s (%d) contents %d\n",
|
||||||
tdesc_name(tdp), tdp->t_id,
|
tdesc_name(tdp), tdp->t_id,
|
||||||
tdp->t_ardef->ad_contents->t_id);
|
tdp->t_ardef->ad_contents->t_id);
|
||||||
@ -1138,12 +1139,17 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* For empty members, or GCC/C99 flexible array
|
* 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)
|
if (mt->t_members == NULL)
|
||||||
continue;
|
continue;
|
||||||
if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
|
if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
|
||||||
continue;
|
continue;
|
||||||
|
if ((mt->t_flags & TDESC_F_RESOLVED) != 0 &&
|
||||||
|
(mt->t_type == STRUCT || mt->t_type == UNION))
|
||||||
|
continue;
|
||||||
|
|
||||||
dw->dw_nunres++;
|
dw->dw_nunres++;
|
||||||
return (1);
|
return (1);
|
||||||
|
Loading…
Reference in New Issue
Block a user