Revert "[FuzzMutate] Split out FuzzerCLI library that doesn't depend on IR."

AaronBallman · AaronBallman · commit a1bb952e833b · 2022-05-07T07:29:57.000-04:00
This reverts commit 1c5e85b. It broke a lot of bots with a link error: https://lab.llvm.org/buildbot/#/builders/171/builds/14222 https://lab.llvm.org/buildbot/#/builders/188/builds/13748 https://lab.llvm.org/buildbot/#/builders/109/builds/38127
diff --git a/clang-tools-extra/clangd/fuzzer/CMakeLists.txt b/clang-tools-extra/clangd/fuzzer/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  FuzzerCLI
+  FuzzMutate
   Support
   )
 
diff --git a/clang-tools-extra/pseudo/fuzzer/CMakeLists.txt b/clang-tools-extra/pseudo/fuzzer/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  FuzzerCLI
+  FuzzMutate
   Support
   )
 
diff --git a/clang/tools/clang-fuzzer/CMakeLists.txt b/clang/tools/clang-fuzzer/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} FuzzerCLI)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} FuzzMutate)
 set(CXX_FLAGS_NOFUZZ ${CMAKE_CXX_FLAGS})
 set(DUMMY_MAIN DummyClangFuzzer.cpp)
 if(LLVM_LIB_FUZZING_ENGINE)
diff --git a/llvm/lib/FuzzMutate/CMakeLists.txt b/llvm/lib/FuzzMutate/CMakeLists.txt
@@ -1,23 +1,9 @@
-# Generic helper for fuzzer binaries.
-# This should not depend on LLVM IR etc.
-add_llvm_component_library(LLVMFuzzerCLI
-  FuzzerCLI.cpp
-  PARTIAL_SOURCES_INTENDED
-
-  ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/FuzzMutate
-
-  LINK_COMPONENTS
-  Support
-  )
-
-# Library for using LLVM IR together with fuzzers.
 add_llvm_component_library(LLVMFuzzMutate
+  FuzzerCLI.cpp
   IRMutator.cpp
   OpDescriptor.cpp
   Operations.cpp
   RandomIRBuilder.cpp
-  PARTIAL_SOURCES_INTENDED
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/FuzzMutate
diff --git a/llvm/tools/llvm-dlang-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-dlang-demangle-fuzzer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
-  FuzzerCLI
+  FuzzMutate
   Support
 )
 
diff --git a/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt b/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt
@@ -9,7 +9,6 @@ set(LLVM_LINK_COMPONENTS
     BitWriter
     CodeGen
     Core
-    FuzzerCLI
     FuzzMutate
     IRReader
     MC
diff --git a/llvm/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-itanium-demangle-fuzzer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
-  FuzzerCLI
+  FuzzMutate
   Support
 )
 
diff --git a/llvm/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-microsoft-demangle-fuzzer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
-  FuzzerCLI
+  FuzzMutate
   Support
 )
 
diff --git a/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt b/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
@@ -14,7 +14,6 @@ set(LLVM_LINK_COMPONENTS
   AggressiveInstCombine
   InstCombine
   Instrumentation
-  FuzzerCLI
   FuzzMutate
   MC
   ObjCARCOpts
diff --git a/llvm/tools/llvm-rust-demangle-fuzzer/CMakeLists.txt b/llvm/tools/llvm-rust-demangle-fuzzer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Demangle
-  FuzzerCLI
+  FuzzMutate
   Support
 )
 
diff --git a/llvm/tools/llvm-special-case-list-fuzzer/CMakeLists.txt b/llvm/tools/llvm-special-case-list-fuzzer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Support
-  FuzzerCLI
+  FuzzMutate
 )
 
 add_llvm_fuzzer(llvm-special-case-list-fuzzer
diff --git a/llvm/tools/llvm-yaml-numeric-parser-fuzzer/CMakeLists.txt b/llvm/tools/llvm-yaml-numeric-parser-fuzzer/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
   Support
-  FuzzerCLI
+  FuzzMutate
 )
 
 add_llvm_fuzzer(llvm-yaml-numeric-parser-fuzzer
diff --git a/mlir/tools/mlir-parser-fuzzer/CMakeLists.txt b/mlir/tools/mlir-parser-fuzzer/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  FuzzerCLI
+  FuzzMutate
   Support
 )
 add_llvm_fuzzer(mlir-parser-fuzzer

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`set(LLVM_LINK_COMPONENTS`
`2`		`- FuzzerCLI`
	`2`	`+ FuzzMutate`
`3`	`3`	`Support`
`4`	`4`	`)`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} FuzzerCLI)`
	`1`	`+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} FuzzMutate)`
`2`	`2`	`set(CXX_FLAGS_NOFUZZ ${CMAKE_CXX_FLAGS})`
`3`	`3`	`set(DUMMY_MAIN DummyClangFuzzer.cpp)`
`4`	`4`	`if(LLVM_LIB_FUZZING_ENGINE)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`set(LLVM_LINK_COMPONENTS`
`2`	`2`	`Demangle`
`3`		`- FuzzerCLI`
	`3`	`+ FuzzMutate`
`4`	`4`	`Support`
`5`	`5`	`)`
`6`	`6`