From cae21f8ebf01e379150bcf602a9ffb1f7c95b59e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 30 Sep 2020 09:46:36 -0600 Subject: Fix regression in variant part handling My series to change DWARF attribute handling to be type-safe introduced a regression in gdb.ada/variant.exp. handle_variant was using as_unsigned on an attribute with DW_FORM_sdata. This patch changes it to use constant_value instead. 2020-09-30 Tom Tromey * dwarf2/read.c (handle_variant): Use constant_value. --- gdb/dwarf2/read.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/dwarf2/read.c') diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index bcac94e..c0a89ec 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -16178,7 +16178,7 @@ handle_variant (struct die_info *die, struct type *type, /* In a variant we want to get the discriminant and also add a field for our sole member child. */ struct attribute *discr = dwarf2_attr (die, DW_AT_discr_value, cu); - if (discr == nullptr) + if (discr == nullptr || !discr->form_is_constant ()) { discr = dwarf2_attr (die, DW_AT_discr_list, cu); if (discr == nullptr || discr->as_block ()->size == 0) @@ -16187,7 +16187,7 @@ handle_variant (struct die_info *die, struct type *type, variant.discr_list_data = discr->as_block (); } else - variant.discriminant_value = discr->as_unsigned (); + variant.discriminant_value = discr->constant_value (0); for (die_info *variant_child = die->child; variant_child != NULL; -- cgit v1.1