Merge "Remove workaround for -fexceptions and stack MTE" am: a8ad378abc am: 7860257d28

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2322242

Change-Id: If2eb73f698ba60bda7625ae2dc42040907ce935e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-12-02 01:52:13 +00:00
committed by Automerger Merge Worker

View File

@@ -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.