From 044214e05e0b1376658ce0a6b1caf3d7c8584ce5 Mon Sep 17 00:00:00 2001
From: Felix Hanau <felix@cloudflare.com>
Date: Thu, 12 Dec 2024 16:25:23 -0800
Subject: [PATCH] Merge #271.

PiperOrigin-RevId: 705666450
Change-Id: I8cb64dad9b084fc82445295749c484751fa48f4f
---
 MODULE.bazel            |  6 +++---
 WORKSPACE               |  7 ++++---
 WORKSPACE.bzlmod        | 16 +++++-----------
 tcmalloc/BUILD          |  1 -
 tcmalloc/internal/BUILD |  4 ++--
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 3ed1797a0..8dc11305b 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -21,10 +21,10 @@ module(
 
 bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "fuzztest", version = "20241028.0", repo_name = "com_google_fuzztest")
 bazel_dep(name = "google_benchmark", version = "1.8.3", repo_name = "com_github_google_benchmark")
 bazel_dep(name = "googletest", version = "1.13.0", repo_name = "com_google_googletest")
-bazel_dep(name = "protobuf", version = "26.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "27.5", repo_name = "com_google_protobuf")
 bazel_dep(name = "re2", version = "2024-02-01", repo_name = "com_googlesource_code_re2")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_fuzzing", version = "0.5.1")
-bazel_dep(name = "rules_proto", version = "4.0.0")
+bazel_dep(name = "rules_fuzzing", version = "0.5.2")
diff --git a/WORKSPACE b/WORKSPACE
index d4112bb12..7b13e41ff 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -80,15 +80,16 @@ http_archive(
 # Proto rules for Bazel and Protobuf
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "9ca59193fcfe52c54e4c2b4584770acd1a6528fc35efad363f8513c224490c50",
-    strip_prefix = "protobuf-13d559beb6967033a467a7517c35d8ad970f8afb",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/13d559beb6967033a467a7517c35d8ad970f8afb.zip"],
+    integrity = "sha256-ecxtCdAnBsWnPpAOqEK1s9rhYPNxtmVHdJR/54GFFCM=",
+    strip_prefix = "protobuf-27.5",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v27.5.tar.gz"],
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
 
+# rules_proto is deprecated, but still needed by fuzztest.
 http_archive(
     name = "rules_proto",
     sha256 = "66bfdf8782796239d3875d37e7de19b1d94301e8972b3cbd2446b332429b4df1",
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
index 61cc1ca5e..f8cf41618 100644
--- a/WORKSPACE.bzlmod
+++ b/WORKSPACE.bzlmod
@@ -12,14 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# See MODULE.bazel for external dependencies setup.
-
-# Having both WORKSPACE and MODULE.bazel specify dependencies is brittle.
-# fuzztest is not yet available via Bazel registry, but should be soon:
-#   https://github.com/bazelbuild/bazel-central-registry/issues/1391
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-http_archive(
-    name = "com_google_fuzztest",
-    strip_prefix = "fuzztest-7e084905bce6ffa97b58cf8e8945e5cea2348a5a",
-    url = "https://github.com/google/fuzztest/archive/7e084905bce6ffa97b58cf8e8945e5cea2348a5a.zip",
-)
+# https://bazel.build/external/migration#workspace.bzlmod
+#
+# This file is intentionally empty. When bzlmod is enabled and this
+# file exists, the content of WORKSPACE is ignored. This prevents
+# bzlmod builds from unintentionally depending on the WORKSPACE file.
diff --git a/tcmalloc/BUILD b/tcmalloc/BUILD
index 44fa78d5e..9a3d6c77e 100644
--- a/tcmalloc/BUILD
+++ b/tcmalloc/BUILD
@@ -69,7 +69,6 @@ tcmalloc_deps = [
     "@com_google_absl//absl/base:config",
     "@com_google_absl//absl/base:core_headers",
     "@com_google_absl//absl/base:dynamic_annotations",
-    "@com_google_absl//absl/debugging:leak_check",
     "@com_google_absl//absl/debugging:stacktrace",
     "@com_google_absl//absl/debugging:symbolize",
     "//tcmalloc/selsan",
diff --git a/tcmalloc/internal/BUILD b/tcmalloc/internal/BUILD
index c997b94cf..6173541a3 100644
--- a/tcmalloc/internal/BUILD
+++ b/tcmalloc/internal/BUILD
@@ -14,8 +14,8 @@
 #
 # Internal libraries used for the implementation and testing of TCMalloc.
 
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("//tcmalloc:copts.bzl", "TCMALLOC_DEFAULT_COPTS")
 load("//tcmalloc:variants.bzl", "create_tcmalloc_benchmark")