From 06aca9b44818caec920c83fc5844e83591dd472e Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Thu, 1 Dec 2022 04:13:23 +0000 Subject: [PATCH] Remove workaround for -fexceptions and stack MTE The upstream change was merged in https://r.android.com/2322236 Bug: 174878242 Change-Id: Ia23d4a9d6ef54ed2c286e0b1becec1f35df75160 --- cc/sanitize.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 12ff9bac5..cf4ace2af 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -725,14 +725,6 @@ func (s *sanitize) flags(ctx ModuleContext, flags Flags) Flags { } sanProps := &s.Properties.SanitizeMutated - // Currently unwinding through tagged frames for exceptions is broken, so disable memtag stack - // in that case, so we don't end up tagging those. - // TODO(b/174878242): Remove once https://r.android.com/2251926 is included in toolchain. - if android.InList("-fexceptions", flags.Local.CFlags) || android.InList("-fexceptions", flags.Global.CFlags) { - sanProps.Memtag_stack = nil - _, s.Properties.Sanitizers = android.RemoveFromList("memtag-stack", s.Properties.Sanitizers) - } - if Bool(sanProps.Address) { if ctx.Arch().ArchType == android.Arm { // Frame pointer based unwinder in ASan requires ARM frame setup.