genksyms: fix typeof() handling

Recent increased use of typeof() throughout the tree resulted in a
number of symbols (25 in a typical distro config of ours) not getting a
proper CRC calculated for them anymore, due to the parser in genksyms
not coping with several of these uses (interestingly in the majority of
[if not all] cases the problem is due to the use of typeof() in code
preceding a certain export, not in the declaration/definition of the
exported function/object itself; I wasn't able to find a way to address
this more general parser shortcoming).

The use of parameter_declaration is a little more relaxed than would be
ideal (permitting not just a bare type specification, but also one with
identifier), but since the same code is being passed through an actual
compiler, there's no apparent risk of allowing through any broken code.

Otoh using parameter_declaration instead of the ad hoc
"decl_specifier_seq '*'" / "decl_specifier_seq" pair allows all types to
be handled rather than just plain ones and pointers to plain ones.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 49 insertions, 2 deletions

diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l
index f770071719cb..e583565f2011 100644
--- a/scripts/genksyms/lex.l
+++ b/scripts/genksyms/lex.l
@@ -129,8 +129,9 @@ int
 yylex(void)
 {
   static enum {
-    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_BRACKET, ST_BRACE,
-    ST_EXPRESSION, ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,
+    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1,
+    ST_BRACKET, ST_BRACE, ST_EXPRESSION,
+    ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,
     ST_TABLE_5, ST_TABLE_6
   } lexstate = ST_NOTSTARTED;
 
@@ -198,6 +199,10 @@ repeat:
                     lexstate = ST_ASM;
                     count = 0;
                     goto repeat;
+                  case TYPEOF_KEYW:
+                    lexstate = ST_TYPEOF;
+                    count = 0;
+                    goto repeat;
 
                   case STRUCT_KEYW:
                   case UNION_KEYW:
@@ -284,6 +289,48 @@ repeat:
         }
       break;
 
+    case ST_TYPEOF:
+      switch (token)
+        {
+        case '(':
+          if ( ++count == 1 )
+            lexstate = ST_TYPEOF_1;
+          else
+            APP;
+          goto repeat;
+        case ')':
+          APP;
+          if (--count == 0)
+            {
+              lexstate = ST_NORMAL;
+              token = TYPEOF_PHRASE;
+              break;
+            }
+          goto repeat;
+        default:
+          APP;
+          goto repeat;
+        }
+      break;
+
+    case ST_TYPEOF_1:
+      if (token == IDENT)
+        {
+          if (is_reserved_word(yytext, yyleng)
+              || find_symbol(yytext, SYM_TYPEDEF, 1))
+            {
+              yyless(0);
+              unput('(');
+              lexstate = ST_NORMAL;
+              token = TYPEOF_KEYW;
+              break;
+            }
+          _APP("(", 1);
+        }
+        APP;
+        lexstate = ST_TYPEOF;
+        goto repeat;
+
     case ST_BRACKET:
       APP;
       switch (token)