Merge branch 'master' into AA/anotherPythonFix

Author: Alami-Amine

infra/base-images/base-builder/compile

@@ -25,10 +25,6 @@ OSS_FUZZ_ON_DEMAND="${OSS_FUZZ_ON_DEMAND:-0}"
 RUST_SANITIZER=$SANITIZER
 
 if [ "$FUZZING_LANGUAGE" = "jvm" ]; then
-  if [ "$FUZZING_ENGINE" != "libfuzzer" ] && [ "$FUZZING_ENGINE" != "wycheproof" ]; then
-    echo "ERROR: JVM projects can be fuzzed with libFuzzer or tested with wycheproof engines only."
-    exit 1
-  fi
   if [ "$SANITIZER" != "address" ] && [ "$SANITIZER" != "coverage" ] && [ "$SANITIZER" != "undefined" ] && [ "$SANITIZER" != "none" ] && [ "$SANITIZER" != "introspector" ]; then
     echo "ERROR: JVM projects can be fuzzed with AddressSanitizer or UndefinedBehaviorSanitizer or Introspector only."
     exit 1

infra/build/functions/build_lib.py

@@ -95,10 +95,6 @@ class SignedPolicyDocument:
         EngineInfo(upload_bucket='clusterfuzz-builds-no-engine',
                    supported_sanitizers=['address'],
                    supported_architectures=['x86_64']),
-    'wycheproof':
-        EngineInfo(upload_bucket='clusterfuzz-builds-wycheproof',
-                   supported_sanitizers=['none'],
-                   supported_architectures=['x86_64']),
     'centipede':
         EngineInfo(upload_bucket='clusterfuzz-builds-centipede',
                    supported_sanitizers=['address', 'none'],

infra/indexer/frontend/ast_visitor.cc

@@ -51,6 +51,7 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Config/llvm-config.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -864,7 +865,11 @@ const clang::CXXRecordDecl* GetCXXRecordForType(const clang::QualType& type) {
   }
   const auto* record_type = derived_type->castAs<clang::RecordType>();
   CHECK(record_type);
+#if LLVM_VERSION_MAJOR > 22
+  const clang::RecordDecl* decl = record_type->getDecl();
+#else
   const clang::RecordDecl* decl = record_type->getOriginalDecl();
+#endif
   CHECK(decl);
   return llvm::dyn_cast<clang::CXXRecordDecl>(decl);
 }

infra/indexer/ubuntu-20-04.Dockerfile

@@ -0,0 +1,8 @@
+FROM gcr.io/oss-fuzz-base/base-clang-full:ubuntu-20-04
+
+RUN mkdir /indexer
+WORKDIR /indexer
+COPY . /indexer
+
+RUN apt-get update && apt-get install -y libsqlite3-dev make zlib1g-dev
+RUN mkdir build && cd build && cmake .. && cmake --build . -j -v

infra/indexer/ubuntu-24-04.Dockerfile

@@ -0,0 +1,8 @@
+FROM gcr.io/oss-fuzz-base/base-clang-full:ubuntu-24-04
+
+RUN mkdir /indexer
+WORKDIR /indexer
+COPY . /indexer
+
+RUN apt-get update && apt-get install -y libsqlite3-dev make zlib1g-dev
+RUN mkdir build && cd build && cmake .. && cmake --build . -j -v

projects/ada-url/Dockerfile

@@ -19,3 +19,4 @@ RUN apt-get update && apt-get install -y make cmake
 RUN git clone --depth 1 https://github.com/ada-url/ada ada-url
 RUN cp ada-url/fuzz/build.sh $SRC/
 WORKDIR ada-url
+COPY run_tests.sh $SRC/

projects/ada-url/run_tests.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -eu
+#
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+ctest --test-dir build-tests

projects/anise/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

projects/anise/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -eu
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

projects/brpc/Dockerfile

@@ -18,3 +18,4 @@ RUN apt-get update && apt-get install -y cmake libgflags-dev libprotobuf-dev lib
 RUN git clone --depth 1 https://github.com/apache/brpc.git
 RUN cp $SRC/brpc/test/fuzzing/oss-fuzz.sh $SRC/build.sh
 WORKDIR $SRC/brpc/
+COPY run_tests.sh $SRC/