diff options
| author | Martin Liska <mliska@suse.cz> | 2022-06-29 10:26:52 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-07-08 13:23:44 +0200 |
| commit | 6da7f7c5ac03f85a753989712588511e5f56e73d (patch) | |
| tree | 203c66d1c5296fadc784635c97c6552771b0c260 /gcc | |
| parent | cf3a120084e94614a4917f71940325cd4b537f24 (diff) | |
| download | gcc-6da7f7c5ac03f85a753989712588511e5f56e73d.zip gcc-6da7f7c5ac03f85a753989712588511e5f56e73d.tar.gz gcc-6da7f7c5ac03f85a753989712588511e5f56e73d.tar.bz2 | |
sanitizer: Fix hwasan related option conflicts [PR106132]
Split report_conflicting_sanitizer_options(..., SANITIZE_ADDRESS | SANITIZE_HWADDRESS)
call into 2 calls as we don't have any option that would be
address+hwaddress (that conflicts) as well.
PR sanitizer/106132
gcc/ChangeLog:
* opts.cc (finish_options): Use 2 calls to
report_conflicting_sanitizer_options.
gcc/testsuite/ChangeLog:
* c-c++-common/hwasan/arguments-3.c: Cover new ICE.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/opts.cc | 4 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/hwasan/arguments-3.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/opts.cc b/gcc/opts.cc index fe0293e..54e57f3 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -1214,7 +1214,9 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, /* Address sanitizers conflict with the thread sanitizer. */ report_conflicting_sanitizer_options (opts, loc, SANITIZE_THREAD, - SANITIZE_ADDRESS | SANITIZE_HWADDRESS); + SANITIZE_ADDRESS); + report_conflicting_sanitizer_options (opts, loc, SANITIZE_THREAD, + SANITIZE_HWADDRESS); /* The leak sanitizer conflicts with the thread sanitizer. */ report_conflicting_sanitizer_options (opts, loc, SANITIZE_LEAK, SANITIZE_THREAD); diff --git a/gcc/testsuite/c-c++-common/hwasan/arguments-3.c b/gcc/testsuite/c-c++-common/hwasan/arguments-3.c index 6e907b4..2bf8917 100644 --- a/gcc/testsuite/c-c++-common/hwasan/arguments-3.c +++ b/gcc/testsuite/c-c++-common/hwasan/arguments-3.c @@ -1,3 +1,5 @@ /* { dg-do compile } */ -/* { dg-additional-options "-fsanitize=thread" } */ +/* { dg-additional-options "-fsanitize=thread,address" } */ +/* { dg-error ".*'-fsanitize=thread' is incompatible with '-fsanitize=address'.*" "" { target *-*-* } 0 } */ /* { dg-error ".*'-fsanitize=thread' is incompatible with '-fsanitize=hwaddress'.*" "" { target *-*-* } 0 } */ +/* { dg-error ".*'-fsanitize=hwaddress' is incompatible with '-fsanitize=address'.*" "" { target *-*-* } 0 } */ |