aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/tools
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2015-10-24 03:14:36 +0000
committerMark Johnston <markj@FreeBSD.org>2015-10-24 03:14:36 +0000
commita4dc509f723944821bcfcc52005ff87c9a5dee5b (patch)
treeda0ff7e0ab9c072602c9ad827494a37642d266a0 /cddl/contrib/opensolaris/tools
parent872fb8b006edb2b9251d71cc85cc40b4d3731167 (diff)
downloadsrc-a4dc509f723944821bcfcc52005ff87c9a5dee5b.tar.gz
src-a4dc509f723944821bcfcc52005ff87c9a5dee5b.zip
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
Notes
Notes: svn path=/head/; revision=289866
Diffstat (limited to 'cddl/contrib/opensolaris/tools')
-rw-r--r--cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c4
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 b7cb66fee9ab..e439f04616af 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;