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

This reverts commit a1bb952e83. I'd somehow missed updating llvm-yaml-parser-fuzzer, now fixed.
2022-05-07 13:44:42 +02:00 · 2022-05-07 13:44:42 +02:00 · e571e1a6c3
parent a1bb952e83
commit e571e1a6c3
14 changed files with 28 additions and 12 deletions
--- a/clang-tools-extra/clangd/fuzzer/CMakeLists.txt
+++ b/clang-tools-extra/clangd/fuzzer/CMakeLists.txt
@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  FuzzMutate
+  FuzzerCLI
  Support
  )

--- a/clang-tools-extra/pseudo/fuzzer/CMakeLists.txt
+++ b/clang-tools-extra/pseudo/fuzzer/CMakeLists.txt
@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  FuzzMutate
+  FuzzerCLI
  Support
  )

--- 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} FuzzMutate)
+set(LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} FuzzerCLI)
 set(CXX_FLAGS_NOFUZZ ${CMAKE_CXX_FLAGS})
 set(DUMMY_MAIN DummyClangFuzzer.cpp)
 if(LLVM_LIB_FUZZING_ENGINE)
--- a/llvm/lib/FuzzMutate/CMakeLists.txt
+++ b/llvm/lib/FuzzMutate/CMakeLists.txt
@ -1,9 +1,23 @@
-add_llvm_component_library(LLVMFuzzMutate
+# 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
  IRMutator.cpp
  OpDescriptor.cpp
  Operations.cpp
  RandomIRBuilder.cpp
+  PARTIAL_SOURCES_INTENDED

  ADDITIONAL_HEADER_DIRS
  ${LLVM_MAIN_INCLUDE_DIR}/llvm/FuzzMutate
--- 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
-  FuzzMutate
+  FuzzerCLI
  Support
 )

--- a/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-isel-fuzzer/CMakeLists.txt
@ -9,6 +9,7 @@ set(LLVM_LINK_COMPONENTS
    BitWriter
    CodeGen
    Core
+    FuzzerCLI
    FuzzMutate
    IRReader
    MC
--- 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
-  FuzzMutate
+  FuzzerCLI
  Support
 )

--- 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
-  FuzzMutate
+  FuzzerCLI
  Support
 )

--- a/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-opt-fuzzer/CMakeLists.txt
@ -14,6 +14,7 @@ set(LLVM_LINK_COMPONENTS
  AggressiveInstCombine
  InstCombine
  Instrumentation
+  FuzzerCLI
  FuzzMutate
  MC
  ObjCARCOpts
--- 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
-  FuzzMutate
+  FuzzerCLI
  Support
 )

--- 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
-  FuzzMutate
+  FuzzerCLI
 )

 add_llvm_fuzzer(llvm-special-case-list-fuzzer
--- 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
-  FuzzMutate
+  FuzzerCLI
 )

 add_llvm_fuzzer(llvm-yaml-numeric-parser-fuzzer
--- a/llvm/tools/llvm-yaml-parser-fuzzer/CMakeLists.txt
+++ b/llvm/tools/llvm-yaml-parser-fuzzer/CMakeLists.txt
@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS
  Support
-  FuzzMutate
+  FuzzerCLI
 )

 add_llvm_fuzzer(llvm-yaml-parser-fuzzer
--- a/mlir/tools/mlir-parser-fuzzer/CMakeLists.txt
+++ b/mlir/tools/mlir-parser-fuzzer/CMakeLists.txt
@ -1,5 +1,5 @@
 set(LLVM_LINK_COMPONENTS
-  FuzzMutate
+  FuzzerCLI
  Support
 )
 add_llvm_fuzzer(mlir-parser-fuzzer