* [PATCH] Fix bug in dynamic type resolution
@ 2021-09-29 20:01 Tom Tromey
2021-10-19 19:03 ` Tom Tromey
0 siblings, 1 reply; 2+ messages in thread
From: Tom Tromey @ 2021-09-29 20:01 UTC (permalink / raw)
To: gdb-patches; +Cc: Tom Tromey
A customer-reported problem led us to a bug in dynamic type
resolution. resolve_dynamic_struct will recursively call
resolve_dynamic_type_internal, passing it the sub-object for the
particular field being resolved. While it offsets the address here,
it does not also offset the "valaddr" -- the array of bytes describing
the memory.
This patch fixes the bug, by offsetting both. A test case is included
that can be used to reproduce the bug.
---
gdb/gdbtypes.c | 7 ++++---
gdb/testsuite/gdb.ada/array_of_variant.exp | 11 +++++++++++
gdb/testsuite/gdb.ada/array_of_variant/p.adb | 20 ++++++++++++++++++++
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index be7c74ac6cf..a117d01dcee 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -2614,10 +2614,11 @@ resolve_dynamic_struct (struct type *type,
" (invalid location kind)"));
pinfo.type = check_typedef (resolved_type->field (i).type ());
+ size_t offset = TYPE_FIELD_BITPOS (resolved_type, i) / TARGET_CHAR_BIT;
pinfo.valaddr = addr_stack->valaddr;
- pinfo.addr
- = (addr_stack->addr
- + (TYPE_FIELD_BITPOS (resolved_type, i) / TARGET_CHAR_BIT));
+ if (!pinfo.valaddr.empty ())
+ pinfo.valaddr = pinfo.valaddr.slice (offset);
+ pinfo.addr = addr_stack->addr + offset;
pinfo.next = addr_stack;
resolved_type->field (i).set_type
diff --git a/gdb/testsuite/gdb.ada/array_of_variant.exp b/gdb/testsuite/gdb.ada/array_of_variant.exp
index 6372e2cf354..f8f4d9c130b 100644
--- a/gdb/testsuite/gdb.ada/array_of_variant.exp
+++ b/gdb/testsuite/gdb.ada/array_of_variant.exp
@@ -97,4 +97,15 @@ foreach_with_prefix scenario {all minimal} {
[string_to_regexp "$v2"] \
"python print second array element"
}
+
+ set av1 "(initial => 0, rest => (tag => unused, cval => 88 'X'))"
+ set av2 "(initial => 0, rest => (tag => object, ival => 88))"
+ set full "($av1, $av2)"
+
+ gdb_test "print another_array(1)" " = [string_to_regexp $av1]" \
+ "print first element of another_array"
+ gdb_test "print another_array(2)" " = [string_to_regexp $av2]" \
+ "print second element of another_array"
+ gdb_test "print another_array" " = [string_to_regexp $full]" \
+ "print another_array"
}
diff --git a/gdb/testsuite/gdb.ada/array_of_variant/p.adb b/gdb/testsuite/gdb.ada/array_of_variant/p.adb
index c475eb403f5..bf087af81b5 100644
--- a/gdb/testsuite/gdb.ada/array_of_variant/p.adb
+++ b/gdb/testsuite/gdb.ada/array_of_variant/p.adb
@@ -33,7 +33,27 @@ procedure P is
Objects : array (1 .. 2) of Payload_T;
+ type Another_Type (Tag : Tag_T := Unused) is
+ record
+ case Tag is
+ when Unused =>
+ CVal : Character;
+ when Object =>
+ IVal : Integer;
+ end case;
+ end record;
+
+ type Enclosing is record
+ Initial : Integer;
+ Rest : Another_Type;
+ end record;
+
+ Another_Array : array (1 .. 2) of Enclosing
+ := ((Initial => 0, Rest => (Tag => Unused, CVal => 'X')),
+ (Initial => 0, Rest => (Tag => Object, IVal => 88)));
+
begin
Objects (1) := (Tag => Object, Values => (others => 2));
Do_Nothing (Objects'Address); -- START
+ Do_Nothing (Another_Array'Address);
end P;
--
2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix bug in dynamic type resolution
2021-09-29 20:01 [PATCH] Fix bug in dynamic type resolution Tom Tromey
@ 2021-10-19 19:03 ` Tom Tromey
0 siblings, 0 replies; 2+ messages in thread
From: Tom Tromey @ 2021-10-19 19:03 UTC (permalink / raw)
To: Tom Tromey via Gdb-patches; +Cc: Tom Tromey
>>>>> "Tom" == Tom Tromey via Gdb-patches <gdb-patches@sourceware.org> writes:
Tom> A customer-reported problem led us to a bug in dynamic type
Tom> resolution. resolve_dynamic_struct will recursively call
Tom> resolve_dynamic_type_internal, passing it the sub-object for the
Tom> particular field being resolved. While it offsets the address here,
Tom> it does not also offset the "valaddr" -- the array of bytes describing
Tom> the memory.
Tom> This patch fixes the bug, by offsetting both. A test case is included
Tom> that can be used to reproduce the bug.
I'm checking this in now.
Tom
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-19 19:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-29 20:01 [PATCH] Fix bug in dynamic type resolution Tom Tromey
2021-10-19 19:03 ` Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).