* [PATCH 3/4] [gdb/build] Fix struct token_and_value odr violation
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 11:17 ` Tom de Vries
2023-08-14 16:07 ` Tom Tromey
2023-08-14 11:17 ` [PATCH 4/4] [gdb/build] Fix struct token " Tom de Vries
2023-08-14 16:06 ` [PATCH 1/4] [gdb/build] Remove superfluous variable param_types in gdb/python/py-param.c Tom Tromey
3 siblings, 1 reply; 8+ messages in thread
From: Tom de Vries @ 2023-08-14 11:17 UTC (permalink / raw)
To: gdb-patches
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] [gdb/build] Fix struct token odr violation
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 11:17 ` [PATCH 3/4] [gdb/build] Fix struct token_and_value " Tom de Vries
@ 2023-08-14 11:17 ` 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
3 siblings, 1 reply; 8+ messages in thread
From: Tom de Vries @ 2023-08-14 11:17 UTC (permalink / raw)
To: gdb-patches
When building gdb with -O2 -flto I run into:
...
/data/vries/gdb/src/gdb/c-exp.y:2450:8: warning: type 'struct token' \
violates the C++ One Definition Rule [-Wodr]
struct token
^
/data/vries/gdb/src/gdb/d-exp.y:939:8: note: a different type is defined in \
another translation unit
struct token
^
...
Fix this by renaming to c_token and d_token.
Likewise in:
- fortran-exp.y, renaming to f_token,
- go-exp.y, renaming to go_token, and
- p-exp.y, renaming to p_token.
Tested on x86_64-linux.
---
gdb/c-exp.y | 8 ++++----
gdb/d-exp.y | 8 ++++----
gdb/f-exp.y | 8 ++++----
gdb/go-exp.y | 8 ++++----
gdb/p-exp.y | 6 +++---
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 032ba25274e..a27dbfa608f 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -2447,7 +2447,7 @@ enum token_flag
};
DEF_ENUM_FLAGS_TYPE (enum token_flag, token_flags);
-struct token
+struct c_token
{
const char *oper;
int token;
@@ -2455,7 +2455,7 @@ struct token
token_flags flags;
};
-static const struct token tokentab3[] =
+static const struct c_token tokentab3[] =
{
{">>=", ASSIGN_MODIFY, BINOP_RSH, 0},
{"<<=", ASSIGN_MODIFY, BINOP_LSH, 0},
@@ -2463,7 +2463,7 @@ static const struct token tokentab3[] =
{"...", DOTDOTDOT, OP_NULL, 0}
};
-static const struct token tokentab2[] =
+static const struct c_token tokentab2[] =
{
{"+=", ASSIGN_MODIFY, BINOP_ADD, 0},
{"-=", ASSIGN_MODIFY, BINOP_SUB, 0},
@@ -2494,7 +2494,7 @@ static const struct token tokentab2[] =
multi-word type names (for example 'double' can appear in 'long
double') need to be listed here. type-specifiers that are only ever
single word (like 'char') are handled by the classify_name function. */
-static const struct token ident_tokens[] =
+static const struct c_token ident_tokens[] =
{
{"unsigned", UNSIGNED, OP_NULL, 0},
{"template", TEMPLATE, OP_NULL, FLAG_CXX},
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index 8620a67e04a..6c5569a1c8d 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -936,21 +936,21 @@ parse_string_or_char (const char *tokptr, const char **outptr,
return quote == '\'' ? CHARACTER_LITERAL : STRING_LITERAL;
}
-struct token
+struct d_token
{
const char *oper;
int token;
enum exp_opcode opcode;
};
-static const struct token tokentab3[] =
+static const struct d_token tokentab3[] =
{
{"^^=", ASSIGN_MODIFY, BINOP_EXP},
{"<<=", ASSIGN_MODIFY, BINOP_LSH},
{">>=", ASSIGN_MODIFY, BINOP_RSH},
};
-static const struct token tokentab2[] =
+static const struct d_token tokentab2[] =
{
{"+=", ASSIGN_MODIFY, BINOP_ADD},
{"-=", ASSIGN_MODIFY, BINOP_SUB},
@@ -975,7 +975,7 @@ static const struct token tokentab2[] =
};
/* Identifier-like tokens. */
-static const struct token ident_tokens[] =
+static const struct d_token ident_tokens[] =
{
{"is", IDENTITY, OP_NULL},
{"!is", NOTIDENTITY, OP_NULL},
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 19e4c702c14..18566afd67f 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -1219,7 +1219,7 @@ convert_to_kind_type (struct type *basetype, int kind)
return nullptr;
}
-struct token
+struct f_token
{
/* The string to match against. */
const char *oper;
@@ -1237,7 +1237,7 @@ struct token
/* List of Fortran operators. */
-static const struct token fortran_operators[] =
+static const struct f_token fortran_operators[] =
{
{ ".and.", BOOL_AND, OP_NULL, false },
{ ".or.", BOOL_OR, OP_NULL, false },
@@ -1278,7 +1278,7 @@ static const struct f77_boolean_val boolean_values[] =
{ ".false.", 0 }
};
-static const struct token f_intrinsics[] =
+static const struct f_token f_intrinsics[] =
{
/* The following correspond to actual functions in Fortran and are case
insensitive. */
@@ -1300,7 +1300,7 @@ static const struct token f_intrinsics[] =
{ "sizeof", SIZEOF, OP_NULL, false },
};
-static const token f_keywords[] =
+static const f_token f_keywords[] =
{
/* Historically these have always been lowercase only in GDB. */
{ "character", CHARACTER, OP_NULL, true },
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index 92abd95a159..28bf3f0ab33 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -898,14 +898,14 @@ parse_string_or_char (const char *tokptr, const char **outptr,
return quote == '\'' ? CHAR : STRING;
}
-struct token
+struct go_token
{
const char *oper;
int token;
enum exp_opcode opcode;
};
-static const struct token tokentab3[] =
+static const struct go_token tokentab3[] =
{
{">>=", ASSIGN_MODIFY, BINOP_RSH},
{"<<=", ASSIGN_MODIFY, BINOP_LSH},
@@ -913,7 +913,7 @@ static const struct token tokentab3[] =
{"...", DOTDOTDOT, OP_NULL},
};
-static const struct token tokentab2[] =
+static const struct go_token tokentab2[] =
{
{"+=", ASSIGN_MODIFY, BINOP_ADD},
{"-=", ASSIGN_MODIFY, BINOP_SUB},
@@ -939,7 +939,7 @@ static const struct token tokentab2[] =
};
/* Identifier-like tokens. */
-static const struct token ident_tokens[] =
+static const struct go_token ident_tokens[] =
{
{"true", TRUE_KEYWORD, OP_NULL},
{"false", FALSE_KEYWORD, OP_NULL},
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index b086bf73a0e..2360a500476 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -994,14 +994,14 @@ pop_current_type (void)
}
}
-struct token
+struct p_token
{
const char *oper;
int token;
enum exp_opcode opcode;
};
-static const struct token tokentab3[] =
+static const struct p_token tokentab3[] =
{
{"shr", RSH, OP_NULL},
{"shl", LSH, OP_NULL},
@@ -1014,7 +1014,7 @@ static const struct token tokentab3[] =
{"xor", XOR, OP_NULL}
};
-static const struct token tokentab2[] =
+static const struct p_token tokentab2[] =
{
{"or", OR, OP_NULL},
{"<>", NOTEQUAL, OP_NULL},
--
2.35.3
^ permalink raw reply [flat|nested] 8+ messages in thread