[libFuzzer] Diff 44 - Remove dependency for tests on Windows.

[mpividori]

Summary

Remove dependency on FileCheck and not for tests on Windows.
If LLVM_USE_SANITIZER=Address and LLVM_USE_SANITIZE_COVERAGE=YES, this will trigger the building of target FileCheck with sanitizer instrumentation. This will fail in Windows, since cmake will use link.exe for linking and won't include compiler-rt libraries.

[kcc]

I'd love to get rid of these extra cmake flags, but I am not sure this is the right time.
Now, we also require that the host compiler is a fresh clang (preferably, from the same revision) and we have no way to enforce that.
So these pesky cmake flags "kind of" protect us accidentally using a non-fresh-clang host compiler (because they force the user to read the docs)

lib/Fuzzer/test/CMakeLists.txt

35

Why not add -fsanitize=address unconditionally?

[mpividori]

@kcc Ok. So, I see two options to achieve both goals:
+ Force the user to read the docs.
+ Make it work on Windows (don't use instrumentation for FileCheck target).

Or remove these flags, (as this diff does), and add a new cmake flag: ENABLE_LIBFUZZER , with default value false.
Or modify ./modules/HandleLLVMOptions.cmake, to not append "-fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp" when LLVM_USE_SANITIZE_COVERAGE is true.

lib/Fuzzer/test/CMakeLists.txt

35

@kcc Yes, I can do that. I just wanted to avoid duplicating a flag when it is not necessary.

[kcc]

In D27993#631795, @mpividori wrote:

@kcc Ok. So, I see two options to achieve both goals:
+ Force the user to read the docs.

Never works.

+ Make it work on Windows (don't use instrumentation for FileCheck target).

One option that you proposed off-line is to remove dependency on FileCheck (win-only) and rely on having it in PATH.
Hacky, but simple.

Or remove these flags, (as this diff does), and add a new cmake flag: ENABLE_LIBFUZZER , with default value false.

Mmmm. What will it change?

Or modify ./modules/HandleLLVMOptions.cmake, to not append "-fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp" when LLVM_USE_SANITIZE_COVERAGE is true.

The purpose of LLVM_USE_SANITIZE_COVERAGE is to build the rest of llvm with sanitizer coverage so that we can build things like tools/clang/tools/clang-fuzzer

All this means that we can't bootstrap llvm with asan on windows, right?
I wonder if someone wants to solve this problem too...

[mpividori]

In D27993#631931, @kcc wrote:

In D27993#631795, @mpividori wrote:

@kcc Ok. So, I see two options to achieve both goals:
+ Force the user to read the docs.

Never works.

+ Make it work on Windows (don't use instrumentation for FileCheck target).

One option that you proposed off-line is to remove dependency on FileCheck (win-only) and rely on having it in PATH.
Hacky, but simple.

Or remove these flags, (as this diff does), and add a new cmake flag: ENABLE_LIBFUZZER , with default value false.

Mmmm. What will it change?

By default cmake won't build libFuzzer. So, this will achieve your original intention, users need to read the documentation to build libFuzzer.
Also, with the advantage that we don't need LLVM_USE_SANITIZE_COVERAGE, so we avoid including instrumentation in all the repository, which is not required for libFuzzer.
So, using ENABLE_LIBFUZZER, it will work for both, Linux and Windows.
I think this is a good solution, since we need a specific flag to enable / disable libFuzzer, independent of LLVM_USE_SANITIZE_COVERAGE.

[kcc]

In D27993#631945, @mpividori wrote:

In D27993#631931, @kcc wrote:

In D27993#631795, @mpividori wrote:

@kcc Ok. So, I see two options to achieve both goals:
+ Force the user to read the docs.

Never works.

+ Make it work on Windows (don't use instrumentation for FileCheck target).

One option that you proposed off-line is to remove dependency on FileCheck (win-only) and rely on having it in PATH.
Hacky, but simple.

Or remove these flags, (as this diff does), and add a new cmake flag: ENABLE_LIBFUZZER , with default value false.

Mmmm. What will it change?

By default cmake won't build libFuzzer. So, this will achieve your original intention, users need to read the documentation to build libFuzzer.
Also, with the advantage that we don't need LLVM_USE_SANITIZE_COVERAGE, so we avoid including instrumentation in all the repository, which is not required for libFuzzer.
So, using ENABLE_LIBFUZZER, it will work for both, Linux and Windows.
I think this is a good solution, since we need a specific flag to enable / disable libFuzzer, independent of LLVM_USE_SANITIZE_COVERAGE.

But this will not solve the problem of building the fuzzers in the llvm tree (like clang-fuzzer)

[mpividori]

@kcc We can continue using LLVM_USE_SANITIZE_COVERAGE for the rest of the repository, when we need instrumentation in all the code.
But for building libFuzzer, we don't need that, so I think it makes sense to use a different flag to enable/disable libFuzzer.
So, I propose to use ENABLE_LIBFUZZER in this Cmake file, instead of LLVM_USE_SANITIZER.
Would you agree?
Thanks,

[kcc]

In D27993#636374, @mpividori wrote:

@kcc We can continue using LLVM_USE_SANITIZE_COVERAGE for the rest of the repository, when we need instrumentation in all the code.
But for building libFuzzer, we don't need that, so I think it makes sense to use a different flag to enable/disable libFuzzer.
So, I propose to use ENABLE_LIBFUZZER in this Cmake file, instead of LLVM_USE_SANITIZER.
Would you agree?
Thanks,

It means one more non-default build config... No, I'd prefer to avoid it.

[mpividori]

@kcc What do you mean by "non-default build config"? In a previous comment you explained that you use this flag to protect from accidentally using a non freash clang host compiler, so this would be the purpose of ENABLE_LIBFUZZER
It could be removed when starting using monorepo.

[kcc]

In D27993#636392, @mpividori wrote:

@kcc What do you mean by "non-default build config"? In a previous comment you explained that you use this flag to protect from accidentally using a non freash clang host compiler, so this would be the purpose of ENABLE_LIBFUZZER
It could be removed when starting using monorepo.

Right now if you want to build clang-fuzzer you need to use a non-standard build config.
Same for libFuzzer tests, but at least it's the same build config.
You propose to have two different non-standard build configs.

[mpividori]

@kcc exactly, because these are different build config:
+ The purpose of LLVM_USE_SANITIZE_COVERAGE is to active the coverage flags for all the repository.
+ The purpose of ENABLE_LIBFUZZER is to avoid automatically building libFuzzer with a non fresh clang compiler, which would fail.
Also, I could automatical set ENABLE_LIBFUZZER=true when LLVM_USE_SANITIZE_COVERAGE=true.

Anyway, the main intention of these changes is to make it work on Windows. If you prefer, I can continue using only LLVM_USE_SANITIZE_COVERAGE and remove dependency on FileCheck (win-only) and rely on having it in PATH.

[kcc]

In D27993#636403, @mpividori wrote:

@kcc exactly, because these are different build config:
+ The purpose of LLVM_USE_SANITIZE_COVERAGE is to active the coverage flags for all the repository.
+ The purpose of ENABLE_LIBFUZZER is to avoid automatically building libFuzzer with a non fresh clang compiler, which would fail.
Also, I could automatical set ENABLE_LIBFUZZER=true when LLVM_USE_SANITIZE_COVERAGE=true.

Anyway, the main intention of these changes is to make it work on Windows. If you prefer, I can continue using only LLVM_USE_SANITIZE_COVERAGE and remove dependency on FileCheck (win-only) and rely on having it in PATH.

Yes, that would be a simpler med-term solution.

In D27993#636403, @mpividori wrote:

@kcc exactly, because these are different build config:
+ The purpose of LLVM_USE_SANITIZE_COVERAGE is to active the coverage flags for all the repository.
+ The purpose of ENABLE_LIBFUZZER is to avoid automatically building libFuzzer with a non fresh clang compiler, which would fail.
Also, I could automatical set ENABLE_LIBFUZZER=true when LLVM_USE_SANITIZE_COVERAGE=true.

Anyway, the main intention of these changes is to make it work on Windows. If you prefer, I can continue using only LLVM_USE_SANITIZE_COVERAGE and remove dependency on FileCheck (win-only) and rely on having it in PATH.

[kcc]

LGTM

lib/Fuzzer/CMakeLists.txt

 set(LIBFUZZER_FLAGS_BASE "${CMAKE_CXX_FLAGS}")
 # Disable the coverage and sanitizer instrumentation for the fuzzer itself.
 set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fno-sanitize-coverage=trace-pc-guard,edge,trace-cmp,indirect-calls,8bit-counters -Werror")
-if( LLVM_USE_SANITIZE_COVERAGE )
-  if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address")
-    message(FATAL_ERROR
-      "LibFuzzer and its tests require LLVM_USE_SANITIZER=Address and "
-      "LLVM_USE_SANITIZE_COVERAGE=YES to be set."
-      )
-  endif()
 
-  add_subdirectory(Support)
 
-  if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    set(FUZZER_EXT_FUNCTIONS FuzzerExtFunctionsWeakAlias.cpp)
-  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(FUZZER_EXT_FUNCTIONS FuzzerExtFunctionsWeak.cpp)
-  elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(FUZZER_EXT_FUNCTIONS FuzzerExtFunctionsDlsym.cpp)
-  endif()
 
-  add_library(LLVMFuzzerNoMainObjects OBJECT
-    FuzzerCrossOver.cpp
-    FuzzerDriver.cpp
-    FuzzerLoop.cpp
-    FuzzerMerge.cpp
-    FuzzerMutate.cpp
-    FuzzerSHA1.cpp
-    FuzzerTracePC.cpp
-    FuzzerTraceState.cpp
-    FuzzerUtil.cpp
-    ${FUZZER_EXT_FUNCTIONS}
-    )
-  add_library(LLVMFuzzerNoMain STATIC
-    $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects>
-    )
-  target_link_libraries(LLVMFuzzerNoMain ${PTHREAD_LIB})
-  target_link_libraries(LLVMFuzzerNoMain LLVMFuzzerSupport)
-  add_library(LLVMFuzzer STATIC
-    FuzzerMain.cpp
-    $<TARGET_OBJECTS:LLVMFuzzerNoMainObjects>
-    )
-  target_link_libraries(LLVMFuzzer ${PTHREAD_LIB})
-  target_link_libraries(LLVMFuzzer LLVMFuzzerSupport)
+
+
 
-  add_subdirectory(afl)
-  if( LLVM_INCLUDE_TESTS )
-    add_subdirectory(test)
-  endif()
-endif()
+

lib/Fuzzer/test/CMakeLists.txt

 # Enable the coverage instrumentation (it is disabled for the Fuzzer lib).
 if(MSVC)
   # Only include coverage options supported for Windows.
   set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fsanitize-coverage=edge")
 else()
   set(CMAKE_CXX_FLAGS "${LIBFUZZER_FLAGS_BASE} -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp,trace-div,trace-gep")
 endif()
 
+if(NOT "${LLVM_USE_SANITIZER}" STREQUAL "Address")
+  # Enable Address sanitizer.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+endif()
+
 if(LLVM_COMPILER_IS_GCC_COMPATIBLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi")
 endif()
 
 if(MSVC)
   # In order to use the sanitizers in Windows, we need to link against many