iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genksyms: fix gperf removal conversion

Browse Source 
I had stupidly missed one special use of 'is_reserved_word()' when I
converted the code to avoid gperf.

I had changed that function to return the token ID directly rather than
a pointer to the token descriptor structure, but that meant that the
test for "is this a reserved word" changed from checking the return
value against NULL, to checking that it wasn't negative.

And while I had converted the main token parser over, I missed the
special case of the typeof phrase handling.  And since our dependency
chain for genksyms does not include the genksyms program itself
changing, my kernel rebuild didn't show the problem.

Fixes: bb3290d916 ("Remove gperf usage from toolchain")
Reported-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2017-09-08 14:32:34 -07:00
parent 015a9e66b9
commit 3aea311c1b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/genksyms/lex.l
View File

@ -292,7 +292,7 @@ repeat:
case ST_TYPEOF_1: case ST_TYPEOF_1:
if (token == IDENT) if (token == IDENT)
{ {
if (is_reserved_word(yytext, yyleng) if (is_reserved_word(yytext, yyleng) >= 0
|| find_symbol(yytext, SYM_TYPEDEF, 1)) || find_symbol(yytext, SYM_TYPEDEF, 1))
{ {
yyless(0); yyless(0);

2
scripts/genksyms/lex.lex.c_shipped
View File

@ -2101,7 +2101,7 @@ repeat:
case ST_TYPEOF_1: case ST_TYPEOF_1:
if (token == IDENT) if (token == IDENT)
{ {
if (is_reserved_word(yytext, yyleng) if (is_reserved_word(yytext, yyleng) >= 0
|| find_symbol(yytext, SYM_TYPEDEF, 1)) || find_symbol(yytext, SYM_TYPEDEF, 1))
{ {
yyless(0); yyless(0);