commit 002dd30e94dffb9376c51432b24a9063bde3e56a
author Mitch Phillips <mitchp@google.com> Tue Apr 13 15:31:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 13 15:31:14 2021 +0000
tree 73c48761d681362c82a6ee1f6f983104907cf1d6
parent 27db0284d095b227c16fdfff8987b2ea2da7e539
parent 77e037c8876ffacf100f89e47c2f68881f826239

Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index e0b8fde..4a94e93 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -139,7 +139,7 @@
     ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_sync_include_paths)),\
            $(filter $(dir)%,$(LOCAL_PATH)))),)
       my_sanitize := memtag_heap $(my_sanitize)
-      my_sanitize_diag := memtag_heap $(my_sanitize)
+      my_sanitize_diag := memtag_heap $(my_sanitize_diag)
     else ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_async_include_paths)),\
            $(filter $(dir)%,$(LOCAL_PATH)))),)
       my_sanitize := memtag_heap $(my_sanitize)