From 7448392895a58c004d8b098cb385307c2111731e Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Wed, 1 Dec 2021 20:47:52 -0800 Subject: [PATCH] [cc/sanitize] Re-enable new pass manager for fuzzer targets Bug: http://b/133876586 This was turned off but the upstream change fixing this has been long part of the Android toolchain. Test: Output of m aidl_parser_fuzzer; readelf aidl_parser_fuzzer | grep -c sancov hasn't changed. Change-Id: Id7edd7ac5791b0e031fd4af46381acdbb1b80d47 --- cc/sanitize.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index 93d4b4c54..d7b1adee5 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -35,7 +35,6 @@ var ( asanCflags = []string{ "-fno-omit-frame-pointer", - "-fno-experimental-new-pass-manager", } asanLdflags = []string{"-Wl,-u,__asan_preinit"} @@ -666,9 +665,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { flags.Local.LdFlags = append(flags.Local.LdFlags, "-fno-sanitize-coverage=stack-depth") flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize-coverage=stack-depth") - // TODO(b/133876586): Experimental PM breaks sanitizer coverage. - flags.Local.CFlags = append(flags.Local.CFlags, "-fno-experimental-new-pass-manager") - // Disable fortify for fuzzing builds. Generally, we'll be building with // UBSan or ASan here and the fortify checks pollute the stack traces. flags.Local.CFlags = append(flags.Local.CFlags, "-U_FORTIFY_SOURCE")