mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-03-19 18:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

BR 3392539: some errors can "cascade". Allow suppressing if dead.

Browse Source 
In BR 3392539, the error:

helloW.s:18: error: label `rurt' changed during code generation
[-w+error=label-redef-late]

... occurs a number of times after we have already issued an
error. This is because the erroring instruction computes to a
different size during code generation; this causes each subsequent
label to cause a phase error.

The phase error simply doesn't make much sense to report: if we are
already committed to erroring out, it is more likely an error cascade
rather than an error in its own right, so just suppress it in that
case.

Reported-by: <russvz@comcast.net>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2018-12-27 11:24:17 -08:00
parent 74246c499e
commit 4cf86ddde8
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/labels.c
View File

@ -529,7 +529,7 @@ void define_label(const char *label, int32_t segment,
* As a special case, LBL_SPECIAL symbols are allowed to be changed
* even during the last pass.
*/
nasm_error(ERR_WARNING|WARN_LABEL_LATE,
nasm_error(ERR_WARNING|WARN_LABEL_LATE|ERR_UNDEAD,
"label `%s' %s during code generation",
lptr->defn.label, created ? "defined" : "changed");
}

7
asm/nasm.c
View File

@ -1775,8 +1775,13 @@ static bool skip_this_pass(int severity)
*/
static bool is_suppressed(int severity)
{
/* Fatal errors must never be suppressed */
if ((severity & ERR_MASK) >= ERR_FATAL)
return false; /* Fatal errors can never be suppressed */
return false;
/* This error/warning is pointless if we are dead anyway */
if ((severity & ERR_UNDEAD) && terminate_after_phase)
return true;
return !(warning_state[warn_index(severity)] & WARN_ST_ENABLED);
}

1
include/error.h
View File

@ -76,6 +76,7 @@ static inline vefunc nasm_set_verror(vefunc ve)
#define ERR_PANIC 0x00000007 /* internal error: panic instantly
* and dump core for reference */
#define ERR_MASK 0x00000007 /* mask off the above codes */
#define ERR_UNDEAD 0x00000008 /* skip if we already have errors */
#define ERR_NOFILE 0x00000010 /* don't give source file name/line */
#define ERR_HERE 0x00000020 /* point to a specific source location */
#define ERR_USAGE 0x00000040 /* print a usage message */