diff options
| author | Tom Tromey <tromey@adacore.com> | 2021-03-15 06:23:12 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2021-03-15 06:23:12 -0600 |
| commit | 207582c0758738447d2df8f778aeebf126c73b31 (patch) | |
| tree | 986f9fbcef047e24e6742cb3f95e81102d4ec83d /gdb/ada-lang.c | |
| parent | 1996d0f12cd57391e01e0eebe32e44510e6ec17d (diff) | |
| download | gdb-207582c0758738447d2df8f778aeebf126c73b31.zip gdb-207582c0758738447d2df8f778aeebf126c73b31.tar.gz gdb-207582c0758738447d2df8f778aeebf126c73b31.tar.bz2 | |
Fix bug in Ada aggregate assignment
The expression rewrite caused a regression in the internal AdaCore
test suite. The bug was that I had dropped a bit of code from
aggregate assignment -- assign_aggregate used to return the container,
which I thought was redundant, but which can actually change during
the call. There was no test for this case in the tree, so I've added
one.
gdb/ChangeLog
2021-03-15 Tom Tromey <tromey@adacore.com>
* ada-lang.c (ada_aggregate_operation::assign_aggregate): Return
container.
(ada_assign_operation::evaluate): Update.
* ada-exp.h (class ada_aggregate_operation) <assign_aggregate>:
Change return type.
gdb/testsuite/ChangeLog
2021-03-15 Tom Tromey <tromey@adacore.com>
* gdb.ada/assign_arr/target_wrapper.ads (IArray, Put, Do_Nothing):
Declare.
* gdb.ada/assign_arr/target_wrapper.adb: New file.
* gdb.ada/assign_arr/main_p324_051.adb (IValue): New variable.
Call Put.
* gdb.ada/assign_arr.exp: Update.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index b2eff9d..ea43a25 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -9101,13 +9101,9 @@ ada_aggregate_component::assign (struct value *container, item->assign (container, lhs, exp, indices, low, high); } -/* Assuming that LHS represents an lvalue having a record or array - type, evaluate an assignment of this aggregate's value to LHS. - CONTAINER is an lvalue containing LHS (possibly LHS itself). Does - not modify the inferior's memory, nor does it modify the contents - of LHS (unless == CONTAINER). */ +/* See ada-exp.h. */ -void +value * ada_aggregate_operation::assign_aggregate (struct value *container, struct value *lhs, struct expression *exp) @@ -9144,6 +9140,8 @@ ada_aggregate_operation::assign_aggregate (struct value *container, std::get<0> (m_storage)->assign (container, lhs, exp, indices, low_index, high_index); + + return container; } bool @@ -9349,7 +9347,7 @@ ada_assign_operation::evaluate (struct type *expect_type, if (noside != EVAL_NORMAL) return arg1; - ag_op->assign_aggregate (arg1, arg1, exp); + arg1 = ag_op->assign_aggregate (arg1, arg1, exp); return ada_value_assign (arg1, arg1); } /* Force the evaluation of the rhs ARG2 to the type of the lhs ARG1, |