Remove upb_ExtensionRegistry_AddAllLinkedExtensions API.

This is now an implementation detail of the public GeneratedRegistry.

PiperOrigin-RevId: 827277782

Author: mkruskal-google

.github/workflows/test_upb.yml

@@ -30,6 +30,8 @@ jobs:
         config:
           - { name: "Fastbuild" }
           - { name: "Optimized", flags: "-c opt", continuous-only: true }
+          - { name: "GCC Optimized", flags: "-c opt --force_pic --java_runtime_version=remotejdk_11 --copt=\"-Wno-error=maybe-uninitialized\"", image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:8.0.1-12.2-12e21b8dda91028bc14212a3ab582c7c4d149fac" }
+          - { name: "GCC Static", flags: "-c opt --dynamic_mode=off --java_runtime_version=remotejdk_11 --copt=\"-Wno-error=maybe-uninitialized\"", image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:8.0.1-12.2-12e21b8dda91028bc14212a3ab582c7c4d149fac", continuous-only: true }
           - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-22-4core }
           - { name: "UBSAN", flags: "--config=ubsan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/... -//lua/...", continuous-only: true }
           - { name: "32-bit", flags: "--copt=-m32 --linkopt=-m32", exclude-targets: "-//benchmarks:benchmark -//python/..." }
@@ -49,33 +51,12 @@ jobs:
         if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
         uses: protocolbuffers/protobuf-ci/bazel-docker@v5
         with:
-          image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:${{ matrix.config.bazel_version || '8.0.1' }}-12e21b8dda91028bc14212a3ab582c7c4d149fac
+          image: ${{ matrix.config.image || 'us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:8.0.1-12e21b8dda91028bc14212a3ab582c7c4d149fac' }}
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: upb-bazel
           bazel: test //bazel/... //benchmarks/... //lua/... //python/... //upb/... //upb_generator/... ${{ matrix.config.flags }}
           exclude-targets: ${{ matrix.config.exclude-targets }}
 
-  linux-gcc:
-    strategy:
-      fail-fast: false   # Don't cancel all jobs if one fails.
-    name: GCC Optimized
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout pending changes
-        uses: protocolbuffers/protobuf-ci/checkout@v5
-        with:
-          ref: ${{ inputs.safe-checkout }}
-      - name: Run tests
-        uses: protocolbuffers/protobuf-ci/bazel-docker@v5
-        with:
-          image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:8.0.1-12.2-12e21b8dda91028bc14212a3ab582c7c4d149fac"
-          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: "upb-bazel-gcc"
-          bazel: >-
-            test -c opt
-            --copt="-Wno-error=maybe-uninitialized" --java_runtime_version=remotejdk_11
-            //bazel/... //benchmarks/... //lua/... //python/... //upb/... //upb_generator/...
-
   windows:
     strategy:
       fail-fast: false   # Don't cancel all jobs if one fails.

cmake/installed_include_golden.txt

@@ -185,12 +185,14 @@ upb/message/value.h
 upb/mini_descriptor/build_enum.h
 upb/mini_descriptor/decode.h
 upb/mini_descriptor/link.h
+upb/mini_table/compat.h
 upb/mini_table/debug_string.h
 upb/mini_table/enum.h
 upb/mini_table/extension.h
 upb/mini_table/extension_registry.h
 upb/mini_table/field.h
 upb/mini_table/file.h
+upb/mini_table/generated_registry.h
 upb/mini_table/message.h
 upb/mini_table/sub.h
 upb/port/atomic.h

hpb/extension.h

@@ -21,6 +21,7 @@
 #include "hpb/ptr.h"
 #include "upb/message/accessors.h"
 #include "upb/mini_table/extension_registry.h"
+#include "upb/mini_table/generated_registry.h"
 
 namespace hpb {
 // upb has a notion of an ExtensionRegistry. We expect most callers to use
@@ -69,14 +70,17 @@ class ExtensionRegistry {
   friend upb_ExtensionRegistry* ::hpb::internal::GetUpbExtensions(
       const ExtensionRegistry& extension_registry);
   upb_ExtensionRegistry* registry_;
+  explicit ExtensionRegistry(upb_ExtensionRegistry* registry)
+      : registry_(registry) {}
 #endif
   // TODO: b/379100963 - Introduce ShutdownHpbLibrary
   static const ExtensionRegistry* NewGeneratedRegistry() {
 #if HPB_INTERNAL_BACKEND == HPB_INTERNAL_BACKEND_UPB
-    static hpb::Arena* global_arena = new hpb::Arena();
-    ExtensionRegistry* registry = new ExtensionRegistry(*global_arena);
-    upb_ExtensionRegistry_AddAllLinkedExtensions(registry->registry_);
-    return registry;
+    static const upb_GeneratedRegistryRef* registry_ref =
+        upb_GeneratedRegistry_Load();
+    // Const cast is safe because we're returning a const wrapper.
+    return new ExtensionRegistry(const_cast<upb_ExtensionRegistry*>(
+        upb_GeneratedRegistry_Get(registry_ref)));
 #elif HPB_INTERNAL_BACKEND == HPB_INTERNAL_BACKEND_CPP
     ExtensionRegistry* registry = new ExtensionRegistry();
     return registry;

pkg/BUILD.bazel

@@ -249,6 +249,7 @@ cc_dist_library(
         "//upb/json",
         "//upb/message:compare",
         "//upb/message:copy",
+        "//upb/mini_table:compat",
         "//upb/mini_table:debug_string",
         "//upb/text",
         "//upb/text:debug",

upb/BUILD

@@ -98,6 +98,7 @@ cc_library(
         "//upb/message:internal",
         "//upb/mini_descriptor",
         "//upb/mini_table",
+        "//upb/mini_table:internal",
         "//upb/wire",
     ] + select({
         ":fasttable_enabled_setting": [
@@ -308,9 +309,13 @@ filegroup(
 filegroup(
     name = "test_srcs",
     srcs = [
+        "//upb/hash:test_srcs",
         "//upb/json:test_srcs",
+        "//upb/lex:test_srcs",
         "//upb/mem:test_srcs",
         "//upb/message:test_srcs",
+        "//upb/mini_descriptor:test_srcs",
+        "//upb/mini_table:test_srcs",
         "//upb/test:test_srcs",
         "//upb/util:test_srcs",
         "//upb/wire:test_srcs",

upb/generated_code_support.h

@@ -36,6 +36,7 @@
 #include "upb/mini_table/extension_registry.h"
 #include "upb/mini_table/field.h"
 #include "upb/mini_table/file.h"
+#include "upb/mini_table/internal/generated_registry.h"
 #include "upb/mini_table/message.h"
 #include "upb/mini_table/sub.h"
 #include "upb/wire/decode.h"

upb/hash/BUILD

@@ -65,5 +65,5 @@ filegroup(
             "**/*test.cc",
         ],
     ),
-    visibility = ["//pkg:__pkg__"],
+    visibility = ["//upb:__pkg__"],
 )

upb/lex/BUILD

@@ -72,5 +72,5 @@ filegroup(
             "**/*test.cc",
         ],
     ),
-    visibility = ["//pkg:__pkg__"],
+    visibility = ["//upb:__pkg__"],
 )

upb/mini_descriptor/BUILD

@@ -105,5 +105,5 @@ filegroup(
             "**/*test.cc",
         ],
     ),
-    visibility = ["//pkg:__pkg__"],
+    visibility = ["//upb:__pkg__"],
 )

upb/mini_table/BUILD

@@ -28,6 +28,7 @@ cc_library(
     name = "mini_table",
     srcs = [
         "extension_registry.c",
+        "generated_registry.c",
         "message.c",
     ],
     hdrs = [
@@ -36,6 +37,7 @@ cc_library(
         "extension_registry.h",
         "field.h",
         "file.h",
+        "generated_registry.h",
         "message.h",
         "sub.h",
     ],
@@ -84,6 +86,7 @@ cc_library(
         "internal/extension.h",
         "internal/field.h",
         "internal/file.h",
+        "internal/generated_registry.h",
         "internal/message.h",
         "internal/size_log2.h",
         "internal/sub.h",
@@ -92,7 +95,6 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//upb/base",
-        "//upb/hash",
         "//upb/mem",
         "//upb/message:types",
         "//upb/port",
@@ -131,6 +133,21 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "generated_registry_test",
+    srcs = ["generated_registry_test.cc"],
+    deps = [
+        ":mini_table",
+        "//src/google/protobuf:descriptor_upb_minitable_proto",
+        "//upb/test:custom_options_upb_minitable_proto",
+        "//upb/test:editions_test_upb_minitable_proto",
+        "//upb/test:test_multiple_files_upb_minitable_proto",
+        "@abseil-cpp//absl/synchronization",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 proto_library(
     name = "message_benchmark_proto",
     testonly = 1,