From: Joel Brobecker Date: Wed, 1 Apr 2015 22:46:54 +0000 (-0700) Subject: [Ada] Resolve dynamic type before trying to print it. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62c67f3c1a10e4082641bafb7e7fd80c93b526b4;p=binutils-gdb.git [Ada] Resolve dynamic type before trying to print it. This is another required step towards trying to print the value of an array of variant records. For instance: A1 : Array_Type := (1 => (I => 0, S => <>), 2 => (I => 1, S => "A"), 3 => (I => 2, S => "AB")); ... where Array_Type is an array of records whose size is variable: subtype Small_Type is Integer range 0 .. 10; type Record_Type (I : Small_Type := 0) is record S : String (1 .. I); end record; type Array_Type is array (Integer range <>) of Record_Type; What happens is that the ada-valprint modules gets passed an array whose element type is not resolved yet (since each element of the array needs to be resolved separately). the module then recurses, and eventually gets called with the first element of the array. But because the element hasn't been resolved yet, we end up having trouble printing its value soon after. This patch fixes the issue by calling resolve_dynamic_type before trying to print it. With this patch, GDB is finally able to print the complete value for variable "A1": (gdb) p a1 $1 = ((i => 0, s => ""), (i => 1, s => "A"), (i => 2, s => "AB")) gdb/ChangeLog: * ada-valprint.c (ada_val_print_1): Resolve TYPE before trying to print it. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5233c6d297c..5b52c373767 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-05-05 Joel Brobecker + + * ada-valprint.c (ada_val_print_1): Resolve TYPE before trying + to print it. + 2015-05-05 Joel Brobecker * dwarf2loc.h (struct property_addr_info): Add "valaddr" field. diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index 34539de3cab..720854e2cad 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -1095,6 +1095,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr, offset_aligned = offset + ada_aligned_value_addr (type, valaddr) - valaddr; type = printable_val_type (type, valaddr + offset_aligned); + type = resolve_dynamic_type (type, valaddr + offset_aligned, + address + offset_aligned); switch (TYPE_CODE (type)) {