OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* ada-lang.c (ada_which_variant_applies): Correctly compute 

the value of the discriminant when the variant record is packed.
This commit is contained in:
Joel Brobecker 2008-01-05 15:44:53 +00:00
parent 6ec2edbe70
commit 0c281816be
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2008-01-05 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (ada_which_variant_applies): Correctly compute
the value of the discriminant when the variant record is packed.
2008-01-04 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (is_name_suffix): Handle middle-name numeric suffixes

13
gdb/ada-lang.c
View File

@ -6284,17 +6284,16 @@ ada_which_variant_applies (struct type *var_type, struct type *outer_type,
{
int others_clause;
int i;
int disp;
struct type *discrim_type;
char *discrim_name = ada_variant_discrim_name (var_type);
struct value *outer;
struct value *discrim;
LONGEST discrim_val;
disp = 0;
discrim_type =
ada_lookup_struct_elt_type (outer_type, discrim_name, 1, 1, &disp);
if (discrim_type == NULL)
outer = value_from_contents_and_address (outer_type, outer_valaddr, 0);
discrim = ada_value_struct_elt (outer, discrim_name, 1);
if (discrim == NULL)
return -1;
discrim_val = unpack_long (discrim_type, outer_valaddr + disp);
discrim_val = value_as_long (discrim);
others_clause = -1;
for (i = 0; i < TYPE_NFIELDS (var_type); i += 1)