Commit 226866e1 authored by Dokyung Song's avatar Dokyung Song Committed by Matt Morehouse
Browse files

[libFuzzer] Separate platform related macros out from FuzzerDefs.h into... 

[libFuzzer] Separate platform related macros out from FuzzerDefs.h into FuzzerPlatform.h, and adjust includes in other files.

Summary: This patch separates platform related macros in lib/fuzzer/FuzzerDefs.h into lib/fuzzer/FuzzerPlatform.h, and use FuzzerPlatform.h where necessary. This separation helps when compiling libFuzzer's interceptor module (under review); an unnecessary include of standard headers (such as string.h) may produce conflicts/ambiguation with the interceptor's declarations/definitions of library functions, which complicates interceptor implementation.

Reviewers: morehouse, hctim

Reviewed By: morehouse

Subscribers: krytarowski, #sanitizers

Tags: #sanitizers

Differential Revision: https://reviews.llvm.org/D83805
parent 9c87c558

compiler-rt/lib/fuzzer/FuzzerBuiltins.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef LLVM_FUZZER_BUILTINS_H

#define LLVM_FUZZER_BUILTINS_H



#include "FuzzerDefs.h"

#include "FuzzerPlatform.h"



#if !LIBFUZZER_MSVC

#include <cstdint>

compiler-rt/lib/fuzzer/FuzzerBuiltinsMsvc.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef LLVM_FUZZER_BUILTINS_MSVC_H

#define LLVM_FUZZER_BUILTINS_MSVC_H



#include "FuzzerDefs.h"

#include "FuzzerPlatform.h"



#if LIBFUZZER_MSVC

#include <intrin.h>

compiler-rt/lib/fuzzer/FuzzerDefs.h

+0 −150
Original line number Diff line number Diff line
@@ -21,156 +21,6 @@ 
#include <vector>





// Platform detection.

#ifdef __linux__

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 1

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 0

#elif __APPLE__

#define LIBFUZZER_APPLE 1

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 0

#elif __NetBSD__

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 1

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 0

#elif __FreeBSD__

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 1

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 0

#elif __OpenBSD__

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 1

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 0

#elif _WIN32

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 1

#define LIBFUZZER_EMSCRIPTEN 0

#elif __Fuchsia__

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 1

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 0

#elif __EMSCRIPTEN__

#define LIBFUZZER_APPLE 0

#define LIBFUZZER_FUCHSIA 0

#define LIBFUZZER_LINUX 0

#define LIBFUZZER_NETBSD 0

#define LIBFUZZER_FREEBSD 0

#define LIBFUZZER_OPENBSD 0

#define LIBFUZZER_WINDOWS 0

#define LIBFUZZER_EMSCRIPTEN 1

#else

#error "Support for your platform has not been implemented"

#endif



#if defined(_MSC_VER) && !defined(__clang__)

// MSVC compiler is being used.

#define LIBFUZZER_MSVC 1

#else

#define LIBFUZZER_MSVC 0

#endif



#ifndef __has_attribute

#  define __has_attribute(x) 0

#endif



#define LIBFUZZER_POSIX                                                        \

  (LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD ||                   \

   LIBFUZZER_FREEBSD || LIBFUZZER_OPENBSD || LIBFUZZER_EMSCRIPTEN)



#ifdef __x86_64

#  if __has_attribute(target)

#    define ATTRIBUTE_TARGET_POPCNT __attribute__((target("popcnt")))

#  else

#    define ATTRIBUTE_TARGET_POPCNT

#  endif

#else

#  define ATTRIBUTE_TARGET_POPCNT

#endif





#ifdef __clang__  // avoid gcc warning.

#  if __has_attribute(no_sanitize)

#    define ATTRIBUTE_NO_SANITIZE_MEMORY __attribute__((no_sanitize("memory")))

#  else

#    define ATTRIBUTE_NO_SANITIZE_MEMORY

#  endif

#  define ALWAYS_INLINE __attribute__((always_inline))

#else

#  define ATTRIBUTE_NO_SANITIZE_MEMORY

#  define ALWAYS_INLINE

#endif // __clang__



#if LIBFUZZER_WINDOWS

#define ATTRIBUTE_NO_SANITIZE_ADDRESS

#else

#define ATTRIBUTE_NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))

#endif



#if LIBFUZZER_WINDOWS

#define ATTRIBUTE_ALIGNED(X) __declspec(align(X))

#define ATTRIBUTE_INTERFACE __declspec(dllexport)

// This is used for __sancov_lowest_stack which is needed for

// -fsanitize-coverage=stack-depth. That feature is not yet available on

// Windows, so make the symbol static to avoid linking errors.

#define ATTRIBUTES_INTERFACE_TLS_INITIAL_EXEC static

#define ATTRIBUTE_NOINLINE __declspec(noinline)

#else

#define ATTRIBUTE_ALIGNED(X) __attribute__((aligned(X)))

#define ATTRIBUTE_INTERFACE __attribute__((visibility("default")))

#define ATTRIBUTES_INTERFACE_TLS_INITIAL_EXEC \

  ATTRIBUTE_INTERFACE __attribute__((tls_model("initial-exec"))) thread_local



#define ATTRIBUTE_NOINLINE __attribute__((noinline))

#endif



#if defined(__has_feature)

#  if __has_feature(address_sanitizer)

#    define ATTRIBUTE_NO_SANITIZE_ALL ATTRIBUTE_NO_SANITIZE_ADDRESS

#  elif __has_feature(memory_sanitizer)

#    define ATTRIBUTE_NO_SANITIZE_ALL ATTRIBUTE_NO_SANITIZE_MEMORY

#  else

#    define ATTRIBUTE_NO_SANITIZE_ALL

#  endif

#else

#  define ATTRIBUTE_NO_SANITIZE_ALL

#endif



namespace fuzzer {



template <class T> T Min(T a, T b) { return a < b ? a : b; }

compiler-rt/lib/fuzzer/FuzzerDriver.cpp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "FuzzerInternal.h"

#include "FuzzerMerge.h"

#include "FuzzerMutate.h"

#include "FuzzerPlatform.h"

#include "FuzzerRandom.h"

#include "FuzzerTracePC.h"

#include <algorithm>

compiler-rt/lib/fuzzer/FuzzerExtFunctionsDlsym.cpp

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
// requires that clients of LibFuzzer pass ``--export-dynamic`` to the linker.

// That is a complication we don't wish to expose to clients right now.

//===----------------------------------------------------------------------===//

#include "FuzzerDefs.h"

#include "FuzzerPlatform.h"

#if LIBFUZZER_APPLE



#include "FuzzerExtFunctions.h"