From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH] Remove the_windows_nat_target global
Date: Wed, 30 Nov 2022 08:52:07 -0700 [thread overview]
Message-ID: <20221130155207.2444224-1-tromey@adacore.com> (raw)
I belatedly realized that the "the_windows_nat_target" global isn't
really necessary. It's only used in one place, where 'this' would be
simpler and clearer. This patch removes the global entirely.
---
gdb/windows-nat.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 17422e15f80..900d8c3d3c4 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -387,10 +387,6 @@ struct windows_nat_target final : public x86_nat_target<inf_child_target>
bool m_is_async = false;
};
-/* This is a pointer and not a global specifically to avoid a C++
- "static initializer fiasco" situation. */
-static windows_nat_target *the_windows_nat_target;
-
static void
check (BOOL ok, const char *file, int line)
{
@@ -629,7 +625,7 @@ windows_nat_target::delete_thread (ptid_t ptid, DWORD exit_code,
target_pid_to_str (ptid).c_str (),
(unsigned) exit_code);
- ::delete_thread (find_thread_ptid (the_windows_nat_target, ptid));
+ ::delete_thread (find_thread_ptid (this, ptid));
auto iter = std::find_if (windows_process.thread_list.begin (),
windows_process.thread_list.end (),
@@ -3126,8 +3122,9 @@ _initialize_windows_nat ()
calling x86_set_debug_register_length function
in processor windows specific native file. */
- the_windows_nat_target = new windows_nat_target;
- add_inf_child_target (the_windows_nat_target);
+ /* The target is not a global specifically to avoid a C++ "static
+ initializer fiasco" situation. */
+ add_inf_child_target (new windows_nat_target);
#ifdef __CYGWIN__
cygwin_internal (CW_SET_DOS_FILE_WARNING, 0);
--
2.34.3
next reply other threads:[~2022-11-30 15:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 15:52 Tom Tromey [this message]
2022-12-01 18:29 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221130155207.2444224-1-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).