From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 1/3] gdb: make get_interp_info return a reference
Date: Thu, 2 Mar 2023 15:32:22 -0500 [thread overview]
Message-ID: <20230302203224.118345-2-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230302203224.118345-1-simon.marchi@efficios.com>
get_interp_info and get_current_interp_info always return non-nullptr,
so they can return a reference instead of a pointer.
Change-Id: I6d8dea92dc26a58ea340d04862db6b8d9cf906a0
---
gdb/interps.c | 71 +++++++++++++++++++++++++--------------------------
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/gdb/interps.c b/gdb/interps.c
index 9c7908bde1ca..9517e57540d3 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -55,20 +55,19 @@ struct ui_interp_info
struct interp *command_interpreter;
};
-/* Get UI's ui_interp_info object. Never returns NULL. */
+/* Get UI's ui_interp_info object. */
-static struct ui_interp_info *
+static ui_interp_info &
get_interp_info (struct ui *ui)
{
if (ui->interp_info == NULL)
ui->interp_info = XCNEW (struct ui_interp_info);
- return ui->interp_info;
+ return *ui->interp_info;
}
-/* Get the current UI's ui_interp_info object. Never returns
- NULL. */
+/* Get the current UI's ui_interp_info object. */
-static struct ui_interp_info *
+static ui_interp_info &
get_current_interp_info (void)
{
return get_interp_info (current_ui);
@@ -128,12 +127,12 @@ interp_factory_register (const char *name, interp_factory_func func)
static void
interp_add (struct ui *ui, struct interp *interp)
{
- struct ui_interp_info *ui_interp = get_interp_info (ui);
+ ui_interp_info &ui_interp = get_interp_info (ui);
gdb_assert (interp_lookup_existing (ui, interp->name ()) == NULL);
- interp->next = ui_interp->interp_list;
- ui_interp->interp_list = interp;
+ interp->next = ui_interp.interp_list;
+ ui_interp.interp_list = interp;
}
/* This sets the current interpreter to be INTERP. If INTERP has not
@@ -150,13 +149,13 @@ interp_add (struct ui *ui, struct interp *interp)
static void
interp_set (struct interp *interp, bool top_level)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
- struct interp *old_interp = ui_interp->current_interpreter;
+ ui_interp_info &ui_interp = get_current_interp_info ();
+ struct interp *old_interp = ui_interp.current_interpreter;
/* If we already have an interpreter, then trying to
set top level interpreter is kinda pointless. */
- gdb_assert (!top_level || !ui_interp->current_interpreter);
- gdb_assert (!top_level || !ui_interp->top_level_interpreter);
+ gdb_assert (!top_level || !ui_interp.current_interpreter);
+ gdb_assert (!top_level || !ui_interp.top_level_interpreter);
if (old_interp != NULL)
{
@@ -164,9 +163,9 @@ interp_set (struct interp *interp, bool top_level)
old_interp->suspend ();
}
- ui_interp->current_interpreter = interp;
+ ui_interp.current_interpreter = interp;
if (top_level)
- ui_interp->top_level_interpreter = interp;
+ ui_interp.top_level_interpreter = interp;
if (interpreter_p != interp->name ())
interpreter_p = interp->name ();
@@ -203,10 +202,10 @@ interp_set (struct interp *interp, bool top_level)
static struct interp *
interp_lookup_existing (struct ui *ui, const char *name)
{
- struct ui_interp_info *ui_interp = get_interp_info (ui);
+ ui_interp_info &ui_interp = get_interp_info (ui);
struct interp *interp;
- for (interp = ui_interp->interp_list;
+ for (interp = ui_interp.interp_list;
interp != NULL;
interp = interp->next)
{
@@ -259,8 +258,8 @@ void
current_interp_set_logging (ui_file_up logfile, bool logging_redirect,
bool debug_redirect)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
- struct interp *interp = ui_interp->current_interpreter;
+ ui_interp_info &ui_interp = get_current_interp_info ();
+ struct interp *interp = ui_interp.current_interpreter;
interp->set_logging (std::move (logfile), logging_redirect, debug_redirect);
}
@@ -269,12 +268,12 @@ current_interp_set_logging (ui_file_up logfile, bool logging_redirect,
struct interp *
scoped_restore_interp::set_interp (const char *name)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
+ ui_interp_info &ui_interp = get_current_interp_info ();
struct interp *interp = interp_lookup (current_ui, name);
- struct interp *old_interp = ui_interp->current_interpreter;
+ struct interp *old_interp = ui_interp.current_interpreter;
if (interp)
- ui_interp->current_interpreter = interp;
+ ui_interp.current_interpreter = interp;
return old_interp;
}
@@ -282,8 +281,8 @@ scoped_restore_interp::set_interp (const char *name)
int
current_interp_named_p (const char *interp_name)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
- struct interp *interp = ui_interp->current_interpreter;
+ ui_interp_info &ui_interp = get_current_interp_info ();
+ struct interp *interp = ui_interp.current_interpreter;
if (interp != NULL)
return (strcmp (interp->name (), interp_name) == 0);
@@ -304,12 +303,12 @@ current_interp_named_p (const char *interp_name)
struct interp *
command_interp (void)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
+ ui_interp_info &ui_interp = get_current_interp_info ();
- if (ui_interp->command_interpreter != NULL)
- return ui_interp->command_interpreter;
+ if (ui_interp.command_interpreter != NULL)
+ return ui_interp.command_interpreter;
else
- return ui_interp->current_interpreter;
+ return ui_interp.current_interpreter;
}
/* See interps.h. */
@@ -336,11 +335,11 @@ interp_supports_command_editing (struct interp *interp)
void
interp_exec (struct interp *interp, const char *command_str)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
+ ui_interp_info &ui_interp = get_current_interp_info ();
/* See `command_interp' for why we do this. */
scoped_restore save_command_interp
- = make_scoped_restore (&ui_interp->command_interpreter, interp);
+ = make_scoped_restore (&ui_interp.command_interpreter, interp);
interp->exec (command_str);
}
@@ -365,7 +364,7 @@ clear_interpreter_hooks (void)
static void
interpreter_exec_cmd (const char *args, int from_tty)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
+ ui_interp_info &ui_interp = get_current_interp_info ();
struct interp *old_interp, *interp_to_use;
unsigned int nrules;
unsigned int i;
@@ -387,7 +386,7 @@ interpreter_exec_cmd (const char *args, int from_tty)
if (nrules < 2)
error (_("Usage: interpreter-exec INTERPRETER COMMAND..."));
- old_interp = ui_interp->current_interpreter;
+ old_interp = ui_interp.current_interpreter;
interp_to_use = interp_lookup (current_ui, prules[0]);
if (interp_to_use == NULL)
@@ -425,9 +424,9 @@ interpreter_completer (struct cmd_list_element *ignore,
struct interp *
top_level_interpreter (void)
{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
+ ui_interp_info &ui_interp = get_current_interp_info ();
- return ui_interp->top_level_interpreter;
+ return ui_interp.top_level_interpreter;
}
/* See interps.h. */
@@ -435,9 +434,9 @@ top_level_interpreter (void)
struct interp *
current_interpreter (void)
{
- struct ui_interp_info *ui_interp = get_interp_info (current_ui);
+ ui_interp_info &ui_interp = get_interp_info (current_ui);
- return ui_interp->current_interpreter;
+ return ui_interp.current_interpreter;
}
/* This just adds the "interpreter-exec" command. */
--
2.39.2
next prev parent reply other threads:[~2023-03-02 20:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 20:32 [PATCH 0/3] Some minor interps tweaks Simon Marchi
2023-03-02 20:32 ` Simon Marchi [this message]
2023-03-07 19:27 ` [PATCH 1/3] gdb: make get_interp_info return a reference Tom Tromey
2023-03-07 20:34 ` Simon Marchi
2023-03-07 20:45 ` Tom Tromey
2023-03-07 20:52 ` Simon Marchi
2023-03-07 21:29 ` Tom Tromey
2023-03-07 21:31 ` Simon Marchi
2023-03-02 20:32 ` [PATCH 2/3] gdb: make interp::m_name an `const char *` Simon Marchi
2023-03-07 19:29 ` Tom Tromey
2023-03-02 20:32 ` [PATCH 3/3] gdb: initialize interp::next Simon Marchi
2023-03-07 19:29 ` Tom Tromey
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=20230302203224.118345-2-simon.marchi@efficios.com \
--to=simon.marchi@efficios.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).