Revert all oss-fuzz LTO-related changes, do not work with oss-fuzz's AFL...

What the fuck, oss-fuzz?

Author: LebedevRI

.ci/openmp.patch

@@ -20,93 +20,17 @@ set -ex
 apt-get install -y ninja-build
 export CMAKE_GENERATOR=Ninja
 
-RAWSPEED_SOURCE="$SRC/librawspeed/"
-RAWSPEED_BUILD="$WORK/rawspeed"
-
 ln -f -s /usr/local/bin/lld /usr/bin/ld
 
-CFLAGS="$CFLAGS -flto=thin"
-CXXFLAGS="$CXXFLAGS -flto=thin"
-
-CXXFLAGS="$CXXFLAGS -fforce-emit-vtables"
-# CXXFLAGS="$CXXFLAGS -fwhole-program-vtables" # DOES NOT WORK WITH SANCOV!
-CXXFLAGS="$CXXFLAGS -fstrict-vtable-pointers"
-
-THINLTO_CACHE="$WORK/thinlto-cache"
-LDFLAGS="${LDFLAGS:-} -Wl,--thinlto-cache-dir=\"$THINLTO_CACHE\""
-
 cd "$SRC"
 
-OSSFUZZ_LLVM_VER=$(clang -dumpversion)
-OSSFUZZ_LLVM_VER_MAJOR=(${OSSFUZZ_LLVM_VER//./ })
-OSSFUZZ_LLVM_VER_MAJOR=${OSSFUZZ_LLVM_VER_MAJOR[0]}
-
-wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$OSSFUZZ_LLVM_VER/llvm-project-$OSSFUZZ_LLVM_VER.src.tar.xz
-tar -xf llvm-project-$OSSFUZZ_LLVM_VER.src.tar.xz llvm-project-$OSSFUZZ_LLVM_VER.src/{runtimes,cmake,llvm/cmake,libcxx,libcxxabi,compiler-rt}/
-COMPILERRT_LLVM_SOURCE="$SRC/llvm-project-$OSSFUZZ_LLVM_VER.src"
+LLVM_VER="18.1.8"
 
-COMPILERRT_BUILD="$WORK/llvm-project-$OSSFUZZ_LLVM_VER.compiler-rt.build"
-cmake -S "$COMPILERRT_LLVM_SOURCE/runtimes/" -B "$COMPILERRT_BUILD" \
-      -DCMAKE_C_FLAGS="$CFLAGS -fno-sanitize=all" \
-      -DCMAKE_CXX_FLAGS="$CXXFLAGS -fno-sanitize=all" \
-      -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-      -DCMAKE_C_VISIBILITY_PRESET=hidden \
-      -DCMAKE_CXX_VISIBILITY_PRESET=hidden \
-      -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DLLVM_INCLUDE_TESTS=OFF \
-      -DLIBCXX_INCLUDE_TESTS=OFF \
-      -DLIBCXXABI_INCLUDE_TESTS=OFF \
-      -DCOMPILER_RT_INCLUDE_TESTS=OFF \
-      -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;compiler-rt" \
-      -DLIBCXX_ENABLE_SHARED=OFF \
-      -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
-      -DLIBCXXABI_ENABLE_SHARED=OFF \
-      -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
-      -DLIBCXX_INCLUDE_BENCHMARKS=OFF \
-      -DCOMPILER_RT_USE_LLVM_UNWINDER=OFF \
-      -DCOMPILER_RT_CXX_LIBRARY=libcxx \
-      -DCOMPILER_RT_STATIC_CXX_LIBRARY=ON \
-      -DSANITIZER_USE_STATIC_CXX_ABI=ON \
-      -DSANITIZER_CXX_ABI_LIBNAME=libc++ \
-      -DSANITIZER_CXX_ABI_INTREE=ON \
-      -DCOMPILER_RT_SANITIZERS_TO_BUILD="asan;msan" \
-      -DCOMPILER_RT_BUILD_PROFILE=OFF \
-      -DCOMPILER_RT_BUILD_CTX_PROFILE=OFF \
-      -DCOMPILER_RT_BUILD_XRAY=OFF \
-      -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -DCOMPILER_RT_BUILD_MEMPROF=OFF \
-      -DCOMPILER_RT_BUILD_ORC=OFF
-cmake --build "$COMPILERRT_BUILD" -- -j$(nproc) compiler-rt
-
-TMPPDIR=$(mktemp -d)
-mv /usr/local/lib/clang/$OSSFUZZ_LLVM_VER_MAJOR/lib/x86_64-unknown-linux-gnu/libclang_rt.fuzzer* $TMPPDIR/
-
-rm -rf /usr/*/lib/clang/*/include/sanitizer
-rm -rf /usr/*/lib/clang/*/lib/*
-
-ln -s $COMPILERRT_BUILD/compiler-rt/lib/linux /usr/local/lib/clang/$OSSFUZZ_LLVM_VER_MAJOR/lib/linux
-ln -s $COMPILERRT_BUILD/compiler-rt/lib/linux /usr/local/lib/clang/$OSSFUZZ_LLVM_VER_MAJOR/lib/x86_64-unknown-linux-gnu
-
-mv $TMPPDIR/* $COMPILERRT_BUILD/compiler-rt/lib/linux
-
-rm -rf $COMPILERRT_BUILD/compiler-rt/lib/linux/*.so
-
-CXXFLAGS="$CXXFLAGS -isystem $COMPILERRT_BUILD/compiler-rt/include"
-
-LIBCXX_LLVM_VER="19.1.7"
-
-wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LIBCXX_LLVM_VER/llvm-project-$LIBCXX_LLVM_VER.src.tar.xz
-tar -xf llvm-project-$LIBCXX_LLVM_VER.src.tar.xz llvm-project-$LIBCXX_LLVM_VER.src/{runtimes,cmake,llvm/cmake,libcxx,libcxxabi}/
-LIBCXX_LLVM_SOURCE="$SRC/llvm-project-$LIBCXX_LLVM_VER.src"
-
-LIBCXX_BUILD="$WORK/llvm-project-$LIBCXX_LLVM_VER.libcxx.build"
-cmake -S "$LIBCXX_LLVM_SOURCE/runtimes/" -B "$LIBCXX_BUILD" \
-      -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-      -DCMAKE_C_VISIBILITY_PRESET=hidden \
-      -DCMAKE_CXX_VISIBILITY_PRESET=hidden \
-      -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON \
+wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VER/llvm-project-$LLVM_VER.src.tar.xz
+tar -xf llvm-project-$LLVM_VER.src.tar.xz llvm-project-$LLVM_VER.src/{runtimes,cmake,llvm/cmake,libcxx,libcxxabi}/
+LIBCXX_BUILD="$SRC/llvm-project-$LLVM_VER.build"
+mkdir "$LIBCXX_BUILD"
+cmake -S llvm-project-$LLVM_VER.src/runtimes/ -B "$LIBCXX_BUILD" \
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=OFF \
       -DLLVM_INCLUDE_TESTS=OFF \
@@ -119,51 +43,33 @@ cmake -S "$LIBCXX_LLVM_SOURCE/runtimes/" -B "$LIBCXX_BUILD" \
       -DLIBCXXABI_ADDITIONAL_COMPILE_FLAGS="-fno-sanitize=vptr"
 cmake --build "$LIBCXX_BUILD" -- -j$(nproc) cxx cxxabi
 
-rm -rf /usr/*/include/c++
-rm -rf /usr/*/lib/libc++*
-rm -rf /usr/*/lib/*/libc++*
-
 CXXFLAGS="$CXXFLAGS -nostdinc++ -nostdlib++ -isystem $LIBCXX_BUILD/include -isystem $LIBCXX_BUILD/include/c++/v1 -L$LIBCXX_BUILD/lib -lc++ -lc++abi"
 
-LIBOMP_LLVM_VER="20.1.5"
-
-wget -q https://github.com/llvm/llvm-project/releases/download/llvmorg-$LIBOMP_LLVM_VER/llvm-project-$LIBOMP_LLVM_VER.src.tar.xz
-tar -xf llvm-project-$LIBOMP_LLVM_VER.src.tar.xz llvm-project-$LIBOMP_LLVM_VER.src/{runtimes,cmake,llvm/cmake,openmp}/
-OPENMP_LLVM_SOURCE="$SRC/llvm-project-$LIBOMP_LLVM_VER.src"
-
-patch $OPENMP_LLVM_SOURCE/openmp/runtime/src/kmp.h $RAWSPEED_SOURCE/.ci/openmp.patch
-
-OPENMP_BUILD="$WORK/llvm-project-$LIBOMP_LLVM_VER.omp.build"
-cmake -S "$OPENMP_LLVM_SOURCE/openmp/" -B "$OPENMP_BUILD" \
-      -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-      -DCMAKE_C_VISIBILITY_PRESET=hidden \
-      -DCMAKE_CXX_VISIBILITY_PRESET=hidden \
-      -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DLIBOMP_ENABLE_SHARED=OFF \
-      -DOPENMP_ENABLE_LIBOMPTARGET=OFF \
-      -DLIBOMP_CXXFLAGS="-fno-sanitize=undefined,integer"
-cmake --build "$OPENMP_BUILD" -- -j$(nproc) omp
-
-CXXFLAGS="$CXXFLAGS -isystem $OPENMP_BUILD/runtime/src -L$OPENMP_BUILD/runtime/src"
-
 if [[ $SANITIZER = *undefined* ]]; then
   CFLAGS="$CFLAGS -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
   CXXFLAGS="$CXXFLAGS -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow"
 fi
 
-cmake -S "$RAWSPEED_SOURCE" -B "$RAWSPEED_BUILD" \
-  -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-  -DBINARY_PACKAGE_BUILD=ON -DWITH_OPENMP=ON \
+WITH_OPENMP=ON
+if [[ $SANITIZER = *memory* ]]; then
+  WITH_OPENMP=OFF
+fi
+
+cd "$WORK"
+mkdir build
+cd build
+
+cmake \
+  -DBINARY_PACKAGE_BUILD=ON -DWITH_OPENMP=$WITH_OPENMP \
+  -DUSE_BUNDLED_LLVMOPENMP=ON -DALLOW_DOWNLOADING_LLVMOPENMP=ON \
   -DWITH_PUGIXML=OFF -DUSE_XMLLINT=OFF -DWITH_JPEG=OFF -DWITH_ZLIB=OFF \
   -DBUILD_TESTING=OFF -DBUILD_TOOLS=OFF -DBUILD_BENCHMARKING=OFF \
   -DCMAKE_BUILD_TYPE=FUZZ -DBUILD_FUZZERS=ON \
   -DLIB_FUZZING_ENGINE:STRING="$LIB_FUZZING_ENGINE" \
-  -DCMAKE_INSTALL_PREFIX:PATH="$OUT" -DCMAKE_INSTALL_BINDIR:PATH="$OUT"
+  -DCMAKE_INSTALL_PREFIX:PATH="$OUT" -DCMAKE_INSTALL_BINDIR:PATH="$OUT" \
+  "$SRC/librawspeed/"
 
-cmake --build "$RAWSPEED_BUILD" -- -j$(nproc) all && cmake --build "$RAWSPEED_BUILD" -- -j$(nproc) install
+cmake --build . -- -j$(nproc) all && cmake --build . -- -j$(nproc) install
 
-du -hcs "$SRC"/* \
-        "$WORK"/* \
-        "$OUT"
+du -hcs .
+du -hcs "$OUT"

.ci/oss-fuzz.sh

@@ -8,10 +8,10 @@ on:
 jobs:
   linux:
     runs-on: ubuntu-latest
-    timeout-minutes: 120
+    timeout-minutes: 60
     steps:
       - name: (OSS-FUZZ) Building with ${{ inputs.sanitizer }} sanitizer
-        timeout-minutes: 60
+        timeout-minutes: 15
         id: build
         uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
         with:

.github/workflows/CI-ossfuzz.yml

@@ -50,20 +50,10 @@ SET(CMAKE_MODULE_LINKER_FLAGS
     "${CMAKE_MODULE_LINKER_FLAGS} ${linkerflags}"
     )
 
-if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(LIST )
-    list(APPEND LIST -fforce-emit-vtables)
-    # list(APPEND LIST -fwhole-program-vtables) # DOES NOT WORK WITH SANCOV!
-    list(APPEND LIST -fstrict-vtable-pointers)
-    add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:${LIST}>")
-  endif()
-endif()
-
 if(RAWSPEED_ENABLE_LTO)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     include(llvm-toolchain)
-    set(lto_compile "-flto=thin")
+    set(lto_compile "-flto=thin -fforce-emit-vtables -fwhole-program-vtables -fstrict-vtable-pointers")
     set(lto_link "-flto=thin -fuse-ld=\"${LLVMLLD_EXECUTABLE}\" ${LLVMLLD_INCREMENTAL_LDFLAGS}")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     include(gcc-toolchain)