Commit a6986c17 authored by Max Moroz's avatar Max Moroz Committed by Commit Bot

[libFuzzer] Switch back to -fsanitize=fuzzer-no-link instrumentation on Mac.

This reverts the speculative fix landed in https://crrev.com/c/1262077.

Bug: 892167
Change-Id: I1eb3c8c9cb2615cfd33681554fad7e4234a4a497
Reviewed-on: https://chromium-review.googlesource.com/c/1332428Reviewed-by: default avatarJonathan Metzman <metzman@chromium.org>
Commit-Queue: Max Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607636}
parent 0e86ce8f
...@@ -202,9 +202,7 @@ config("default_sanitizer_ldflags") { ...@@ -202,9 +202,7 @@ config("default_sanitizer_ldflags") {
} }
if (use_sanitizer_coverage) { if (use_sanitizer_coverage) {
# TODO(crbug.com/892167): Remove the is_mac check when new instrumentation if (use_libfuzzer) {
# works on Mac.
if (use_libfuzzer && !is_mac) {
ldflags += [ "-fsanitize=fuzzer-no-link" ] ldflags += [ "-fsanitize=fuzzer-no-link" ]
} else { } else {
ldflags += [ "-fsanitize-coverage=$sanitizer_coverage_flags" ] ldflags += [ "-fsanitize-coverage=$sanitizer_coverage_flags" ]
...@@ -402,9 +400,7 @@ config("coverage_flags") { ...@@ -402,9 +400,7 @@ config("coverage_flags") {
# Used by sandboxing code to allow coverage dump to be written on the disk. # Used by sandboxing code to allow coverage dump to be written on the disk.
defines = [ "SANITIZER_COVERAGE" ] defines = [ "SANITIZER_COVERAGE" ]
# TODO(crbug.com/892167): Remove the is_mac check when new instrumentation if (use_libfuzzer) {
# works on Mac.
if (use_libfuzzer && !is_mac) {
cflags += [ "-fsanitize=fuzzer-no-link" ] cflags += [ "-fsanitize=fuzzer-no-link" ]
} else { } else {
cflags += [ cflags += [
......
...@@ -100,8 +100,7 @@ declare_args() { ...@@ -100,8 +100,7 @@ declare_args() {
# Value for -fsanitize-coverage flag. Setting this causes # Value for -fsanitize-coverage flag. Setting this causes
# use_sanitizer_coverage to be enabled. # use_sanitizer_coverage to be enabled.
# This flag is not used for libFuzzer (use_libfuzzer=true) unless we are on # This flag is not used for libFuzzer (use_libfuzzer=true). Instead, we use:
# Mac. Instead, we use:
# -fsanitize=fuzzer-no-link # -fsanitize=fuzzer-no-link
# Default value when unset and use_fuzzing_engine=true: # Default value when unset and use_fuzzing_engine=true:
# trace-pc-guard # trace-pc-guard
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment