From patchwork Sat Feb 18 20:30:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9581215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CFB5F60586 for ; Sat, 18 Feb 2017 20:31:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1C0026E97 for ; Sat, 18 Feb 2017 20:31:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6470286B1; Sat, 18 Feb 2017 20:31:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66F1F28618 for ; Sat, 18 Feb 2017 20:31:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753461AbdBRUbB (ORCPT ); Sat, 18 Feb 2017 15:31:01 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32926 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753555AbdBRUbA (ORCPT ); Sat, 18 Feb 2017 15:31:00 -0500 Received: by mail-wm0-f67.google.com with SMTP id v77so8040780wmv.0 for ; Sat, 18 Feb 2017 12:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jF+PLgxPaKg7A0OIVKT4T4A8KG4L7BH6ea+bd79H8D8=; b=fe3Eu6kdlJcRED4YARUtEyYFQh8G8RCbNaEzB0wmAD53G84xoWWLCPF/q/9p98275H afkUP3ENBuJURmHDEyYT4NTB9FUc1k2KFgTCQT2fAv4OcQXZxs17LPlKyujFCd77uRan aKQ0rGgRRG4jXDGCUqsN9SWV5cJUm4LbibMMzcB6NTHVY8a1SNW5e4mm141WrdOkzySA qcx9E6m6WOgys2YpKAOY773mrRvyyj9m1kmjw2+0NPp2tA63YsFVepqBoerXRBrNjfUv 91fn4vT/o+o8ZtQoJV0SO0OUa0Kx2kujuXjeOeTpFjoTOdhHw1to3g6IwvUuDFAWhZAe fQuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jF+PLgxPaKg7A0OIVKT4T4A8KG4L7BH6ea+bd79H8D8=; b=Td3cOWdcJkRgbsDOzJJs/zc+hxUot+Vr9M1hs8tY81cYJWsGzPtiADssso9rY7k+Zi zZyABrokCVtfYhjYTU19YXsEX9KdWrgKkPUdBMbCBAOG73ZMLdmxDGWP2JponXauARxi P0KNthTyqk0wrma+UCIQ4iw9HYq6X1Xh9r+MJ/PHmTPmNBKCf1b3FIjEgf7Wlt97s4kt 7qd6tPqIzFUuhEJToNOwdrR+uV11ldnbh4BCbKmXZurQfslMyUMVsU9kT7idUi78BABL HicNhPa4kTn5M2BY0wpW2YDnXOLgh2biSpeIwliMoUSWlsqlQ0KSdBN7MEfLWSgRFnts ClCw== X-Gm-Message-State: AMke39mYGzy2q2d0BEGOAYJm7tF9UTgrO3pt5hIzy5bx6SENGVs2r1EQObS2hvQDCvpblQ== X-Received: by 10.28.230.194 with SMTP id e63mr5988055wmi.25.1487449858767; Sat, 18 Feb 2017 12:30:58 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:8c2:3900:48ac:d537:1a61:c3e1]) by smtp.gmail.com with ESMTPSA id a14sm4888854wrc.66.2017.02.18.12.30.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 12:30:58 -0800 (PST) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH 5/5] check the storage of C99 for-loop initializers Date: Sat, 18 Feb 2017 21:30:48 +0100 Message-Id: <20170218203048.22276-6-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170218203048.22276-1-luc.vanoostenryck@gmail.com> References: <20170218203048.22276-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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