From: Bernd Edlinger <bernd.edlinger@hotmail.de>
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>,
"richard.sandiford@arm.com" <richard.sandiford@arm.com>
Subject: Re: [PATCH] Fix -Wshadow=local warnings in dumpfile.h
Date: Fri, 04 Oct 2019 18:00:00 -0000 [thread overview]
Message-ID: <VI1PR03MB4528C4BAE1364A3F0CBE35C2E49E0@VI1PR03MB4528.eurprd03.prod.outlook.com> (raw)
In-Reply-To: <mpt8sq0n1sl.fsf@arm.com>
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
On 10/4/19 2:16 PM, Richard Sandiford wrote:
> Bernd Edlinger <bernd.edlinger@hotmail.de> writes:
>> Hi,
>>
>> this fixes a -Wshadow=local warning when using AUTO_DUMP_SCOPE in
>> nested blocks. Since NAME i a string I cannot use it to create
>> a unique name for the auto_dump_scope object.
>>
>> So I used XCONCAT2 from good old symcat.h, to mangle the __LINE__
>> macro into the scope object name.
>
> Seems a pity to reintroduce uses of symcat.h again now when it was
> originally only a bridge from pre-ISO C. How about just importing
> XCONCAT2 into system.h instead? I guess it's a bit of an abuse of
> system.h, but not really much worse than CEIL, ROUND_UP, etc., and
> that's where symcat.h was originally included.
>
Done.
Is it OK for trunk?
Thanks
Bernd.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch-wshadow-dumpfile.diff --]
[-- Type: text/x-patch; name="patch-wshadow-dumpfile.diff", Size: 1280 bytes --]
2019-10-04 Bernd Edlinger <bernd.edlinger@hotmail.de>
* system.h (CONCAT2, XCONCAT2): Imported from symcat.h
* dumpfile.h (AUTO_DUMP_SCOPE): Use XCONCAT2 and __LINE__
to form a unique name for the scope variable.
Index: gcc/system.h
===================================================================
--- gcc/system.h (revision 276589)
+++ gcc/system.h (working copy)
@@ -392,6 +392,12 @@ extern int errno;
/* This macro rounds x down to the y boundary. */
#define ROUND_DOWN(x,y) ((x) & ~((y) - 1))
+/* This concatenates two symbols before macro expansion. */
+#define CONCAT2(a,b) a##b
+
+/* This concatenates two symbols after macro expansion. */
+#define XCONCAT2(a,b) CONCAT2(a,b)
+
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
Index: gcc/dumpfile.h
===================================================================
--- gcc/dumpfile.h (revision 276589)
+++ gcc/dumpfile.h (working copy)
@@ -634,7 +634,7 @@ class auto_dump_scope
in a nested scope implicitly default to MSG_PRIORITY_INTERNALS. */
#define AUTO_DUMP_SCOPE(NAME, USER_LOC) \
- auto_dump_scope scope (NAME, USER_LOC)
+ auto_dump_scope XCONCAT2 (scope, __LINE__) (NAME, USER_LOC)
extern void dump_function (int phase, tree fn);
extern void print_combine_total_stats (void);
prev parent reply other threads:[~2019-10-04 18:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 15:18 Bernd Edlinger
2019-10-04 12:16 ` Richard Sandiford
2019-10-04 18:00 ` Bernd Edlinger [this message]
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=VI1PR03MB4528C4BAE1364A3F0CBE35C2E49E0@VI1PR03MB4528.eurprd03.prod.outlook.com \
--to=bernd.edlinger@hotmail.de \
--cc=gcc-patches@gcc.gnu.org \
--cc=richard.sandiford@arm.com \
/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).