Squashed 'third_party/utf8_range/' changes from d863bc33e..0e378bdb2 (#14679)

0e378bdb2 Add missing `<cstdint>` include to utf8_validity_fuzzer.cc

git-subtree-dir: third_party/utf8_range
git-subtree-split: 0e378bdb224cc8d4653b0db963b474839c2bb43c

third_party/utf8_range/.github/workflows/bazel_tests.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Setup Bazel
         run: |
           echo "BAZEL=bazel" >> $GITHUB_ENV
-          echo "USE_BAZEL_VERSION=5.1.1" >> $GITHUB_ENV
+          echo "USE_BAZEL_VERSION=6.4.0" >> $GITHUB_ENV
       - name: Setup Bazel (macOS)
         if: runner.os == 'macOS'
         run: echo "BAZEL=bazelisk" >> $GITHUB_ENV

third_party/utf8_range/BUILD.bazel

@@ -14,7 +14,10 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-exports_files(["LICENSE"])
+exports_files([
+    "LICENSE",
+    "rules_fuzzing.patch",
+])
 
 # TODO(b/252876197) Remove this once callers have been Bazelified.
 filegroup(

third_party/utf8_range/WORKSPACE

@@ -5,6 +5,17 @@ load("//:workspace_deps.bzl", "utf8_range_deps")
 
 utf8_range_deps()
 
+http_archive(
+    name = "rules_python",
+    sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b",
+    strip_prefix = "rules_python-0.26.0",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz",
+)
+
+load("@rules_python//python:repositories.bzl", "py_repositories")
+
+py_repositories()
+
 http_archive(
     name = "com_google_googletest",
     sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
@@ -17,9 +28,11 @@ http_archive(
 
 http_archive(
     name = "rules_fuzzing",
-    sha256 = "d9002dd3cd6437017f08593124fdd1b13b3473c7b929ceb0e60d317cb9346118",
-    strip_prefix = "rules_fuzzing-0.3.2",
-    urls = ["https://github.com/bazelbuild/rules_fuzzing/archive/v0.3.2.zip"],
+    sha256 = "ff52ef4845ab00e95d29c02a9e32e9eff4e0a4c9c8a6bcf8407a2f19eb3f9190",
+    strip_prefix = "rules_fuzzing-0.4.1",
+    urls = ["https://github.com/bazelbuild/rules_fuzzing/releases/download/v0.4.1/rules_fuzzing-0.4.1.zip"],
+    patches = ["//:rules_fuzzing.patch"],
+    patch_args = ["-p1"],
 )
 
 load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
@@ -29,3 +42,7 @@ rules_fuzzing_dependencies()
 load("@rules_fuzzing//fuzzing:init.bzl", "rules_fuzzing_init")
 
 rules_fuzzing_init()
+
+load("@fuzzing_py_deps//:requirements.bzl", "install_deps")
+
+install_deps()

third_party/utf8_range/fuzz/utf8_validity_fuzzer.cc

@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
+#include <cstdint>
+
 #include "utf8_validity.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {

third_party/utf8_range/rules_fuzzing.patch

@@ -0,0 +1,25 @@
+diff --git a/fuzzing/tools/validate_dict.py b/fuzzing/tools/validate_dict.py
+index d561e68..52cbcb8 100644
+--- a/fuzzing/tools/validate_dict.py
++++ b/fuzzing/tools/validate_dict.py
+@@ -19,7 +19,7 @@ Validates and merges a set of fuzzing dictionary files into a single output.
+ 
+ from absl import app
+ from absl import flags
+-from dict_validation import validate_line
++from fuzzing.tools.dict_validation import validate_line
+ from sys import stderr
+ 
+ FLAGS = flags.FLAGS
+diff --git a/fuzzing/requirements.txt b/fuzzing/requirements.txt
+index 01482d4..4b36f4f 100644
+--- a/fuzzing/requirements.txt
++++ b/fuzzing/requirements.txt
+@@ -1,5 +1,5 @@
+ # Python requirements for the tools supporting the fuzzing rules. These are
+ # installed automatically through the WORKSPACE configuration.
+ 
+-absl-py==0.11.0 --hash=sha256:b3d9eb5119ff6e0a0125f6dabf2f9fae02f8acae7be70576002fac27235611c5
+-six==1.15.0 --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced
++absl-py==2.0.0 --hash=sha256:9a28abb62774ae4e8edbe2dd4c49ffcd45a6a848952a5eccc6a49f3f0fc1e2f3
++six==1.15.0