From: Enze Li <enze.li@hotmail.com>
To: gdb-patches@sourceware.org
Cc: jhb@FreeBSD.org, enze.li@gmx.com
Subject: [PATCH] fbsd-nat: Pacify gcc with no functional changes
Date: Sat, 9 Sep 2023 21:50:51 +0800 [thread overview]
Message-ID: <OS3P286MB21521D0F1C8BE0DFA8237A43F0ECA@OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM> (raw)
I see these errors on FreeBSD/aarch64 when using gcc 12 without passing
--disable-werror.
=====================================================================
CXX fbsd-nat.o
fbsd-nat.c: In member function 'void fbsd_nat_target::resume_one_process(ptid_t, int, gdb_signal)':
fbsd-nat.c:1208:11: error: unused variable 'request' [-Werror=unused-variable]
1208 | int request;
| ^~~~~~~
fbsd-nat.c: In member function 'virtual ptid_t fbsd_nat_target::wait(ptid_t, target_waitstatus*, target_wait_flags)':
fbsd-nat.c:1726:22: error: declaration of 'inf' shadows a previous local [-Werror=shadow=compatible-local]
1726 | for (inferior *inf : all_non_exited_inferiors (this))
| ^~~
fbsd-nat.c:1697:17: note: shadowed declaration is here
1697 | inferior *inf = find_inferior_ptid (this, wptid);
| ^~~
fbsd-nat.c: In member function 'virtual void fbsd_nat_target::detach(inferior*, int)':
fbsd-nat.c:2044:18: error: variable 'wptid' set but not used [-Werror=unused-but-set-variable]
2044 | ptid_t wptid = wait_1 (ptid, &ws, 0);
| ^~~~~
cc1plus: all warnings being treated as errors
=====================================================================
This patch includes the following non-functional changes,
1. Remove unused variable "request".
2. Rename inf to inf_p to avoid shadowed declaration warnings.
3. Set wptid to null_ptid when USE_SIGTRAP_SIGINFO is not defined.
Tested on FreeBSD/aarch64 by rebuilding.
---
gdb/fbsd-nat.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 0ee3bccb5ef..af416557504 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -1205,8 +1205,6 @@ fbsd_nat_target::resume_one_process (ptid_t ptid, int step,
for (thread_info *tp : inf->non_exited_threads ())
{
- int request;
-
/* If ptid is a specific LWP, suspend all other LWPs in the
process, otherwise resume all LWPs in the process.. */
if (!ptid.lwp_p() || tp->ptid.lwp () == ptid.lwp ())
@@ -1694,9 +1692,9 @@ fbsd_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
|| ourstatus->kind () == TARGET_WAITKIND_NO_RESUMED)
break;
- inferior *inf = find_inferior_ptid (this, wptid);
- gdb_assert (inf != nullptr);
- fbsd_inferior *fbsd_inf = get_fbsd_inferior (inf);
+ inferior *inf_p = find_inferior_ptid (this, wptid);
+ gdb_assert (inf_p != nullptr);
+ fbsd_inferior *fbsd_inf = get_fbsd_inferior (inf_p);
gdb_assert (fbsd_inf != nullptr);
gdb_assert (fbsd_inf->resumed_lwps != null_ptid);
gdb_assert (fbsd_inf->running_lwps > 0);
@@ -2094,6 +2092,9 @@ fbsd_nat_target::detach (inferior *inf, int from_tty)
}
}
}
+#else
+ /* pacify gcc */
+ wptid = null_ptid;
#endif
sig = 0;
break;
base-commit: 38a984fa440c7686c741b7804eae06a528849aa7
--
2.42.0
next reply other threads:[~2023-09-09 13:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 13:50 Enze Li [this message]
2023-09-09 16:49 ` John Baldwin
2023-09-11 14:20 ` Enze Li
2023-09-11 14:40 ` [PATCH v2] " Enze Li
2023-09-22 19:24 ` John Baldwin
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=OS3P286MB21521D0F1C8BE0DFA8237A43F0ECA@OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM \
--to=enze.li@hotmail.com \
--cc=enze.li@gmx.com \
--cc=gdb-patches@sourceware.org \
--cc=jhb@FreeBSD.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).