[fuzzer] Replace FuzzerExtFunctionsDlsymWin.cpp with FuzzerExtFunctionsWeakAlias.cpp

jonathanmetzman · jonathanmetzman · commit 0744d3c5a1dd · 2018-09-20T23:24:48.000Z
Summary: Replace FuzzerExtFunctionsDlsymWin.cpp with FuzzerExtFunctionsWeakAlias.cpp to get externally defined functions (eg: LLVMFuzzerInitialize, LLVMFuzzerCustomMutator, etc) working again. Also enable tests that depended on these functions (on windows) Reviewers: rnk, morehouse Reviewed By: rnk, morehouse Subscribers: rnk, morehouse, mgorny Differential Revision: https://reviews.llvm.org/D51700 llvm-svn: 342698
diff --git a/compiler-rt/lib/fuzzer/CMakeLists.txt b/compiler-rt/lib/fuzzer/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LIBFUZZER_SOURCES
   FuzzerDataFlowTrace.cpp
   FuzzerDriver.cpp
   FuzzerExtFunctionsDlsym.cpp
-  FuzzerExtFunctionsDlsymWin.cpp
+  FuzzerExtFunctionsWeakAlias.cpp
   FuzzerExtFunctionsWeak.cpp
   FuzzerExtraCounters.cpp
   FuzzerIO.cpp
diff --git a/compiler-rt/lib/fuzzer/FuzzerExtFunctionsDlsymWin.cpp b/compiler-rt/lib/fuzzer/FuzzerExtFunctionsDlsymWin.cpp
diff --git a/compiler-rt/test/fuzzer/bogus-initialize.test b/compiler-rt/test/fuzzer/bogus-initialize.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows since LLVMFuzzerInitialize does not yet work.
-UNSUPPORTED: windows
 RUN: %cpp_compiler %S/BogusInitializeTest.cpp -o %t-BogusInitializeTest
 
 RUN: not %run %t-BogusInitializeTest 2>&1 | FileCheck %s --check-prefix=BOGUS_INITIALIZE
diff --git a/compiler-rt/test/fuzzer/fuzzer-customcrossover.test b/compiler-rt/test/fuzzer/fuzzer-customcrossover.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows since LLVMFuzzerCustomCrossOver does not yet work.
-UNSUPPORTED: windows
 RUN: %cpp_compiler %S/CustomCrossOverTest.cpp -o %t-CustomCrossOverTest
 
 RUN: not %run %t-CustomCrossOverTest -seed=1 -runs=1000000                2>&1 | FileCheck %s --check-prefix=CHECK_CO
diff --git a/compiler-rt/test/fuzzer/fuzzer-custommutator.test b/compiler-rt/test/fuzzer/fuzzer-custommutator.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows since LLVMFuzzerCustomMutator does not yet work.
-UNSUPPORTED: windows
 RUN: %cpp_compiler %S/CustomMutatorTest.cpp -o %t-CustomMutatorTest
 RUN: not %run %t-CustomMutatorTest 2>&1 | FileCheck %s --check-prefix=LLVMFuzzerCustomMutator
 LLVMFuzzerCustomMutator: In LLVMFuzzerCustomMutator
diff --git a/compiler-rt/test/fuzzer/fuzzer-flags.test b/compiler-rt/test/fuzzer/fuzzer-flags.test
@@ -1,6 +1,3 @@
-# FIXME: Disabled on Windows since LLVMFuzzerInitialize does not yet work.
-UNSUPPORTED: windows
-RUN: %cpp_compiler %S/FlagsTest.cpp -o %t-FlagsTest
 RUN: %run %t-FlagsTest -runs=10 -foo_bar=1 2>&1 | FileCheck %s --check-prefix=FOO_BAR
 FOO_BAR: WARNING: unrecognized flag '-foo_bar=1'; use -help=1 to list all flags
 FOO_BAR: BINGO
diff --git a/compiler-rt/test/fuzzer/initialize.test b/compiler-rt/test/fuzzer/initialize.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows since LLVMFuzzerInitialize does not yet work.
-UNSUPPORTED: windows
 CHECK: BINGO
 RUN: %cpp_compiler %S/InitializeTest.cpp -o %t-InitializeTest
 RUN: not %run %t-InitializeTest -use_value_profile=1 2>&1 | FileCheck %s
diff --git a/compiler-rt/test/fuzzer/standalone.test b/compiler-rt/test/fuzzer/standalone.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows because memmem is a GNU extension.
-UNSUPPORTED: windows
 RUN: %no_fuzzer_c_compiler %libfuzzer_src/standalone/StandaloneFuzzTargetMain.c -c -o %t_1.o
 RUN: %no_fuzzer_cpp_compiler %S/InitializeTest.cpp -c -o %t_2.o
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# FIXME: Disabled on Windows since LLVMFuzzerInitialize does not yet work.`
`2`		`-UNSUPPORTED: windows`
`3`	`1`	`RUN: %cpp_compiler %S/BogusInitializeTest.cpp -o %t-BogusInitializeTest`
`4`	`2`
`5`	`3`	`RUN: not %run %t-BogusInitializeTest 2>&1 \| FileCheck %s --check-prefix=BOGUS_INITIALIZE`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# FIXME: Disabled on Windows because memmem is a GNU extension.`
`2`		`-UNSUPPORTED: windows`
`3`	`1`	`RUN: %no_fuzzer_c_compiler %libfuzzer_src/standalone/StandaloneFuzzTargetMain.c -c -o %t_1.o`
`4`	`2`	`RUN: %no_fuzzer_cpp_compiler %S/InitializeTest.cpp -c -o %t_2.o`
`5`	`3`