Merging 32 commit(s) from Chromium's toolchain-utils am: 7bc245bad9 am: 6323407a0d

Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1937961

Change-Id: Ib3d45bbdce54e181b3f361afb9af129256ecb101

1 files changed, 1 insertions, 18 deletions

diff --git a/compiler_wrapper/sanitizer_flags.go b/compiler_wrapper/sanitizer_flags.go
index fe8d1503..da0a64b3 100644
--- a/compiler_wrapper/sanitizer_flags.go
+++ b/compiler_wrapper/sanitizer_flags.go
@@ -9,20 +9,13 @@ import (
 )
 
 func processSanitizerFlags(builder *commandBuilder) {
-	hasCoverageFlags := false
 	hasSanitizeFlags := false
-	hasSanitizeFuzzerFlags := false
 	for _, arg := range builder.args {
 		// TODO: This should probably be -fsanitize= to not match on
-		// e.g. -fsanitize-blacklist
+		// e.g. -fsanitize-blocklist
 		if arg.fromUser {
 			if strings.HasPrefix(arg.value, "-fsanitize") {
 				hasSanitizeFlags = true
-				if strings.Contains(arg.value, "fuzzer") {
-					hasSanitizeFuzzerFlags = true
-				}
-			} else if arg.value == "-fprofile-instr-generate" {
-				hasCoverageFlags = true
 			}
 		}
 	}
@@ -44,15 +37,5 @@ func processSanitizerFlags(builder *commandBuilder) {
 			}
 			return arg.value
 		})
-		if builder.target.compilerType == clangType {
-			// hasSanitizeFlags && hasCoverageFlags is to work around crbug.com/1013622
-			if hasSanitizeFuzzerFlags || (hasSanitizeFlags && hasCoverageFlags) {
-				fuzzerFlagsToAdd := []string{
-					// TODO: This flag should be removed once fuzzer works with new pass manager
-					"-fno-experimental-new-pass-manager",
-				}
-				builder.addPreUserArgs(fuzzerFlagsToAdd...)
-			}
-		}
 	}
 }