Module Name: src
Committed By: rillig
Date: Sun Jan 29 18:37:20 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_249.c
src/usr.bin/xlint/lint1: func.c
Log Message:
lint: properly clean up when leaving a function definition
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/usr.bin/xlint/lint1/msg_249.c
cvs rdiff -u -r1.146 -r1.147 src/usr.bin/xlint/lint1/func.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/msg_249.c
diff -u src/tests/usr.bin/xlint/lint1/msg_249.c:1.12 src/tests/usr.bin/xlint/lint1/msg_249.c:1.13
--- src/tests/usr.bin/xlint/lint1/msg_249.c:1.12 Fri Jun 17 18:54:53 2022
+++ src/tests/usr.bin/xlint/lint1/msg_249.c Sun Jan 29 18:37:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_249.c,v 1.12 2022/06/17 18:54:53 rillig Exp $ */
+/* $NetBSD: msg_249.c,v 1.13 2023/01/29 18:37:20 rillig Exp $ */
# 3 "msg_249.c"
// Test for message: syntax error '%s' [249]
@@ -66,12 +66,12 @@ struct cover_member_declaration {
*/
int gcc_statement_expression_1 = ({
-/* expect+1: warning: label 'unused_label' unused in function 'access_declaration_after_syntax_error' [232] */
unused_label:
1;
1;
});
/* expect-1: error: non-constant initializer [177] */
+/* expect-2: error: syntax error 'labels are only valid inside a function' [249] */
/* Even another function definition does not help. */
void
@@ -80,9 +80,9 @@ try_to_recover(void)
}
int gcc_statement_expression_2 = ({
-/* expect+1: warning: label 'unused_label' unused in function 'try_to_recover' [232] */
unused_label:
1;
1;
});
/* expect-1: error: non-constant initializer [177] */
+/* expect-2: error: syntax error 'labels are only valid inside a function' [249] */
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.146 src/usr.bin/xlint/lint1/func.c:1.147
--- src/usr.bin/xlint/lint1/func.c:1.146 Sun Jan 29 18:13:56 2023
+++ src/usr.bin/xlint/lint1/func.c Sun Jan 29 18:37:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.146 2023/01/29 18:13:56 rillig Exp $ */
+/* $NetBSD: func.c,v 1.147 2023/01/29 18:37:20 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: func.c,v 1.146 2023/01/29 18:13:56 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.147 2023/01/29 18:37:20 rillig Exp $");
#endif
#include <stdlib.h>
@@ -432,6 +432,8 @@ end_function(void)
/* must be set on level 0 */
set_reached(true);
+
+ funcsym = NULL;
}
void
