mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 18:14:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdb: fix variable shadowing error in darwin-nat.c

Browse Source 
We encounter this error when building on macOS with GCC.

  CXX    darwin-nat.o
/src-local/binutils-gdb/gdb/darwin-nat.c: In member function 'ptid_t darwin_nat_target::wait_1(ptid_t, target_waitstatus*)':
/src-local/binutils-gdb/gdb/darwin-nat.c:1264:18: error: declaration of 'inf' shadows a previous local [-Werror=shadow=compatible-local]
   for (inferior *inf : all_inferiors (this))
                  ^~~
/src-local/binutils-gdb/gdb/darwin-nat.c:1205:20: note: shadowed declaration is here
   struct inferior *inf;
                    ^~~

Fix it by moving the declaration of `inf` in the specific scopes that
need it.  I think it's clearer this way anyway, as it shows that it's
not the same `inf` that is used in these different scopes.

Thanks to Iain Sandoe for reporting this.  I did not see this error at
first, because I compile with the default system compiler on macOS,
which is clang.  The compiler flag we try to enable for this is
`-Wshadow=local`, which is not one recognized by clang.  I checked to
see if there would a version of the -Wshadow* warnings [1] we could
enable for clang, that would catch this, but the only one that would is
`-Wshadow` itself, and this is too invasive for us (which is why we
enabled just -Wshadow=local in the first place).

[1] https://clang.llvm.org/docs/DiagnosticsReference.html#wshadow

gdb/ChangeLog:

	* darwin-nat.c (darwin_nat_target::wait_1): Move `inf`
	declaration to narrower scopes.
This commit is contained in:
Simon Marchi 2020-01-23 17:44:22 -05:00
parent e7eee665a1
commit ab53f38262
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-01-23 Simon Marchi <simon.marchi@efficios.com>
* darwin-nat.c (darwin_nat_target::wait_1): Move `inf`
declaration to narrower scopes.
2020-01-23 Simon Marchi <simon.marchi@efficios.com> 2020-01-23 Simon Marchi <simon.marchi@efficios.com>
* darwin-nat.h (struct darwin_exception_msg, enum * darwin-nat.h (struct darwin_exception_msg, enum

5
gdb/darwin-nat.c
View File

@ -1202,7 +1202,6 @@ darwin_nat_target::wait_1 (ptid_t ptid, struct target_waitstatus *status)
mach_msg_header_t *hdr = &msgin.hdr; mach_msg_header_t *hdr = &msgin.hdr;
ptid_t res; ptid_t res;
darwin_thread_t *thread; darwin_thread_t *thread;
struct inferior *inf;
inferior_debug inferior_debug
(2, _("darwin_wait: waiting for a message pid=%d thread=%lx\n"), (2, _("darwin_wait: waiting for a message pid=%d thread=%lx\n"),
@ -1211,7 +1210,7 @@ darwin_nat_target::wait_1 (ptid_t ptid, struct target_waitstatus *status)
/* Handle fake stop events at first. */ /* Handle fake stop events at first. */
if (darwin_inf_fake_stop != NULL) if (darwin_inf_fake_stop != NULL)
{ {
inf = darwin_inf_fake_stop; inferior *inf = darwin_inf_fake_stop;
darwin_inf_fake_stop = NULL; darwin_inf_fake_stop = NULL;
darwin_inferior *priv = get_darwin_inferior (inf); darwin_inferior *priv = get_darwin_inferior (inf);
@ -1250,6 +1249,7 @@ darwin_nat_target::wait_1 (ptid_t ptid, struct target_waitstatus *status)
if (darwin_debug_flag > 10) if (darwin_debug_flag > 10)
darwin_dump_message (hdr, darwin_debug_flag > 11); darwin_dump_message (hdr, darwin_debug_flag > 11);
inferior *inf;
res = decode_message (hdr, &thread, &inf, status); res = decode_message (hdr, &thread, &inf, status);
if (res == minus_one_ptid) if (res == minus_one_ptid)
continue; continue;
@ -1290,6 +1290,7 @@ darwin_nat_target::wait_1 (ptid_t ptid, struct target_waitstatus *status)
if (darwin_debug_flag > 10) if (darwin_debug_flag > 10)
darwin_dump_message (hdr, darwin_debug_flag > 11); darwin_dump_message (hdr, darwin_debug_flag > 11);
inferior *inf;
ptid2 = decode_message (hdr, &thread, &inf, &status2); ptid2 = decode_message (hdr, &thread, &inf, &status2);
if (inf != NULL && thread != NULL if (inf != NULL && thread != NULL