From 5d4c474c47223ffc59a7483bc9c663ef4ad47318 Mon Sep 17 00:00:00 2001 From: Navidem Date: Mon, 1 Aug 2022 09:59:21 -0700 Subject: [PATCH] Bump FI and adjust the path to main.py in compile (#8078) * Bump FI and adjust the path to main.py in compile * Fix llvm build script * Update FI version * Update FI version --- infra/base-images/base-builder/compile | 4 ++-- infra/base-images/base-clang/Dockerfile | 2 +- infra/base-images/base-clang/checkout_build_install_llvm.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile index 5b276348ad58..402c07a8cd81 100755 --- a/infra/base-images/base-builder/compile +++ b/infra/base-images/base-builder/compile @@ -224,7 +224,7 @@ if [ "$SANITIZER" = "introspector" ]; then cd $SRC/inspector # Correlate fuzzer binaries to fuzz-introspector's raw data - python3 /fuzz-introspector/post-processing/main.py correlate --binaries_dir=$OUT/ + python3 /fuzz-introspector/src/main.py correlate --binaries_dir=$OUT/ # Generate fuzz-introspector HTML report, this generates # the file exe_to_fuzz_introspector_logs.yaml @@ -236,7 +236,7 @@ if [ "$SANITIZER" = "introspector" ]; then # Use the just-generated correlation file REPORT_ARGS="$REPORT_ARGS --correlation_file=exe_to_fuzz_introspector_logs.yaml" REPORT_ARGS="$REPORT_ARGS --name=$PROJECT_NAME" - python3 /fuzz-introspector/post-processing/main.py report $REPORT_ARGS + python3 /fuzz-introspector/src/main.py report $REPORT_ARGS cp -rf $SRC/inspector $OUT/inspector fi diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile index 82a21cdfaf5c..fcd4f9533703 100644 --- a/infra/base-images/base-clang/Dockerfile +++ b/infra/base-images/base-clang/Dockerfile @@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y wget sudo && \ RUN apt-get update && apt-get install -y git && \ git clone https://github.com/ossf/fuzz-introspector.git fuzz-introspector && \ cd fuzz-introspector && \ - git checkout 051932aa13b07f34e6c4844b084d3d928ae62138 && \ + git checkout 10cb2db2c307a211ee0f009bda9fa744880eddba && \ apt-get remove --purge -y git COPY checkout_build_install_llvm.sh /root/ diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh index f2147cfbb3e4..368eccfc7827 100755 --- a/infra/base-images/base-clang/checkout_build_install_llvm.sh +++ b/infra/base-images/base-clang/checkout_build_install_llvm.sh @@ -107,8 +107,8 @@ if [ -n "$INTROSPECTOR_PATCHES" ]; then echo "Applying introspector changes" OLD_WORKING_DIR=$PWD cd $LLVM_SRC - cp -rf /fuzz-introspector/llvm/include/llvm/Transforms/FuzzIntrospector/ ./llvm/include/llvm/Transforms/FuzzIntrospector - cp -rf /fuzz-introspector/llvm/lib/Transforms/FuzzIntrospector ./llvm/lib/Transforms/FuzzIntrospector + cp -rf /fuzz-introspector/frontends/llvm/include/llvm/Transforms/FuzzIntrospector/ ./llvm/include/llvm/Transforms/FuzzIntrospector + cp -rf /fuzz-introspector/frontends/llvm/lib/Transforms/FuzzIntrospector ./llvm/lib/Transforms/FuzzIntrospector # LLVM currently does not support dynamically loading LTO passes. Thus, # we hardcode it into Clang instead.