 @@ -1,14 +1,14 @@
-# $NetBSD: mi,v 1.1084 2021/07/11 18:58:13 rillig Exp $
+# $NetBSD: mi,v 1.1085 2021/07/11 19:24:41 rillig Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 ./etc/mtree/set.tests					tests-sys-root
 ./usr/libdata/debug/usr/tests				tests-base-debug	compattestdir
 ./usr/libdata/debug/usr/tests/atf			tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c			tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c++		tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c++/detail	tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/detail		tests-atf-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/atf/atf-compile		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-report		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-run		tests-obsolete		obsolete
 @@ -6223,27 +6223,27 @@
 ./usr/tests/usr.bin/xlint/lint1/expr_range.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/expr_range.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/feat_stacktrace.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/feat_stacktrace.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.exp	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_enum.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_enum.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_func.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_func.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.c		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp		tests-obsolete		obsolete
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_stmt.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_stmt.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_type.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_type.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_var.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_attribute_var.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_bit_field_types.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_bit_field_types.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.exp	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/init.c				tests-usr.bin-tests	compattestfile,atf

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.85 2021/07/11 18:58:13 rillig Exp $
+# $NetBSD: Makefile,v 1.86 2021/07/11 19:24:42 rillig Exp $
 NOMAN=		# defined
 MAX_MESSAGE=	345		# see lint1/err.c
 .include <bsd.own.mk>
 TESTSDIR=	${TESTSBASE}/usr.bin/xlint/lint1
 TESTS_SH=	t_integration
 FILESDIR=	${TESTSDIR}
 FILES+=		c11_generic_expression.c
 FILES+=		c11_generic_expression.exp
 @@ -120,27 +120,26 @@ FILES+=		emit.exp-ln
 FILES+=		expr_range.c
 FILES+=		expr_range.exp
 FILES+=		feat_stacktrace.c
 FILES+=		feat_stacktrace.exp
 FILES+=		gcc_attribute.c
 FILES+=		gcc_attribute.exp
 FILES+=		gcc_attribute_aligned.c
 FILES+=		gcc_attribute_aligned.exp
 FILES+=		gcc_attribute_enum.c
 FILES+=		gcc_attribute_enum.exp
 FILES+=		gcc_attribute_func.c
 FILES+=		gcc_attribute_func.exp
 FILES+=		gcc_attribute_label.c
 FILES+=		gcc_attribute_label.exp
 FILES+=		gcc_attribute_stmt.c
 FILES+=		gcc_attribute_stmt.exp
 FILES+=		gcc_attribute_type.c
 FILES+=		gcc_attribute_type.exp
 FILES+=		gcc_attribute_var.c
 FILES+=		gcc_attribute_var.exp
 FILES+=		gcc_bit_field_types.c
 FILES+=		gcc_bit_field_types.exp
 FILES+=		gcc_init_compound_literal.c
 FILES+=		gcc_init_compound_literal.exp
 FILES+=		gcc_typeof_after_statement.c
 FILES+=		gcc_typeof_after_statement.exp
 FILES+=		init.c

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.312 2021/07/11 19:01:37 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.313 2021/07/11 19:24:41 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.312 2021/07/11 19:01:37 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.313 2021/07/11 19:24:41 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration, used for symbol table entries.
  * 0 is the top-level, > 0 is inside a function body.
 @@ -221,26 +221,27 @@ anonymize(sym_t *s)
 %token			T_AT_CONSTRUCTOR
 %token			T_AT_DEPRECATED
 %token			T_AT_DESTRUCTOR
 %token			T_AT_FALLTHROUGH
 %token			T_AT_FORMAT
 %token			T_AT_FORMAT_ARG
 %token			T_AT_FORMAT_GNU_PRINTF
 %token			T_AT_FORMAT_PRINTF
 %token			T_AT_FORMAT_SCANF
 %token			T_AT_FORMAT_STRFMON
 %token			T_AT_FORMAT_STRFTIME
 %token			T_AT_FORMAT_SYSLOG
 %token			T_AT_GNU_INLINE
 %token			T_AT_HOT
 %token			T_AT_MALLOC
 %token			T_AT_MAY_ALIAS
 %token			T_AT_MINBYTES
 %token			T_AT_MODE
 %token			T_AT_NOINLINE
 %token			T_AT_NONNULL
 %token			T_AT_NONSTRING
 %token			T_AT_NORETURN
 %token			T_AT_NOTHROW
 %token			T_AT_NO_INSTRUMENT_FUNCTION
 %token			T_AT_OPTIMIZE
 %token			T_AT_PACKED
 %token			T_AT_PCS
 @@ -2018,26 +2019,27 @@ gcc_attribute_spec:
 	| T_AT_CONSTRUCTOR T_LPAREN constant_expr T_RPAREN
 	| T_AT_CONSTRUCTOR
 	| T_AT_DEPRECATED T_LPAREN string T_RPAREN
 	| T_AT_DEPRECATED
 	| T_AT_DESTRUCTOR T_LPAREN constant_expr T_RPAREN
 	| T_AT_DESTRUCTOR
 	| T_AT_FALLTHROUGH {
 		fallthru(1);
+	  }
 	| T_AT_FORMAT T_LPAREN gcc_attribute_format T_COMMA
 	    constant_expr T_COMMA constant_expr T_RPAREN
 	| T_AT_FORMAT_ARG T_LPAREN constant_expr T_RPAREN
 	| T_AT_GNU_INLINE
 	| T_AT_HOT
 	| T_AT_MALLOC
 	| T_AT_MAY_ALIAS
 	| T_AT_MODE T_LPAREN T_NAME T_RPAREN
 	| T_AT_NOINLINE
 	| T_AT_NONNULL T_LPAREN constant_expr_list_opt T_RPAREN
 	| T_AT_NONNULL
 	| T_AT_NONSTRING
 	| T_AT_NORETURN
 	| T_AT_NOTHROW
 	| T_AT_NO_INSTRUMENT_FUNCTION
 	| T_AT_OPTIMIZE T_LPAREN string T_RPAREN
 	| T_AT_PACKED {
 		addpacked();

 @@ -1,14 +1,14 @@
-/* $NetBSD: lex.c,v 1.54 2021/07/10 17:46:55 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.55 2021/07/11 19:24:41 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -28,27 +28,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: lex.c,v 1.54 2021/07/10 17:46:55 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.55 2021/07/11 19:24:41 rillig Exp $");
 #endif
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 @@ -172,26 +172,27 @@ static	struct	kwtab {
 	kwdef_type(	"double",	DOUBLE,			0,0,0,0,1),
 	kwdef_keyword(	"else",		T_ELSE),
 	kwdef_keyword(	"enum",		T_ENUM),
 	kwdef_token(	"extension",	T_EXTENSION,		0,0,1,0,4),
 	kwdef_sclass(	"extern",	EXTERN,			0,0,0,0,1),
 	kwdef_gcc_attr(	"fallthrough",	T_AT_FALLTHROUGH),
 	kwdef_type(	"float",	FLOAT,			0,0,0,0,1),
 	kwdef_keyword(	"for",		T_FOR),
 	kwdef_gcc_attr(	"format",	T_AT_FORMAT),
 	kwdef_gcc_attr(	"format_arg",	T_AT_FORMAT_ARG),
 	kwdef_gcc_attr(	"gnu_inline",	T_AT_GNU_INLINE),
 	kwdef_gcc_attr(	"gnu_printf",	T_AT_FORMAT_GNU_PRINTF),
 	kwdef_keyword(	"goto",		T_GOTO),
 	kwdef_gcc_attr(	"hot",		T_AT_HOT),
 	kwdef_keyword(	"if",		T_IF),
 	kwdef_token(	"imag",		T_IMAG,			0,0,1,0,4),
 	kwdef_sclass(	"inline",	INLINE,			0,1,0,0,7),
 	kwdef_type(	"int",		INT,			0,0,0,0,1),
 	kwdef_type(	"long",		LONG,			0,0,0,0,1),
 	kwdef_gcc_attr(	"malloc",	T_AT_MALLOC),
 	kwdef_gcc_attr(	"may_alias",	T_AT_MAY_ALIAS),
 	kwdef_gcc_attr(	"minbytes",	T_AT_MINBYTES),
 	kwdef_gcc_attr(	"mode",		T_AT_MODE),
 	kwdef_gcc_attr("no_instrument_function",
 					T_AT_NO_INSTRUMENT_FUNCTION),
 	kwdef_gcc_attr(	"noinline",	T_AT_NOINLINE),
 	kwdef_gcc_attr(	"nonnull",	T_AT_NONNULL),

 @@ -1,31 +1,25 @@
-/*	$NetBSD: gcc_attribute_label.c,v 1.1 2021/07/06 17:33:07 rillig Exp $	*/
+/*	$NetBSD: gcc_attribute_label.c,v 1.2 2021/07/11 19:24:42 rillig Exp $	*/
 # 3 "gcc_attribute_label.c"
 /*
  * Tests for the GCC __attribute__ for labels.
+ *
  * https://gcc.gnu.org/onlinedocs/gcc/Label-Attributes.html
  */
 void dead(void);
 void
 test(int i)
+{
 	if (i < 1000)
 		goto hot;
 	/* TODO: add quotes to message 232 */
 	/*FIXME*//* expect+1: warning: label error unused in function test [232] */
 error:
 	__attribute__((__cold__));
 	dead();
 hot:
 	/* expect+1: error: syntax error '__hot__' [249] */
 	__attribute__((__hot__));
 	/*FIXME*//* expect+1: error: 'i' undefined [99] */
 	if (i < 0)
 		/* TODO: add quotes to message 23 */
 		/* expect+1: warning: undefined label error [23] */
 		goto error;
+}

 @@ -1,7 +1,14 @@
-/*	$NetBSD: msg_023.c,v 1.2 2021/02/21 09:07:58 rillig Exp $	*/
+/*	$NetBSD: msg_023.c,v 1.3 2021/07/11 19:24:42 rillig Exp $	*/
 # 3 "msg_023.c"
 // Test for message: undefined label %s [23]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
+void
-TODO: "Add example code that almost triggers the above message."
+test(void)
+{
 	goto defined_label;
 defined_label:
 	/* TODO: add quotes around '%s' */
 	/* expect+1: warning: undefined label undefined_label [23] */
 	goto undefined_label;
+}

 @@ -1,14 +1,16 @@
-/*	$NetBSD: msg_232.c,v 1.3 2021/01/31 11:12:07 rillig Exp $	*/
+/*	$NetBSD: msg_232.c,v 1.4 2021/07/11 19:24:42 rillig Exp $	*/
 # 3 "msg_232.c"
 // Test for message: label %s unused in function %s [232]
 void
 example(void)
+{
 	goto used_label;
 unused_label:			/* expect: 232 */
 	return;
 used_label:
 	return;
+}
 /* TODO: add quotes around '%s' */