fix: update LLVM branch and refine sanitizer flags in CMake configurations

Author: lum1n0us

build-scripts/build_llvm.py

@@ -304,7 +304,7 @@ def main():
         "default": {
             "repo": "https://github.com/llvm/llvm-project.git",
             "repo_ssh": "git@github.com:llvm/llvm-project.git",
-            "branch": "release/18.x",
+            "branch": "llvmorg-18.1.8",
         },
     }
 

tests/fuzz/wasm-mutator-fuzz/CMakeLists.txt

@@ -172,23 +172,19 @@ set(IWASM_DIR ${REPO_ROOT_DIR}/core/iwasm)
 # Global setting
 add_compile_options(-Wno-unused-command-line-argument)
 
-# # Enable fuzzer
-# add_definitions(-DWASM_ENABLE_FUZZ_TEST=1)
-# # '-fsanitize=vptr' not allowed with '-fno-rtti
-# # But, LLVM by default, disables the use of `rtti` in the compiler
-# add_compile_options(-fsanitize=fuzzer -fno-sanitize=vptr)
-# add_link_options(-fsanitize=fuzzer -fno-sanitize=vptr)
-
-# # Enable sanitizers if not in oss-fuzz environment
-# set(CFLAGS_ENV $ENV{CFLAGS})
-# string(FIND "${CFLAGS_ENV}" "-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" FUZZ_POS)
-# if (FUZZ_POS GREATER -1)
-#   set(IN_OSS_FUZZ 1)
-# else()
-#   set(IN_OSS_FUZZ 0)
-# endif()
-
-# include(${CMAKE_CURRENT_LIST_DIR}/../sanitizer_flags.cmake)
+# Enable sanitizers if not in oss-fuzz environment
+set(CFLAGS_ENV $ENV{CFLAGS})
+  string(FIND "${CFLAGS_ENV}" "-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" FUZZ_POS)
+if (FUZZ_POS GREATER -1)
+  set(IN_OSS_FUZZ 1)
+else()
+  set(IN_OSS_FUZZ 0)
+endif()
+
+# Enable fuzzer
+add_definitions(-DWASM_ENABLE_FUZZ_TEST=1)
+
+include(${CMAKE_CURRENT_LIST_DIR}/sanitizer_flags.cmake)
 
 add_subdirectory(aot-compiler)
 add_subdirectory(wasm-mutator)

tests/fuzz/wasm-mutator-fuzz/sanitizer_flags.cmake

@@ -23,3 +23,8 @@ endif()
 if(CMAKE_C_COMPILER_ID MATCHES ".*Clang")
   add_compile_options(-fno-sanitize=unsigned-integer-overflow)
 endif()
+
+# '-fsanitize=vptr' not allowed with '-fno-rtti
+# But, LLVM by default, disables the use of `rtti` in the compiler
+add_compile_options(-fsanitize=fuzzer -fno-sanitize=vptr)
+add_link_options(-fsanitize=fuzzer -fno-sanitize=vptr)