Merge pull request #856 from LebedevRI/oss-fuzz

oss-fuzz: more LTO?

Author: LebedevRI

.ci/oss-fuzz.sh

@@ -25,6 +25,13 @@ 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\""
 
@@ -38,6 +45,10 @@ 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 \
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=OFF \
       -DLLVM_INCLUDE_TESTS=OFF \
@@ -62,6 +73,10 @@ patch $OPENMP_LLVM_SOURCE/openmp/runtime/src/kmp.h $RAWSPEED_SOURCE/.ci/openmp.p
 
 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 \

.github/workflows/CI-ossfuzz.yml

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

cmake/compiler-flags.cmake

@@ -54,8 +54,8 @@ if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(LIST )
     list(APPEND LIST -fforce-emit-vtables)
-    list(APPEND LIST -fno-whole-program-vtables)
-    list(APPEND LIST -fno-strict-vtable-pointers)
+    # 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()