 @@ -1,14 +1,14 @@
-# $NetBSD: mi,v 1.1199 2022/04/26 22:48:53 blymn Exp $
+# $NetBSD: mi,v 1.1200 2022/04/28 21:38:38 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
 @@ -6495,27 +6495,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-obsolete		obsolete
+./usr/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp		tests-usr.bin-tests	compattestfile,atf
 ./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_builtin_alloca.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_builtin_alloca.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_builtin_overflow.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_builtin_overflow.exp	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/gcc_cast_union.c		tests-usr.bin-tests	compattestfile,atf

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.120 2022/04/16 20:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.121 2022/04/28 21:38:38 rillig Exp $
 NOMAN=		# defined
 MAX_MESSAGE=	348		# see lint1/err.c
 .include <bsd.own.mk>
 ARCHSUBDIR!=	cd ${NETBSDSRCDIR}/usr.bin/xlint/lint1 && ${MAKE} -v ARCHSUBDIR
 TESTSDIR=	${TESTSBASE}/usr.bin/xlint/lint1
 TESTS_SH=	t_integration
 TESTS_SH_SRC_t_integration=	archsubdir.sh t_integration.sh
 CLEANFILES+=	archsubdir.sh
 @@ -155,26 +155,27 @@ FILES+=		expr_promote_trad.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_builtin_alloca.c
 FILES+=		gcc_builtin_alloca.exp
 FILES+=		gcc_builtin_overflow.c
 FILES+=		gcc_builtin_overflow.exp
 FILES+=		gcc_cast_union.c

 @@ -1,25 +1,49 @@
-/*	$NetBSD: gcc_attribute_label.c,v 1.2 2021/07/11 19:24:42 rillig Exp $	*/
+/*	$NetBSD: gcc_attribute_label.c,v 1.3 2022/04/28 21:38:38 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;
 error:
 	__attribute__((__cold__));
 	dead();
 hot:
 	__attribute__((__hot__));
 	if (i < 0)
 		goto error;
+}
 /* GCC allows a label to be marked as (possibly) unused. */
 void
 unused_labels(int x)
+{
 	switch (x) {
 	case 3:
 		__attribute__((__unused__))
 		break;
 	case 4:
 		goto label;
 	label:
 		__attribute__((__unused__))
 		return;
+	}
 	/*
 	 * The GCC attributes may only occur after a label; they cannot occur
 	 * before an arbitrary statement.
 	 */
 	__attribute__((__unused__))
 	/* expect+1: error: syntax error 'return' [249] */
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gcc_attribute_stmt.c,v 1.2 2022/04/28 07:10:39 rillig Exp $	*/
+/*	$NetBSD: gcc_attribute_stmt.c,v 1.3 2022/04/28 21:38:38 rillig Exp $	*/
 # 3 "gcc_attribute_stmt.c"
 /*
  * Tests for the GCC __attribute__ for statements.
+ *
  * https://gcc.gnu.org/onlinedocs/gcc/Statement-Attributes.html
  */
 void println(const char *);
 void
 attribute_fallthrough(int i)
+{
 @@ -24,34 +24,13 @@ attribute_fallthrough(int i)
 		println("odd");
 		__attribute__((__fallthrough__));
 	case 2:
 		/*
 		 * Only the null statement can have the attribute
 		 * 'fallthrough'. This is already caught by GCC, so
 		 * lint does not need to care.
 		 */
 		/* expect+2: error: syntax error '__attribute__' [249] */
 		println("prime")
 		    __attribute__((__fallthrough__));
+	}
+}
 /*
  * Despite being undocumented, GCC 10 accepts __attribute__((__unused__))
  * at the beginning of a statement.
  */
 void
 unused_statements(int x)
 	switch (x) {
 	case 3:
 		__attribute__((__unused__))
 		/* expect+1: error: syntax error 'break' [249] */
 		break;
 	case 4:
 		goto label;
 	label:
 		__attribute__((__unused__))
 		/* expect+1: error: syntax error 'return' [249] */
 		return;

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.402 2022/04/24 20:08:22 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.403 2022/04/28 21:38:38 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.402 2022/04/24 20:08:22 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.403 2022/04/28 21:38:38 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.
 @@ -116,27 +116,27 @@ anonymize(sym_t *s)
 	for ( ; s != NULL; s = s->s_next)
 		s->u.s_member.sm_sou_type = NULL;
+}
 #if defined(YYDEBUG) && (defined(YYBYACC) || defined(YYBISON))
 #define YYSTYPE_TOSTRING cgram_to_string
 #endif
 #if defined(YYDEBUG) && defined(YYBISON)
 #define YYPRINT cgram_print
 #endif
 %}
-%expect 128
+%expect 132
 %union {
 	val_t	*y_val;
 	sbuf_t	*y_name;
 	sym_t	*y_sym;
 	op_t	y_op;
 	scl_t	y_scl;
 	tspec_t	y_tspec;
 	tqual_t	y_tqual;
 	type_t	*y_type;
 	tnode_t	*y_tnode;
 	range_t	y_range;
 	strg_t	*y_string;
 @@ -1645,27 +1645,27 @@ statement:			/* C99 6.8 */
 non_expr_statement:		/* helper for C99 6.8 */
 	  type_attribute T_SEMI
 	| labeled_statement
 	| compound_statement
 	| selection_statement
 	| iteration_statement
 	| jump_statement {
 		seen_fallthrough = false;
+	  }
 	| asm_statement
+	;
 labeled_statement:		/* C99 6.8.1 */
-	  label statement
+	  label type_attribute_opt statement
+	;
 label:
 	  T_NAME T_COLON {
 		symtyp = FLABEL;
 		named_label(getsym($1));
+	  }
 	| T_CASE constant_expr T_COLON {
 		case_label($2);
 		seen_fallthrough = true;
+	  }
 	| T_CASE constant_expr T_ELLIPSIS constant_expr T_COLON {
 		/* XXX: We don't fill all cases */