Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint: report proper file name in assertion failures 

When given the (obviously malformed) translation unit 'f=({;};}', lint
runs into an assertion failure.  It reported this as occurring near
':1'.  This location was missing a filename since the input didn't
contain a GCC line number directive such as '# 2 "input.c"'.  In GCC mode,
the GCC builtins are loaded first, in which case the reported location
was ':9'.

Fix this by providing proper location information, even for input that
does not come from the GCC C preprocessor.
This commit is contained in:
rillig 2022-05-30 15:13:25 +00:00
parent ea5c23be9b
commit 3db564a92c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/xlint/lint1/main1.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main1.c,v 1.62 2022/05/20 21:18:55 rillig Exp $ */
/* $NetBSD: main1.c,v 1.63 2022/05/30 15:13:25 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
__RCSID("$NetBSD: main1.c,v 1.62 2022/05/20 21:18:55 rillig Exp $");
__RCSID("$NetBSD: main1.c,v 1.63 2022/05/30 15:13:25 rillig Exp $");
#endif
#include <sys/types.h>
@ -288,6 +288,9 @@ main(int argc, char *argv[])
if (allow_gcc && allow_c90) {
if ((yyin = gcc_builtins()) == NULL)
err(1, "cannot open builtins");
curr_pos.p_file = "<gcc-builtins>";
curr_pos.p_line = 0;
lex_next_line();
yyparse();
(void)fclose(yyin);
}
@ -295,6 +298,9 @@ main(int argc, char *argv[])
/* open the input file */
if ((yyin = fopen(argv[0], "r")) == NULL)
err(1, "cannot open '%s'", argv[0]);
curr_pos.p_file = argv[0];
curr_pos.p_line = 0;
lex_next_line();
yyparse();
(void)fclose(yyin);