infra: bump llvm21

Signed-off-by: David Korczynski <[email protected]>

Author: DavidKorczynski

infra/base-images/base-builder/indexer/clang_wrapper.py

@@ -132,12 +132,13 @@ def _get_build_id_from_elf_notes(contents: bytes) -> str | None:
   assert elf_data
 
   for file_info in elf_data:
-    for note_entry in file_info["Notes"]:
+    for note_entry in file_info["NoteSections"]:
       note_section = note_entry["NoteSection"]
       if note_section["Name"] == ".note.gnu.build-id":
-        note_details = note_section["Note"]
-        if "Build ID" in note_details:
-          return note_details["Build ID"]
+        note_details = note_section["Notes"]
+        for note_detail in note_details:
+          if "Build ID" in note_detail:
+            return note_detail["Build ID"]
   return None
 
 

infra/base-images/base-builder/indexer/index_build.py

@@ -48,7 +48,7 @@
 DEFAULT_COVERAGE_FLAGS = '-fsanitize-coverage=bb,no-prune,trace-pc-guard'
 DEFAULT_FUZZING_ENGINE = 'fuzzing_engine.cc'
 
-_CLANG_VERSION = os.getenv('CLANG_VERSION', '18')
+_CLANG_VERSION = os.getenv('CLANG_VERSION', '21')
 _CLANG_TOOLCHAIN = Path(os.getenv('CLANG_TOOLCHAIN', '/usr/local'))
 _TOOLCHAIN_WITH_WRAPPER = Path('/opt/toolchain')
 
@@ -160,24 +160,23 @@ def _get_build_id_from_elf_notes(elf_file: str, contents: bytes) -> str | None:
     The build id, or None if it could not be found.
   """
 
-  try:
-    elf_data = json.loads(contents)
-  except json.JSONDecodeError:
-    logging.error('failed to decode ELF notes for %s', elf_file)
-    return None
-
+  elf_data = json.loads(contents)
   assert elf_data
 
   for file_info in elf_data:
-    for note_entry in file_info['Notes']:
-      note_section = note_entry['NoteSection']
-      if note_section['Name'] == '.note.gnu.build-id':
-        note_details = note_section['Note']
-        if 'Build ID' in note_details:
-          return note_details['Build ID']
+    for note_entry in file_info["NoteSections"]:
+      note_section = note_entry["NoteSection"]
+      if note_section["Name"] == ".note.gnu.build-id":
+        note_details = note_section["Notes"]
+        for note_detail in note_details:
+          if "Build ID" in note_detail:
+            return note_detail["Build ID"]
   return None
 
 
+
+
+
 def get_build_id(elf_file: str) -> str | None:
   """This invokes llvm-readelf to get the build ID of the given ELF file."""
 

infra/base-images/base-builder/precompile_honggfuzz

@@ -33,7 +33,8 @@ make clean
 # These CFLAGs match honggfuzz's default, with the exception of -mtune to
 # improve portability and `-D_HF_LINUX_NO_BFD` to remove assembly instructions
 # from the filenames.
-CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD" make
+sed -i 's/-Werror//g' Makefile
+CC=clang CFLAGS="-O3 -funroll-loops -D_HF_LINUX_NO_BFD -Wno-unterminated-string-initialization -Wno-error" make
 
 # libhfuzz.a will be added by CC/CXX linker directly during linking,
 # but it's defined here to satisfy the build infrastructure

infra/base-images/base-clang/Dockerfile

@@ -33,16 +33,17 @@ RUN apt-get update && apt-get install -y wget sudo && \
     SUDO_FORCE_REMOVE=yes apt-get autoremove --purge -y wget sudo && \
     rm -rf /usr/local/doc/cmake /usr/local/bin/cmake-gui
 
-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 332d674f00b8abc4c9ebf10e9c42e5b72b331c63 && \
-    git submodule init && \
-    git submodule update && \
-    apt-get autoremove --purge -y git && \
-    rm -rf .git
+#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 332d674f00b8abc4c9ebf10e9c42e5b72b331c63 && \
+#    git submodule init && \
+#    git submodule update && \
+#    apt-get autoremove --purge -y git && \
+#    rm -rf .git
 
 COPY checkout_build_install_llvm.sh /root/
+#COPY llvm-project $SRC/llvm-project
 # Keep all steps in the same script to decrease the number of intermediate
 # layes in docker file.
 ARG FULL_LLVM_BUILD
@@ -73,6 +74,7 @@ ENV CFLAGS -O1 \
   -Wno-error=deprecated-declarations \
   -Wno-error=implicit-function-declaration \
   -Wno-error=implicit-int \
+  -Wno-error=unknown-warning-option \
   -Wno-error=vla-cxx-extension \
   -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 ENV CXXFLAGS_EXTRA "-stdlib=libc++"

infra/base-images/base-clang/checkout_build_install_llvm.sh

@@ -60,14 +60,15 @@ apt-get update && apt-get install -y $LLVM_DEP_PACKAGES --no-install-recommends
 # languages, projects, ...) is needed.
 # Check CMAKE_VERSION infra/base-images/base-clang/Dockerfile was released
 # recently enough to fully support this clang version.
-OUR_LLVM_REVISION=llvmorg-18.1.8
+OUR_LLVM_REVISION=llvmorg-21.1.0-rc3
 
 mkdir $SRC/chromium_tools
 cd $SRC/chromium_tools
 git clone https://chromium.googlesource.com/chromium/src/tools/clang
 cd clang
 # Pin clang script due to https://github.com/google/oss-fuzz/issues/7617
-git checkout 9eb79319239629c1b23cf7a59e5ebb2bab319a34
+OUR_CLANG_REVISION=329189001bce28e8f90dfa1c96075731a7a8f7de
+git checkout $OUR_CLANG_REVISION
 
 LLVM_SRC=$SRC/llvm-project
 # Checkout
@@ -97,7 +98,21 @@ clone_with_retries https://github.com/llvm/llvm-project.git $LLVM_SRC
 git -C $LLVM_SRC checkout $OUR_LLVM_REVISION
 echo "Using LLVM revision: $OUR_LLVM_REVISION"
 
-# For fuzz introspector.
+# Prepare fuzz introspector.
+echo "Installing fuzz introspector"
+#if [[ -n "$FULL_LLVM_BUILD" ]]; then
+#      FUZZ_INTROSPECTOR_CHECKOUT=341ebbd72bc9116733bcfcfab5adfd7f9b633e07
+#  else
+#        FUZZ_INTROSPECTOR_CHECKOUT=332d674f00b8abc4c9ebf10e9c42e5b72b331c63
+#fi
+FUZZ_INTROSPECTOR_CHECKOUT=341ebbd72bc9116733bcfcfab5adfd7f9b633e07
+
+git clone https://github.com/ossf/fuzz-introspector.git /fuzz-introspector
+cd /fuzz-introspector
+git checkout $FUZZ_INTROSPECTOR_CHECKOUT
+git submodule init
+git submodule update
+
 echo "Applying introspector changes"
 OLD_WORKING_DIR=$PWD
 cd $LLVM_SRC
@@ -107,6 +122,7 @@ cp -rf /fuzz-introspector/frontends/llvm/lib/Transforms/FuzzIntrospector ./llvm/
 # LLVM currently does not support dynamically loading LTO passes. Thus, we
 # hardcode it into Clang instead. Ref: https://reviews.llvm.org/D77704
 /fuzz-introspector/frontends/llvm/patch-llvm.sh
+
 cd $OLD_WORKING_DIR
 
 mkdir -p $WORK/llvm-stage2 $WORK/llvm-stage1