diff options
| author | markj <markj@FreeBSD.org> | 2015-10-24 03:14:36 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-10-24 03:14:36 +0000 |
| commit | 3ef7519b6e055158d1266eb7951bd9a932dcb96c (patch) | |
| tree | da0ff7e0ab9c072602c9ad827494a37642d266a0 | |
| parent | 4e270a2ef393d4631c06bc944d7ab68c51232cb5 (diff) | |
| download | FreeBSD-src-3ef7519b6e055158d1266eb7951bd9a932dcb96c.zip FreeBSD-src-3ef7519b6e055158d1266eb7951bd9a932dcb96c.tar.gz | |
DWARF emitted by clang 3.7 encodes array sizes using the DW_AT_count
attribute rather than DW_AT_upper_bound. Teach ctfconvert about this so that
array type sizes are encoded correctly.
PR: 203772
MFC after: 1 week
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index b7cb66f..e439f04 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -683,6 +683,10 @@ tdesc_array_create(dwarf_t *dw, Dwarf_Die dim, tdesc_t *arrtdp, ar->ad_nelems = uval + 1; else if (die_signed(dw, dim, DW_AT_upper_bound, &sval, 0)) ar->ad_nelems = sval + 1; + else if (die_unsigned(dw, dim, DW_AT_count, &uval, 0)) + ar->ad_nelems = uval; + else if (die_signed(dw, dim, DW_AT_count, &sval, 0)) + ar->ad_nelems = sval; else ar->ad_nelems = 0; |
