From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luc Van Oostenryck Subject: [PATCH v2 5/5] check the storage of C99 for-loop initializers Date: Mon, 20 Feb 2017 08:20:52 +0100 Message-ID: <20170220072052.2429-6-luc.vanoostenryck@gmail.com> References: <1ebf742e-5680-4160-6dc5-808fcfb5cc44@ramsayjones.plus.com> <20170220072052.2429-1-luc.vanoostenryck@gmail.com> Return-path: Received: from mail-wr0-f195.google.com ([209.85.128.195]:36069 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750836AbdBTHYC (ORCPT ); Mon, 20 Feb 2017 02:24:02 -0500 Received: by mail-wr0-f195.google.com with SMTP id z61so10161768wrc.3 for ; Sun, 19 Feb 2017 23:23:15 -0800 (PST) In-Reply-To: <20170220072052.2429-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org List-Id: linux-sparse@vger.kernel.org To: linux-sparse@vger.kernel.org Cc: Christopher Li , Ramsay Jones , Luc Van Oostenryck In C99, it is valid to declarare a variable inside a for-loop initializer but only when the storage is local (automatic or register). Until now this was not enforced. Fix that by adding the appropriate checks called by external_declaration() via the new function pointer when parsing this declaration in a for-loop context. Signed-off-by: Luc Van Oostenryck --- parse.c | 17 ++++++++++++++++- validation/c99-for-loop-decl.c | 1 - 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/parse.c b/parse.c index 866186fd2..5b029ccdc 100644 --- a/parse.c +++ b/parse.c @@ -2217,6 +2217,21 @@ static struct token *parse_return_statement(struct token *token, struct statemen return expression_statement(token->next, &stmt->ret_value); } +static void add_for_loop_decl(struct symbol_list **list, struct symbol *sym) +{ + unsigned long storage; + + storage = sym->ctype.modifiers & MOD_STORAGE; + if (storage & ~(MOD_AUTO | MOD_REGISTER)) { + const char *name = show_ident(sym->ident); + sparse_error(sym->pos, "non-local var '%s' in for-loop initializer", name); + sym->ctype.modifiers &= ~MOD_STORAGE; + } + + add_symbol(list, sym); + fn_local_symbol(sym); +} + static struct token *parse_for_statement(struct token *token, struct statement *stmt) { struct symbol_list *syms; @@ -2230,7 +2245,7 @@ static struct token *parse_for_statement(struct token *token, struct statement * e1 = NULL; /* C99 variable declaration? */ if (lookup_type(token)) { - token = external_declaration(token, NULL, &syms); + token = external_declaration(token, add_for_loop_decl, &syms); } else { token = parse_expression(token, &e1); token = expect(token, ';', "in 'for'"); diff --git a/validation/c99-for-loop-decl.c b/validation/c99-for-loop-decl.c index b9db8c9c6..e813b0ae3 100644 --- a/validation/c99-for-loop-decl.c +++ b/validation/c99-for-loop-decl.c @@ -30,7 +30,6 @@ static int c99(void) /* * check-name: C99 for-loop declarations - * check-known-to-fail * * check-error-start c99-for-loop-decl.c:22:27: warning: symbol with external linkage has initializer -- 2.11.0