From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 3/4] [gdb/build] Fix struct token_and_value odr violation
Date: Mon, 14 Aug 2023 13:17:20 +0200 [thread overview]
Message-ID: <20230814111721.31402-3-tdevries@suse.de> (raw)
In-Reply-To: <20230814111721.31402-1-tdevries@suse.de>
When build gdb with -O2 -flto I run into:
...
gdb/c-exp.y:3003:8: warning: type 'struct token_and_value' violates the C++ \
One Definition Rule [-Wodr]
struct token_and_value
^
gdb/d-exp.y:1310:8: note: a different type is defined in another translation \
unit
struct token_and_value
^
...
Fix this by renaming to c_token_and_value and d_token_and_value.
Likewise in gdb/go-exp.y, renaming to go_token_and_value.
Tested on x86_64-linux.
---
gdb/c-exp.y | 8 ++++----
gdb/d-exp.y | 10 +++++-----
gdb/go-exp.y | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index a8c78414253..032ba25274e 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -3000,7 +3000,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
}
/* An object of this type is pushed on a FIFO by the "outer" lexer. */
-struct token_and_value
+struct c_token_and_value
{
int token;
YYSTYPE value;
@@ -3008,7 +3008,7 @@ struct token_and_value
/* A FIFO of tokens that have been read but not yet returned to the
parser. */
-static std::vector<token_and_value> token_fifo;
+static std::vector<c_token_and_value> token_fifo;
/* Non-zero if the lexer should return tokens from the FIFO. */
static int popping;
@@ -3230,7 +3230,7 @@ classify_inner_name (struct parser_state *par_state,
static int
yylex (void)
{
- token_and_value current;
+ c_token_and_value current;
int first_was_coloncolon, last_was_coloncolon;
struct type *context_type = NULL;
int last_to_examine, next_to_examine, checkpoint;
@@ -3306,7 +3306,7 @@ yylex (void)
while (next_to_examine <= last_to_examine)
{
- token_and_value next;
+ c_token_and_value next;
next = token_fifo[next_to_examine];
++next_to_examine;
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index b0f2c0d1c10..8620a67e04a 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -1307,7 +1307,7 @@ lex_one_token (struct parser_state *par_state)
}
/* An object of this type is pushed on a FIFO by the "outer" lexer. */
-struct token_and_value
+struct d_token_and_value
{
int token;
YYSTYPE value;
@@ -1316,7 +1316,7 @@ struct token_and_value
/* A FIFO of tokens that have been read but not yet returned to the
parser. */
-static std::vector<token_and_value> token_fifo;
+static std::vector<d_token_and_value> token_fifo;
/* Non-zero if the lexer should return tokens from the FIFO. */
static int popping;
@@ -1404,7 +1404,7 @@ classify_inner_name (struct parser_state *par_state,
static int
yylex (void)
{
- token_and_value current;
+ d_token_and_value current;
int last_was_dot;
struct type *context_type = NULL;
int last_to_examine, next_to_examine, checkpoint;
@@ -1467,7 +1467,7 @@ yylex (void)
while (next_to_examine <= last_to_examine)
{
- token_and_value next;
+ d_token_and_value next;
next = token_fifo[next_to_examine];
++next_to_examine;
@@ -1531,7 +1531,7 @@ yylex (void)
while (next_to_examine <= last_to_examine)
{
- token_and_value next;
+ d_token_and_value next;
next = token_fifo[next_to_examine];
++next_to_examine;
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index 5c213f138f0..92abd95a159 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -1245,7 +1245,7 @@ lex_one_token (struct parser_state *par_state)
}
/* An object of this type is pushed on a FIFO by the "outer" lexer. */
-struct token_and_value
+struct go_token_and_value
{
int token;
YYSTYPE value;
@@ -1253,7 +1253,7 @@ struct token_and_value
/* A FIFO of tokens that have been read but not yet returned to the
parser. */
-static std::vector<token_and_value> token_fifo;
+static std::vector<go_token_and_value> token_fifo;
/* Non-zero if the lexer should return tokens from the FIFO. */
static int popping;
@@ -1445,11 +1445,11 @@ classify_name (struct parser_state *par_state, const struct block *block)
static int
yylex (void)
{
- token_and_value current, next;
+ go_token_and_value current, next;
if (popping && !token_fifo.empty ())
{
- token_and_value tv = token_fifo[0];
+ go_token_and_value tv = token_fifo[0];
token_fifo.erase (token_fifo.begin ());
yylval = tv.value;
/* There's no need to fall through to handle package.name
@@ -1474,7 +1474,7 @@ yylex (void)
if (next.token == '.')
{
- token_and_value name2;
+ go_token_and_value name2;
name2.token = lex_one_token (pstate);
name2.value = yylval;
--
2.35.3
next prev parent reply other threads:[~2023-08-14 11:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 11:17 [PATCH 1/4] [gdb/build] Remove superfluous variable param_types in gdb/python/py-param.c Tom de Vries
2023-08-14 11:17 ` [PATCH 2/4] [gdb/build] Fix enum param_types odr violation Tom de Vries
2023-08-14 16:07 ` Tom Tromey
2023-08-14 11:17 ` Tom de Vries [this message]
2023-08-14 16:07 ` [PATCH 3/4] [gdb/build] Fix struct token_and_value " Tom Tromey
2023-08-14 11:17 ` [PATCH 4/4] [gdb/build] Fix struct token " Tom de Vries
2023-08-14 16:08 ` Tom Tromey
2023-08-14 16:06 ` [PATCH 1/4] [gdb/build] Remove superfluous variable param_types in gdb/python/py-param.c 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=20230814111721.31402-3-tdevries@suse.de \
--to=tdevries@suse.de \
--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).