diff options
| author | 2022-09-29 15:48:08 -0700 | |
|---|---|---|
| committer | 2022-09-29 15:49:46 -0700 | |
| commit | 1bda2462352ffa298241f4efadb69756f06ea8df (patch) | |
| tree | 56319c16a5c50a55a315e61200fbb87a2bca3b5c | |
| parent | 7ea3a8248060ee279d17bf2ca71051d049917278 (diff) | |
[MTE] unset colliding sanitizers for mutators
Bug: 174878242
Test: m device-tests with SANITIZE_TARGET=memtag_stack
Change-Id: Ia8659a90c6c1efd9109324e6c46748b434cbfd24
| -rw-r--r-- | cc/sanitize.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/sanitize.go b/cc/sanitize.go index 436b14913..0b47f0e6d 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -881,8 +881,12 @@ func (sanitize *sanitize) SetSanitizer(t SanitizerType, b bool) { switch t { case Asan: sanitize.Properties.Sanitize.Address = bPtr + // For ASAN variant, we need to disable Memtag_stack + sanitize.Properties.Sanitize.Memtag_stack = nil case Hwasan: sanitize.Properties.Sanitize.Hwaddress = bPtr + // For HWAsan variant, we need to disable Memtag_stack + sanitize.Properties.Sanitize.Memtag_stack = nil case tsan: sanitize.Properties.Sanitize.Thread = bPtr case intOverflow: @@ -895,6 +899,7 @@ func (sanitize *sanitize) SetSanitizer(t SanitizerType, b bool) { sanitize.Properties.Sanitize.Memtag_heap = bPtr case Memtag_stack: sanitize.Properties.Sanitize.Memtag_stack = bPtr + // We do not need to disable ASAN or HWASan here, as there is no Memtag_stack variant. case Fuzzer: sanitize.Properties.Sanitize.Fuzzer = bPtr default: |