From 8434a039e28c17e9264bbc59a1ab3096bfded166 Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Wed, 6 May 2015 22:47:24 +0000
Subject: [PATCH] [lib/Fuzzer] remove dfsan_fuzzer_abi.list -- its contents are
 now moved to dfsan proper

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236659 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Fuzzer/FuzzerDFSan.cpp           |  2 +-
 lib/Fuzzer/dfsan_fuzzer_abi.list     | 12 ------------
 lib/Fuzzer/test/dfsan/CMakeLists.txt |  5 +----
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 lib/Fuzzer/dfsan_fuzzer_abi.list

diff --git a/lib/Fuzzer/FuzzerDFSan.cpp b/lib/Fuzzer/FuzzerDFSan.cpp
index 16f8c0fa3d7..cd6ec3fb3c4 100644
--- a/lib/Fuzzer/FuzzerDFSan.cpp
+++ b/lib/Fuzzer/FuzzerDFSan.cpp
@@ -59,7 +59,7 @@
   clang  -fPIC -c -g -O2 -std=c++11 Fuzzer*.cpp
   clang++ -O0 -std=c++11 -fsanitize-coverage=3  \
     -mllvm -sanitizer-coverage-experimental-trace-compares=1 \
-    -fsanitize=dataflow -fsanitize-blacklist=./dfsan_fuzzer_abi.list  \
+    -fsanitize=dataflow \
     test/dfsan/DFSanSimpleCmpTest.cpp Fuzzer*.o
   ./a.out
 )
diff --git a/lib/Fuzzer/dfsan_fuzzer_abi.list b/lib/Fuzzer/dfsan_fuzzer_abi.list
deleted file mode 100644
index 6cc684368a6..00000000000
--- a/lib/Fuzzer/dfsan_fuzzer_abi.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Replaces __sanitizer_cov_trace_cmp with __dfsw___sanitizer_cov_trace_cmp
-fun:__sanitizer_cov_trace_cmp=custom
-fun:__sanitizer_cov_trace_cmp=uninstrumented
-
-# Ignores coverage callbacks.
-fun:__sanitizer_cov=uninstrumented
-fun:__sanitizer_cov=discard
-fun:__sanitizer_cov_module_init=uninstrumented
-fun:__sanitizer_cov_module_init=discard
-
-# Don't add extra parameters to the Fuzzer callback.
-fun:LLVMFuzzerTestOneInput=uninstrumented
diff --git a/lib/Fuzzer/test/dfsan/CMakeLists.txt b/lib/Fuzzer/test/dfsan/CMakeLists.txt
index b5b874fb1ce..f92fde9bcac 100644
--- a/lib/Fuzzer/test/dfsan/CMakeLists.txt
+++ b/lib/Fuzzer/test/dfsan/CMakeLists.txt
@@ -1,12 +1,9 @@
 # These tests depend on both coverage and dfsan instrumentation.
 
-set(DFSAN_FUZZER_ABI_LIST "${CMAKE_CURRENT_SOURCE_DIR}/../../dfsan_fuzzer_abi.list")
-
 set(CMAKE_CXX_FLAGS_RELEASE
-  "${LIBFUZZER_FLAGS_BASE} -O0 -fno-sanitize=all -fsanitize=dataflow -mllvm -sanitizer-coverage-experimental-trace-compares=1 -fsanitize-blacklist=${DFSAN_FUZZER_ABI_LIST}")
+  "${LIBFUZZER_FLAGS_BASE} -O0 -fno-sanitize=all -fsanitize=dataflow -mllvm -sanitizer-coverage-experimental-trace-compares=1")
 
 foreach(Test ${DFSanTests})
-  set_source_files_properties(${Test}.cpp PROPERTIES OBJECT_DEPENDS ${DFSAN_FUZZER_ABI_LIST})
   add_executable(LLVMFuzzer-${Test}
     ${Test}.cpp
     )