upb: replumb upb_Arena to be substantially more opaque

PiperOrigin-RevId: 592345066
protocolbuffers · Dec 19, 2023 · e3ed591 · e3ed591
1 parent b9ad33c
commit e3ed591
Show file tree

Hide file tree

Showing 9 changed files with 278 additions and 229 deletions.
diff --git a/upb/BUILD b/upb/BUILD
@@ -201,12 +201,6 @@ alias(
     visibility = ["//visibility:public"],
 )
 
-alias(
-    name = "mem_internal",
-    actual = "//upb/mem:internal",
-    visibility = ["//visibility:public"],
-)
-
 alias(
     name = "message",
     actual = "//upb/message",
@@ -403,7 +397,6 @@ upb_amalgamation(
         ":hash",
         ":lex",
         ":mem",
-        ":mem_internal",
         ":message",
         ":message_accessors",
         ":message_copy",
@@ -454,7 +447,6 @@ upb_amalgamation(
         ":json",
         ":lex",
         ":mem",
-        ":mem_internal",
         ":message",
         ":message_accessors",
         ":message_copy",
@@ -505,7 +497,6 @@ upb_amalgamation(
         ":json",
         ":lex",
         ":mem",
-        ":mem_internal",
         ":message",
         ":message_accessors",
         ":message_copy",

diff --git a/upb/mem/BUILD b/upb/mem/BUILD
@@ -9,32 +9,18 @@ load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
 
 cc_library(
     name = "mem",
-    hdrs = [
-        "alloc.h",
-        "arena.h",
-        "arena.hpp",
-    ],
-    copts = UPB_DEFAULT_COPTS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":internal",
-        "//upb:port",
-    ],
-)
-
-cc_library(
-    name = "internal",
     srcs = [
         "alloc.c",
-        "alloc.h",
         "arena.c",
-        "arena.h",
     ],
     hdrs = [
+        "alloc.h",
+        "arena.h",
+        "arena.hpp",
         "internal/arena.h",
     ],
     copts = UPB_DEFAULT_COPTS,
-    visibility = ["//upb:__pkg__"],
+    visibility = ["//visibility:public"],
     deps = [
         "//upb:port",
     ],
@@ -44,9 +30,8 @@ cc_test(
     name = "arena_test",
     srcs = ["arena_test.cc"],
     deps = [
+        ":mem",
         "@com_google_googletest//:gtest_main",
-        "//upb:mem",
-        "//upb:mem_internal",
         "//upb:port",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/random:distributions",