[PATCH 04/28] Don't write to inferior_ptid in gdbarch-selftests.c, mock address_space too

Pedro Alves
2020-04-14T17:54:41Z

Use switch_to_thread instead of writing to inferior_ptid. This
requires a couple of improvements to the mocking environment. One is
to mock a pspace too, and assigning it to the inferior. In turn, this
requires heap-allocating the address space, so that the regular
program_space dtor destroys the address space correctly.

(Note that new the mock program_space is allocated on the stack, and
thus depends on the previous patch that eliminated
delete_program_space.)

gdb/ChangeLog:
yyyy-mm-dd Pedro Alves <palves@redhat.com>

* gdbarch-selftests.c: Include "progspace-and-thread.h".
(register_to_value_test): Mock a program_space too. Heap-allocate
the address space. Don't write to inferior_ptid. Use
switch_to_thread instead.
---
gdb/gdbarch-selftests.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c
index 787a3f4058..9ab5e9fbe4 100644
--- a/gdb/gdbarch-selftests.c
+++ b/gdb/gdbarch-selftests.c
@@ -27,6 +27,7 @@
#include "target-float.h"
#include "gdbsupport/def-vector.h"
#include "gdbarch.h"
+#include "progspace-and-thread.h"

namespace selftests {

@@ -75,24 +76,25 @@ register_to_value_test (struct gdbarch *gdbarch)

test_target_ops mock_target;
ptid_t mock_ptid (1, 1);
+ program_space mock_pspace (new_address_space ());
inferior mock_inferior (mock_ptid.pid ());
- address_space mock_aspace {};
mock_inferior.gdbarch = gdbarch;
- mock_inferior.aspace = &mock_aspace;
+ mock_inferior.aspace = mock_pspace.aspace;
+ mock_inferior.pspace = &mock_pspace;
thread_info mock_thread (&mock_inferior, mock_ptid);

+ scoped_restore_current_pspace_and_thread restore_pspace_thread;
+
scoped_restore restore_thread_list
= make_scoped_restore (&mock_inferior.thread_list, &mock_thread);

/* Add the mock inferior to the inferior list so that look ups by
target+ptid can find it. */
scoped_restore restore_inferior_list
- = make_scoped_restore (&inferior_list);
- inferior_list = &mock_inferior;
+ = make_scoped_restore (&inferior_list, &mock_inferior);

/* Switch to the mock inferior. */
- scoped_restore_current_inferior restore_current_inferior;
- set_current_inferior (&mock_inferior);
+ switch_to_inferior_no_thread (&mock_inferior);

/* Push the process_stratum target so we can mock accessing
registers. */
@@ -102,8 +104,7 @@ register_to_value_test (struct gdbarch *gdbarch)
SCOPE_EXIT { pop_all_targets_at_and_above (process_stratum); };

/* Switch to the mock thread. */
- scoped_restore restore_inferior_ptid
- = make_scoped_restore (&inferior_ptid, mock_ptid);
+ switch_to_thread (&mock_thread);

struct frame_info *frame = get_current_frame ();
const int num_regs = gdbarch_num_cooked_regs (gdbarch);
--
2.14.5