Rename default instances.

This CL prepares upcoming changes to collocate message-globals under a single wrapper (go/proto-msg-globals). The plan is to keep dual state guarded by PROTOBUF_MESSAGE_GLOBALS, which allows smaller CLs and potential A/B experiments. Exising code exposes a raw default instance to messages that contain the type to support constinit or constexpr. Using `T::default_instance()` would encapsulate #ifdef'ing but I didn't find a way to achieve that. (Also, constexpr doesn't allow reinterpret_cast.) This CL renames existing raw default instances so that both branches (#ifdef & #ifndef) can refer to the same name. ``` // Before: struct FooDefaultTypeInternal; extern FooDefaultTypeInternal _Foo_default_instance_; DoSomething(_Foo_default_instance_._instance); // After struct FooGlobalsTypeInternal; extern FooGlobalsTypeInternal _Foo_globals_; DoSomething(_Foo_globals_._default); ``` Note that this is meant to be name changes only. PiperOrigin-RevId: 864580684
2026-08-26 02:23:14 -04:00 · 2026-02-02 16:52:57 -08:00 · 2026-02-02 16:52:57 -08:00 · 33e255c076
commit 33e255c076
parent 2aa094e0d3
15 changed files with 684 additions and 719 deletions
--- a/src/google/protobuf/compiler/cpp/extension.cc
+++ b/src/google/protobuf/compiler/cpp/extension.cc
@ -159,52 +159,44 @@ void ExtensionGenerator::GenerateDeclaration(io::Printer* p) const {

 void ExtensionGenerator::GenerateDefinition(io::Printer* p) {
  auto vars = p->WithVars(variables_);
-  auto generate_default_string = [&] {
-    if (descriptor_->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-      // We need to declare a global string which will contain the default
-      // value. We cannot declare it at class scope because that would require
-      // exposing it in the header which would be annoying for other reasons. So
-      // we replace :: with _ in the name and declare it as a global.
-      return absl::StrReplaceAll(variables_["scoped_name"], {{"::", "_"}}) +
-             "_default";
-    } else if (descriptor_->message_type()) {
-      // We have to initialize the default instance for extensions at
-      // registration time.
-      return absl::StrCat("&", QualifiedDefaultInstanceName(
-                                   descriptor_->message_type(), options_));
-    } else {
-      return DefaultValue(options_, descriptor_);
-    }
-  };
-
-  auto local_var = p->WithVars({
-      {"default_str", generate_default_string()},
-      {"default_val", DefaultValue(options_, descriptor_)},
-      {"message_type", descriptor_->message_type() != nullptr
-                           ? FieldMessageTypeName(descriptor_, options_)
-                           : ""},
-  });
-  p->Emit(
-      {
-          {"declare_default_str",
-           [&] {
-             if (descriptor_->cpp_type() != FieldDescriptor::CPPTYPE_STRING)
-               return;
-
-             // If this is a class member, it needs to be declared in its class
-             // scope.
-             p->Emit(R"cc(
-               const std::string $default_str$($default_val$);
-             )cc");
-           }},
-      },
-      R"cc(
-        $declare_default_str$;
-        PROTOBUF_CONSTINIT$ dllexport_decl$
-            PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 ::_pbi::ExtensionIdentifier<
-                $extendee$, ::_pbi::$type_traits$, $field_type$, $packed$>
-                $scoped_name$($constant_name$, $default_str$);
-      )cc");
+  if (descriptor_->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
+    // We need to declare a global string which will contain the default
+    // value. We cannot declare it at class scope because that would require
+    // exposing it in the header which would be annoying for other reasons. So
+    // we replace :: with _ in the name and declare it as a global.
+    p->Emit({{"default_str",
+              absl::StrReplaceAll(variables_["scoped_name"], {{"::", "_"}}) +
+                  "_default"},
+             {"default_val", DefaultValue(options_, descriptor_)}},
+            // If this is a class member, it needs to be declared in its class
+            // scope.
+            R"cc(
+              const std::string $default_str$($default_val$);
+              PROTOBUF_CONSTINIT$ dllexport_decl$
+                  PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 ::_pbi::ExtensionIdentifier<
+                      $extendee$, ::_pbi::$type_traits$, $field_type$, $packed$>
+                      $scoped_name$($constant_name$, $default_str$);
+            )cc");
+  } else if (descriptor_->message_type()) {
+    // We have to initialize the default instance for extensions at
+    // registration time.
+    p->Emit({{"globals_name", QualifiedMsgGlobalsInstanceName(
+                                  descriptor_->message_type(), options_)}},
+            R"cc(
+              PROTOBUF_CONSTINIT$ dllexport_decl$
+                  PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 ::_pbi::ExtensionIdentifier<
+                      $extendee$, ::_pbi::$type_traits$, $field_type$, $packed$>
+                      $scoped_name$($constant_name$, &$globals_name$);
+            )cc");
+  } else {
+    p->Emit({{"default_val", DefaultValue(options_, descriptor_)}},
+            R"cc(
+              PROTOBUF_CONSTINIT$ dllexport_decl$
+                  PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 ::_pbi::ExtensionIdentifier<
+                      $extendee$, ::_pbi::$type_traits$, $field_type$, $packed$>
+                      $scoped_name$($constant_name$, $default_val$);
+            )cc");
+  }
 }

 bool ExtensionGenerator::WillGenerateRegistration(InitPriority priority) {
--- a/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
+++ b/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
@ -45,7 +45,7 @@ std::vector<Sub> Vars(const FieldDescriptor* field, const Options& opts,
  std::string field_name = FieldMemberName(field, split);
  std::string qualified_type = FieldMessageTypeName(field, opts);
  std::string default_ref =
-      QualifiedDefaultInstanceName(field->message_type(), opts);
+      QualifiedMsgGlobalsInstanceName(field->message_type(), opts);
  std::string base = absl::StrCat(
      "::", ProtobufNamespace(opts), "::",
      HasDescriptorMethods(field->file(), opts) ? "Message" : "MessageLite");
--- a/src/google/protobuf/compiler/cpp/file.cc
+++ b/src/google/protobuf/compiler/cpp/file.cc
@ -578,10 +578,10 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
    // there just to improve performance and binary size in these builds.
    p->Emit(
        {
-            {"type", DefaultInstanceType(generator->descriptor(), options_,
-                                         /*split=*/true)},
-            {"name", DefaultInstanceName(generator->descriptor(), options_,
-                                         /*split=*/true)},
+            {"type",
+             SplitDefaultInstanceType(generator->descriptor(), options_)},
+            {"name",
+             SplitDefaultInstanceName(generator->descriptor(), options_)},
            {"default",
             [&] { generator->GenerateInitDefaultSplitInstance(p); }},
            {"class", absl::StrCat(ClassName(generator->descriptor()),
@ -602,24 +602,24 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {

  generator->GenerateConstexprConstructor(p);

+  auto v = p->WithVars({
+      {"type", MsgGlobalsInstanceType(generator->descriptor(), options_)},
+      {"name", MsgGlobalsInstanceName(generator->descriptor(), options_)},
+      {"class", ClassName(generator->descriptor())},
+  });
  if (IsFileDescriptorProto(file_, options_)) {
    p->Emit(
-        {
-            {"type", DefaultInstanceType(generator->descriptor(), options_)},
-            {"name", DefaultInstanceName(generator->descriptor(), options_)},
-            {"class", ClassName(generator->descriptor())},
-        },
        R"cc(
          struct $type$ {
 #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES)
-            constexpr $type$() : _instance(::_pbi::ConstantInitialized{}) {}
+            constexpr $type$() : _default(::_pbi::ConstantInitialized{}) {}
 #else   // defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES)
            $type$() {}
-            void Init() { ::new (&_instance) $class$(); };
+            void Init() { ::new (&_default) $class$(); };
 #endif  // defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES)
            ~$type$() {}
            union {
-              $class$ _instance;
+              $class$ _default;
            };
          };

@ -630,20 +630,17 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
    p->Emit(
        {
            {"index", generator->index_in_file_messages()},
-            {"type", DefaultInstanceType(generator->descriptor(), options_)},
-            {"name", DefaultInstanceName(generator->descriptor(), options_)},
-            {"class", ClassName(generator->descriptor())},
            {"section", WeakDefaultInstanceSection(
                            generator->descriptor(),
                            generator->index_in_file_messages(), options_)},
        },
        R"cc(
          struct $type$ {
-            constexpr $type$() : _instance(::_pbi::ConstantInitialized{}) {}
+            constexpr $type$() : _default(::_pbi::ConstantInitialized{}) {}
            ~$type$() {}
-            //~ _instance must be the first member.
+            //~ _default must be the first member.
            union {
-              $class$ _instance;
+              $class$ _default;
            };
            ::_pbi::WeakDescriptorDefaultTail tail = {
                file_default_instances + $index$, sizeof($type$)};
@ -655,17 +652,12 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
        )cc");
  } else {
    p->Emit(
-        {
-            {"type", DefaultInstanceType(generator->descriptor(), options_)},
-            {"name", DefaultInstanceName(generator->descriptor(), options_)},
-            {"class", ClassName(generator->descriptor())},
-        },
        R"cc(
          struct $type$ {
-            constexpr $type$() : _instance(::_pbi::ConstantInitialized{}) {}
+            constexpr $type$() : _default(::_pbi::ConstantInitialized{}) {}
            ~$type$() {}
            union {
-              $class$ _instance;
+              $class$ _default;
            };
          };

@ -677,8 +669,8 @@ void FileGenerator::GenerateSourceDefaultInstance(int idx, io::Printer* p) {
  if (options_.lite_implicit_weak_fields) {
    p->Emit(
        {
-            {"ptr", DefaultInstancePtr(generator->descriptor(), options_)},
-            {"name", DefaultInstanceName(generator->descriptor(), options_)},
+            {"ptr", MsgGlobalsInstancePtr(generator->descriptor(), options_)},
+            {"name", MsgGlobalsInstanceName(generator->descriptor(), options_)},
        },
        R"cc(
          PROTOBUF_CONSTINIT const void* $ptr$ = &$name$;
@ -754,13 +746,13 @@ void FileGenerator::GenerateInternalForwardDeclarations(
      ns.ChangeTo(Namespace(instance, options_));

      if (options_.lite_implicit_weak_fields) {
-        p->Emit({{"ptr", DefaultInstancePtr(instance, options_)}}, R"cc(
+        p->Emit({{"ptr", MsgGlobalsInstancePtr(instance, options_)}}, R"cc(
          PROTOBUF_CONSTINIT __attribute__((weak)) const void* $ptr$ =
              &::_pbi::implicit_weak_message_default_instance;
        )cc");
      } else {
-        p->Emit({{"type", DefaultInstanceType(instance, options_)},
-                 {"name", DefaultInstanceName(instance, options_)}},
+        p->Emit({{"type", MsgGlobalsInstanceType(instance, options_)},
+                 {"name", MsgGlobalsInstanceName(instance, options_)}},
                R"cc(
                  extern __attribute__((weak)) $type$ $name$;
                )cc");
@ -1216,7 +1208,7 @@ void FileGenerator::GenerateReflectionInitializationCode(io::Printer* p) {
                       {"class", ClassName(gen->descriptor())},
                   },
                   R"cc(
-                     &$ns$::_$class$_default_instance_._instance,
+                     &$ns$::_$class$_globals_._default,
                   )cc");
             }
           }}};
@ -1401,7 +1393,7 @@ void FileGenerator::GenerateReflectionInitializationCode(io::Printer* p) {
                                        [&](std::string* out, const auto& gen) {
                                          absl::StrAppend(
                                              out,
-                                              DefaultInstanceName(
+                                              MsgGlobalsInstanceName(
                                                  gen->descriptor(), options_),
                                              ".Init();");
                                        })}},
@ -1444,14 +1436,14 @@ class FileGenerator::ForwardDeclarations {
      p->Emit(
          {
              Sub("class", c.first).AnnotatedAs(desc),
-              {"default_type", DefaultInstanceType(desc, options)},
-              {"default_name", DefaultInstanceName(desc, options)},
+              {"globals_type", MsgGlobalsInstanceType(desc, options)},
+              {"globals_name", MsgGlobalsInstanceName(desc, options)},
              {"classdata_type", ClassDataType(desc, options)},
          },
          R"cc(
            class $class$;
-            struct $default_type$;
-            $dllexport_decl $extern $default_type$ $default_name$;
+            struct $globals_type$;
+            $dllexport_decl $extern $globals_type$ $globals_name$;
            $dllexport_decl $extern const $pbi$::$classdata_type$ $class$_class_data_;
          )cc");
    }
@ -1460,10 +1452,8 @@ class FileGenerator::ForwardDeclarations {
      const Descriptor* desc = s.second;
      p->Emit(
          {
-              {"default_type",
-               DefaultInstanceType(desc, options, /*split=*/true)},
-              {"default_name",
-               DefaultInstanceName(desc, options, /*split=*/true)},
+              {"default_type", SplitDefaultInstanceType(desc, options)},
+              {"default_name", SplitDefaultInstanceName(desc, options)},
          },
          R"cc(
            struct $default_type$;
@ -1484,10 +1474,10 @@ class FileGenerator::ForwardDeclarations {
    if (ShouldGenerateExternSpecializations(options)) {
      for (const auto& c : classes_) {
        if (!ShouldGenerateClass(c.second, options)) continue;
-        auto vars = p->WithVars(
-            {{"class", QualifiedClassName(c.second, options)},
-             {"default_name", QualifiedDefaultInstanceName(c.second, options,
-                                                           /*split=*/false)}});
+        auto vars =
+            p->WithVars({{"class", QualifiedClassName(c.second, options)},
+                         {"default_name",
+                          QualifiedMsgGlobalsInstanceName(c.second, options)}});
        // To reduce total linker input size in large binaries we make these
        // functions extern and define then in the pb.cc file. This avoids bloat
        // in callers by having duplicate definitions of the template.
--- a/src/google/protobuf/compiler/cpp/helpers.cc
+++ b/src/google/protobuf/compiler/cpp/helpers.cc
@ -572,33 +572,48 @@ std::string Namespace(const EnumDescriptor* d, const Options& options) {
  return Namespace(d->file(), options);
 }

-std::string DefaultInstanceType(const Descriptor* descriptor,
-                                const Options& /*options*/, bool split) {
-  return ClassName(descriptor) + (split ? "__Impl_Split" : "") +
-         "DefaultTypeInternal";
+std::string SplitDefaultInstanceType(const Descriptor* descriptor,
+                                     const Options& /*options*/) {
+  return absl::StrCat(ClassName(descriptor), "__Impl_SplitDefaultTypeInternal");
 }

-std::string DefaultInstanceName(const Descriptor* descriptor,
-                                const Options& /*options*/, bool split) {
+std::string SplitDefaultInstanceName(const Descriptor* descriptor,
+                                     const Options& /*options*/) {
  return absl::StrCat("_", ClassName(descriptor, false),
-                      (split ? "__Impl_Split" : ""), "_default_instance_");
+                      "__Impl_Split_default_instance_");
 }

-std::string DefaultInstancePtr(const Descriptor* descriptor,
-                               const Options& options, bool split) {
-  return absl::StrCat(DefaultInstanceName(descriptor, options, split), "ptr_");
+std::string MsgGlobalsInstanceType(const Descriptor* descriptor,
+                                   const Options& /*options*/) {
+  return absl::StrCat(ClassName(descriptor), "GlobalsTypeInternal");
 }

-std::string QualifiedDefaultInstanceName(const Descriptor* descriptor,
-                                         const Options& options, bool split) {
+std::string MsgGlobalsInstanceName(const Descriptor* descriptor,
+                                   const Options& /*options*/) {
+  return absl::StrCat("_", ClassName(descriptor, false), "_globals_");
+}
+
+std::string MsgGlobalsInstancePtr(const Descriptor* descriptor,
+                                  const Options& options) {
+  return absl::StrCat(MsgGlobalsInstanceName(descriptor, options), "ptr_");
+}
+
+std::string QualifiedSplitDefaultInstanceName(const Descriptor* descriptor,
+                                              const Options& options) {
+  return QualifiedFileLevelSymbol(descriptor->file(),
+                                  SplitDefaultInstanceName(descriptor, options),
+                                  options);
+}
+
+std::string QualifiedMsgGlobalsInstanceName(const Descriptor* descriptor,
+                                            const Options& options) {
  return QualifiedFileLevelSymbol(
-      descriptor->file(), DefaultInstanceName(descriptor, options, split),
-      options);
+      descriptor->file(), MsgGlobalsInstanceName(descriptor, options), options);
 }

-std::string QualifiedDefaultInstancePtr(const Descriptor* descriptor,
-                                        const Options& options, bool split) {
-  return absl::StrCat(QualifiedDefaultInstanceName(descriptor, options, split),
+std::string QualifiedMsgGlobalsInstancePtr(const Descriptor* descriptor,
+                                           const Options& options) {
+  return absl::StrCat(QualifiedMsgGlobalsInstanceName(descriptor, options),
                      "ptr_");
 }

@ -1729,7 +1744,7 @@ bool UsingImplicitWeakDescriptor(const FileDescriptor* file,

 std::string StrongReferenceToType(const Descriptor* desc,
                                  const Options& options) {
-  const auto name = QualifiedDefaultInstanceName(desc, options);
+  const auto name = QualifiedMsgGlobalsInstanceName(desc, options);
  return absl::StrFormat("::%s::internal::StrongPointer<decltype(%s)*, &%s>()",
                         ProtobufNamespace(options), name, name);
 }
--- a/src/google/protobuf/compiler/cpp/helpers.h
+++ b/src/google/protobuf/compiler/cpp/helpers.h
@ -151,27 +151,37 @@ std::string QualifiedExtensionName(const FieldDescriptor* d,
 std::string QualifiedExtensionName(const FieldDescriptor* d);

 // Type name of default instance.
-std::string DefaultInstanceType(const Descriptor* descriptor,
-                                const Options& options, bool split = false);
+std::string SplitDefaultInstanceType(const Descriptor* descriptor,
+                                     const Options& options);

 // Non-qualified name of the default_instance of this message.
-std::string DefaultInstanceName(const Descriptor* descriptor,
-                                const Options& options, bool split = false);
+std::string SplitDefaultInstanceName(const Descriptor* descriptor,
+                                     const Options& options);
+
+// Type name of globals instance.
+std::string MsgGlobalsInstanceType(const Descriptor* descriptor,
+                                   const Options& options);
+
+// Non-qualified name of the globals instance of this message.
+std::string MsgGlobalsInstanceName(const Descriptor* descriptor,
+                                   const Options& options);

 // Non-qualified name of the default instance pointer. This is used only for
 // implicit weak fields, where we need an extra indirection.
-std::string DefaultInstancePtr(const Descriptor* descriptor,
-                               const Options& options, bool split = false);
+std::string MsgGlobalsInstancePtr(const Descriptor* descriptor,
+                                  const Options& options);

 // Fully qualified name of the default_instance of this message.
-std::string QualifiedDefaultInstanceName(const Descriptor* descriptor,
-                                         const Options& options,
-                                         bool split = false);
+std::string QualifiedSplitDefaultInstanceName(const Descriptor* descriptor,
+                                              const Options& options);
+
+// Fully qualified name of the globals instance of this message.
+std::string QualifiedMsgGlobalsInstanceName(const Descriptor* descriptor,
+                                            const Options& options);

 // Fully qualified name of the default instance pointer.
-std::string QualifiedDefaultInstancePtr(const Descriptor* descriptor,
-                                        const Options& options,
-                                        bool split = false);
+std::string QualifiedMsgGlobalsInstancePtr(const Descriptor* descriptor,
+                                           const Options& options);

 // Name of the ClassData subclass used for a message.
 std::string ClassDataType(const Descriptor* descriptor, const Options& options);
--- a/src/google/protobuf/compiler/cpp/message.cc
+++ b/src/google/protobuf/compiler/cpp/message.cc
@ -1539,7 +1539,7 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) {
          explicit constexpr $classname$($pbi$::ConstantInitialized);
          explicit $classname$($pb$::Arena* $nullable$ arena);
          static constexpr const void* $nonnull$ internal_default_instance() {
-            return &_$classname$_default_instance_;
+            return &_$classname$_globals_;
          }

          $decl_verify_func$;
@ -2093,12 +2093,12 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
       {"decl_split_methods",
        [&] {
          if (!ShouldSplit(descriptor_, options_)) return;
-          p->Emit({{"default_name", DefaultInstanceName(descriptor_, options_,
-                                                        /*split=*/true)}},
+          p->Emit({{"split_default",
+                    SplitDefaultInstanceName(descriptor_, options_)}},
                  R"cc(
                    private:
                    inline bool IsSplitMessageDefault() const {
-                      return $split$ == reinterpret_cast<const Impl_::Split*>(&$default_name$);
+                      return $split$ == reinterpret_cast<const Impl_::Split*>(&$split_default$);
                    }
                    PROTOBUF_NOINLINE void PrepareSplitMessageForWrite();

@ -2192,8 +2192,8 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
        [&] {
          if (!ShouldSplit(descriptor_, options_)) return;

-          p->Emit({{"split_default", DefaultInstanceType(descriptor_, options_,
-                                                         /*split=*/true)}},
+          p->Emit({{"split_default",
+                    SplitDefaultInstanceType(descriptor_, options_)}},
                  R"cc(
                    friend struct $split_default$;
                  )cc");
@ -2251,8 +2251,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
          $descriptor_accessor$;
          $get_descriptor$;
          $nodiscard $static const $classname$& default_instance() {
-            return *reinterpret_cast<const $classname$*>(
-                &_$classname$_default_instance_);
+            return *reinterpret_cast<const $classname$*>(&_$classname$_globals_);
          }
          $decl_oneof$;
          static constexpr int kIndexInFileMessages = $index_in_file_messages$;
@ -2546,10 +2545,8 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) {
  }

  if (ShouldSplit(descriptor_, options_)) {
-    p->Emit({{"split_default",
-              DefaultInstanceName(descriptor_, options_, /*split=*/true)},
-             {"default",
-              DefaultInstanceName(descriptor_, options_, /*split=*/false)}},
+    p->Emit({{"split_default", SplitDefaultInstanceName(descriptor_, options_)},
+             {"default", MsgGlobalsInstanceName(descriptor_, options_)}},
            R"cc(
              void $classname$::PrepareSplitMessageForWrite() {
                if (ABSL_PREDICT_TRUE(IsSplitMessageDefault())) {
@ -2871,7 +2868,7 @@ void MessageGenerator::GenerateImplMemberInit(io::Printer* p,
  auto init_split = [&] {
    if (ShouldSplit(descriptor_, options_)) {
      separator();
-      p->Emit({{"name", DefaultInstanceName(descriptor_, options_, true)}},
+      p->Emit({{"name", SplitDefaultInstanceName(descriptor_, options_)}},
              "_split_{const_cast<Split*>(&$name$._instance)}");
    }
  };
@ -3988,8 +3985,8 @@ void MessageGenerator::GenerateClassData(io::Printer* p) {

  auto vars = p->WithVars(
      {{"default_instance",
-        absl::StrCat("&", DefaultInstanceName(descriptor_, options_),
-                     "._instance")}});
+        absl::StrCat("&", MsgGlobalsInstanceName(descriptor_, options_),
+                     "._default")}});
  const auto is_initialized = [&] {
    if (NeedsIsInitialized()) {
      p->Emit(R"cc(
--- a/src/google/protobuf/compiler/cpp/parse_function_generator.cc
+++ b/src/google/protobuf/compiler/cpp/parse_function_generator.cc
@ -389,9 +389,11 @@ void ParseFunctionGenerator::GenerateTailCallTable(io::Printer* p) {
          p->Emit("{_fl::Offset{sizeof($classname$::Impl_::Split)}},\n");
          break;
        case TailCallTableInfo::kSubMessage:
-          p->Emit({{"name", QualifiedDefaultInstanceName(
+          p->Emit({{"name", QualifiedMsgGlobalsInstanceName(
                                aux_entry.field->message_type(), options_)}},
-                  "{::_pbi::FieldAuxDefaultMessage{}, &$name$},\n");
+                  R"cc(
+                    {::_pbi::FieldAuxDefaultMessage{}, &$name$},
+                  )cc");
          break;
        case TailCallTableInfo::kSubTable:
          p->Emit({{"name", QualifiedClassName(aux_entry.field->message_type(),
@ -399,7 +401,7 @@ void ParseFunctionGenerator::GenerateTailCallTable(io::Printer* p) {
                  "{::_pbi::TcParser::GetTable<$name$>()},\n");
          break;
        case TailCallTableInfo::kSubMessageWeak:
-          p->Emit({{"ptr", QualifiedDefaultInstancePtr(
+          p->Emit({{"ptr", QualifiedMsgGlobalsInstancePtr(
                               aux_entry.field->message_type(), options_)}},
                  "{::_pbi::FieldAuxDefaultMessage{}, &$ptr$},\n");
          break;
--- a/src/google/protobuf/compiler/java/java_features.pb.cc
+++ b/src/google/protobuf/compiler/java/java_features.pb.cc
@ -34,16 +34,16 @@ constexpr JavaFeatures_NestInFileClassFeature::JavaFeatures_NestInFileClassFeatu
    : ::google::protobuf::internal::ZeroFieldsBase() {
 }
 #endif  // PROTOBUF_CUSTOM_VTABLE
-struct JavaFeatures_NestInFileClassFeatureDefaultTypeInternal {
-  constexpr JavaFeatures_NestInFileClassFeatureDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~JavaFeatures_NestInFileClassFeatureDefaultTypeInternal() {}
+struct JavaFeatures_NestInFileClassFeatureGlobalsTypeInternal {
+  constexpr JavaFeatures_NestInFileClassFeatureGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~JavaFeatures_NestInFileClassFeatureGlobalsTypeInternal() {}
  union {
-    JavaFeatures_NestInFileClassFeature _instance;
+    JavaFeatures_NestInFileClassFeature _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 JavaFeatures_NestInFileClassFeatureDefaultTypeInternal _JavaFeatures_NestInFileClassFeature_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 JavaFeatures_NestInFileClassFeatureGlobalsTypeInternal _JavaFeatures_NestInFileClassFeature_globals_;

 inline constexpr JavaFeatures::Impl_::Impl_(
    [[maybe_unused]] ::google::protobuf::internal::InternalVisibility visibility,
@ -64,16 +64,16 @@ constexpr JavaFeatures::JavaFeatures(::_pbi::ConstantInitialized)
 #endif  // PROTOBUF_CUSTOM_VTABLE
      _impl_(internal_visibility(), ::_pbi::ConstantInitialized()) {
 }
-struct JavaFeaturesDefaultTypeInternal {
-  constexpr JavaFeaturesDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~JavaFeaturesDefaultTypeInternal() {}
+struct JavaFeaturesGlobalsTypeInternal {
+  constexpr JavaFeaturesGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~JavaFeaturesGlobalsTypeInternal() {}
  union {
-    JavaFeatures _instance;
+    JavaFeatures _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 JavaFeaturesDefaultTypeInternal _JavaFeatures_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 JavaFeaturesGlobalsTypeInternal _JavaFeatures_globals_;
 }  // namespace pb
 static const ::_pb::EnumDescriptor* PROTOBUF_NONNULL
    file_level_enum_descriptors_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto[2];
@ -104,8 +104,8 @@ static const ::_pbi::MigrationSchema
        {1, sizeof(::pb::JavaFeatures)},
 };
 static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = {
-    &::pb::_JavaFeatures_NestInFileClassFeature_default_instance_._instance,
-    &::pb::_JavaFeatures_default_instance_._instance,
+    &::pb::_JavaFeatures_NestInFileClassFeature_globals_._default,
+    &::pb::_JavaFeatures_globals_._default,
 };
 const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
    protodesc_cold) = {
@ -219,7 +219,7 @@ constexpr auto JavaFeatures_NestInFileClassFeature::InternalNewImpl_() {
 constexpr auto JavaFeatures_NestInFileClassFeature::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_JavaFeatures_NestInFileClassFeature_default_instance_._instance,
+          &_JavaFeatures_NestInFileClassFeature_globals_._default,
          &_table_.header,
          nullptr,  // IsInitialized
          &JavaFeatures_NestInFileClassFeature::MergeImpl,
@ -356,7 +356,7 @@ constexpr auto JavaFeatures::InternalNewImpl_() {
 constexpr auto JavaFeatures::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_JavaFeatures_default_instance_._instance,
+          &_JavaFeatures_globals_._default,
          &_table_.header,
          nullptr,  // IsInitialized
          &JavaFeatures::MergeImpl,
@ -624,7 +624,7 @@ void JavaFeatures::InternalSwap(JavaFeatures* PROTOBUF_RESTRICT PROTOBUF_NONNULL
 PROTOBUF_CONSTINIT PROTOC_EXPORT
    PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 ::_pbi::ExtensionIdentifier<
        ::google::protobuf::FeatureSet, ::_pbi::MessageTypeTraits< ::pb::JavaFeatures >, 11, false>
-        java(kJavaFieldNumber, &::pb::_JavaFeatures_default_instance_);
+        java(kJavaFieldNumber, &::pb::_JavaFeatures_globals_);
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace pb
 namespace google {
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@ -62,12 +62,12 @@ PROTOC_EXPORT extern const uint32_t JavaFeatures_NestInFileClassFeature_NestInFi
 enum JavaFeatures_Utf8Validation : int;
 PROTOC_EXPORT extern const uint32_t JavaFeatures_Utf8Validation_internal_data_[];
 class JavaFeatures;
-struct JavaFeaturesDefaultTypeInternal;
-PROTOC_EXPORT extern JavaFeaturesDefaultTypeInternal _JavaFeatures_default_instance_;
+struct JavaFeaturesGlobalsTypeInternal;
+PROTOC_EXPORT extern JavaFeaturesGlobalsTypeInternal _JavaFeatures_globals_;
 PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull JavaFeatures_class_data_;
 class JavaFeatures_NestInFileClassFeature;
-struct JavaFeatures_NestInFileClassFeatureDefaultTypeInternal;
-PROTOC_EXPORT extern JavaFeatures_NestInFileClassFeatureDefaultTypeInternal _JavaFeatures_NestInFileClassFeature_default_instance_;
+struct JavaFeatures_NestInFileClassFeatureGlobalsTypeInternal;
+PROTOC_EXPORT extern JavaFeatures_NestInFileClassFeatureGlobalsTypeInternal _JavaFeatures_NestInFileClassFeature_globals_;
 PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull JavaFeatures_NestInFileClassFeature_class_data_;
 }  // namespace pb
 namespace google {
@ -224,8 +224,7 @@ class PROTOC_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED JavaFeatures_NestInFi
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const JavaFeatures_NestInFileClassFeature& default_instance() {
-    return *reinterpret_cast<const JavaFeatures_NestInFileClassFeature*>(
-        &_JavaFeatures_NestInFileClassFeature_default_instance_);
+    return *reinterpret_cast<const JavaFeatures_NestInFileClassFeature*>(&_JavaFeatures_NestInFileClassFeature_globals_);
  }
  static constexpr int kIndexInFileMessages = 0;
  friend void swap(JavaFeatures_NestInFileClassFeature& a, JavaFeatures_NestInFileClassFeature& b) { a.Swap(&b); }
@ -384,8 +383,7 @@ class PROTOC_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED JavaFeatures final :
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const JavaFeatures& default_instance() {
-    return *reinterpret_cast<const JavaFeatures*>(
-        &_JavaFeatures_default_instance_);
+    return *reinterpret_cast<const JavaFeatures*>(&_JavaFeatures_globals_);
  }
  static constexpr int kIndexInFileMessages = 1;
  friend void swap(JavaFeatures& a, JavaFeatures& b) { a.Swap(&b); }
--- a/src/google/protobuf/compiler/plugin.pb.cc
+++ b/src/google/protobuf/compiler/plugin.pb.cc
@ -49,16 +49,16 @@ constexpr Version::Version(::_pbi::ConstantInitialized)
 #endif  // PROTOBUF_CUSTOM_VTABLE
      _impl_(internal_visibility(), ::_pbi::ConstantInitialized()) {
 }
-struct VersionDefaultTypeInternal {
-  constexpr VersionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~VersionDefaultTypeInternal() {}
+struct VersionGlobalsTypeInternal {
+  constexpr VersionGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~VersionGlobalsTypeInternal() {}
  union {
-    Version _instance;
+    Version _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 VersionDefaultTypeInternal _Version_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 VersionGlobalsTypeInternal _Version_globals_;

 inline constexpr CodeGeneratorResponse_File::Impl_::Impl_(
    [[maybe_unused]] ::google::protobuf::internal::InternalVisibility visibility,
@ -84,16 +84,16 @@ constexpr CodeGeneratorResponse_File::CodeGeneratorResponse_File(::_pbi::Constan
 #endif  // PROTOBUF_CUSTOM_VTABLE
      _impl_(internal_visibility(), ::_pbi::ConstantInitialized()) {
 }
-struct CodeGeneratorResponse_FileDefaultTypeInternal {
-  constexpr CodeGeneratorResponse_FileDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CodeGeneratorResponse_FileDefaultTypeInternal() {}
+struct CodeGeneratorResponse_FileGlobalsTypeInternal {
+  constexpr CodeGeneratorResponse_FileGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~CodeGeneratorResponse_FileGlobalsTypeInternal() {}
  union {
-    CodeGeneratorResponse_File _instance;
+    CodeGeneratorResponse_File _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponse_FileDefaultTypeInternal _CodeGeneratorResponse_File_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponse_FileGlobalsTypeInternal _CodeGeneratorResponse_File_globals_;

 inline constexpr CodeGeneratorResponse::Impl_::Impl_(
    [[maybe_unused]] ::google::protobuf::internal::InternalVisibility visibility,
@ -120,16 +120,16 @@ constexpr CodeGeneratorResponse::CodeGeneratorResponse(::_pbi::ConstantInitializ
 #endif  // PROTOBUF_CUSTOM_VTABLE
      _impl_(internal_visibility(), ::_pbi::ConstantInitialized()) {
 }
-struct CodeGeneratorResponseDefaultTypeInternal {
-  constexpr CodeGeneratorResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CodeGeneratorResponseDefaultTypeInternal() {}
+struct CodeGeneratorResponseGlobalsTypeInternal {
+  constexpr CodeGeneratorResponseGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~CodeGeneratorResponseGlobalsTypeInternal() {}
  union {
-    CodeGeneratorResponse _instance;
+    CodeGeneratorResponse _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponseDefaultTypeInternal _CodeGeneratorResponse_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponseGlobalsTypeInternal _CodeGeneratorResponse_globals_;

 inline constexpr CodeGeneratorRequest::Impl_::Impl_(
    [[maybe_unused]] ::google::protobuf::internal::InternalVisibility visibility,
@ -164,16 +164,16 @@ constexpr CodeGeneratorRequest::CodeGeneratorRequest(::_pbi::ConstantInitialized
 #endif  // PROTOBUF_CUSTOM_VTABLE
      _impl_(internal_visibility(), ::_pbi::ConstantInitialized()) {
 }
-struct CodeGeneratorRequestDefaultTypeInternal {
-  constexpr CodeGeneratorRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CodeGeneratorRequestDefaultTypeInternal() {}
+struct CodeGeneratorRequestGlobalsTypeInternal {
+  constexpr CodeGeneratorRequestGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~CodeGeneratorRequestGlobalsTypeInternal() {}
  union {
-    CodeGeneratorRequest _instance;
+    CodeGeneratorRequest _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorRequestDefaultTypeInternal _CodeGeneratorRequest_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorRequestGlobalsTypeInternal _CodeGeneratorRequest_globals_;
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google
@ -242,10 +242,10 @@ static const ::_pbi::MigrationSchema
        {35, sizeof(::google::protobuf::compiler::CodeGeneratorResponse)},
 };
 static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = {
-    &::google::protobuf::compiler::_Version_default_instance_._instance,
-    &::google::protobuf::compiler::_CodeGeneratorRequest_default_instance_._instance,
-    &::google::protobuf::compiler::_CodeGeneratorResponse_File_default_instance_._instance,
-    &::google::protobuf::compiler::_CodeGeneratorResponse_default_instance_._instance,
+    &::google::protobuf::compiler::_Version_globals_._default,
+    &::google::protobuf::compiler::_CodeGeneratorRequest_globals_._default,
+    &::google::protobuf::compiler::_CodeGeneratorResponse_File_globals_._default,
+    &::google::protobuf::compiler::_CodeGeneratorResponse_globals_._default,
 };
 const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fplugin_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
    protodesc_cold) = {
@ -397,7 +397,7 @@ constexpr auto Version::InternalNewImpl_() {
 constexpr auto Version::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_Version_default_instance_._instance,
+          &_Version_globals_._default,
          &_table_.header,
          nullptr,  // IsInitialized
          &Version::MergeImpl,
@ -787,7 +787,7 @@ constexpr auto CodeGeneratorRequest::InternalNewImpl_() {
 constexpr auto CodeGeneratorRequest::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_CodeGeneratorRequest_default_instance_._instance,
+          &_CodeGeneratorRequest_globals_._default,
          &_table_.header,
          CodeGeneratorRequest::IsInitializedImpl,
          &CodeGeneratorRequest::MergeImpl,
@ -1216,7 +1216,7 @@ constexpr auto CodeGeneratorResponse_File::InternalNewImpl_() {
 constexpr auto CodeGeneratorResponse_File::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_CodeGeneratorResponse_File_default_instance_._instance,
+          &_CodeGeneratorResponse_File_globals_._default,
          &_table_.header,
          nullptr,  // IsInitialized
          &CodeGeneratorResponse_File::MergeImpl,
@ -1587,7 +1587,7 @@ constexpr auto CodeGeneratorResponse::InternalNewImpl_() {
 constexpr auto CodeGeneratorResponse::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_CodeGeneratorResponse_default_instance_._instance,
+          &_CodeGeneratorResponse_globals_._default,
          &_table_.header,
          nullptr,  // IsInitialized
          &CodeGeneratorResponse::MergeImpl,
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@ -67,20 +67,20 @@ namespace compiler {
 enum CodeGeneratorResponse_Feature : int;
 PROTOC_EXPORT extern const uint32_t CodeGeneratorResponse_Feature_internal_data_[];
 class CodeGeneratorRequest;
-struct CodeGeneratorRequestDefaultTypeInternal;
-PROTOC_EXPORT extern CodeGeneratorRequestDefaultTypeInternal _CodeGeneratorRequest_default_instance_;
+struct CodeGeneratorRequestGlobalsTypeInternal;
+PROTOC_EXPORT extern CodeGeneratorRequestGlobalsTypeInternal _CodeGeneratorRequest_globals_;
 PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull CodeGeneratorRequest_class_data_;
 class CodeGeneratorResponse;
-struct CodeGeneratorResponseDefaultTypeInternal;
-PROTOC_EXPORT extern CodeGeneratorResponseDefaultTypeInternal _CodeGeneratorResponse_default_instance_;
+struct CodeGeneratorResponseGlobalsTypeInternal;
+PROTOC_EXPORT extern CodeGeneratorResponseGlobalsTypeInternal _CodeGeneratorResponse_globals_;
 PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull CodeGeneratorResponse_class_data_;
 class CodeGeneratorResponse_File;
-struct CodeGeneratorResponse_FileDefaultTypeInternal;
-PROTOC_EXPORT extern CodeGeneratorResponse_FileDefaultTypeInternal _CodeGeneratorResponse_File_default_instance_;
+struct CodeGeneratorResponse_FileGlobalsTypeInternal;
+PROTOC_EXPORT extern CodeGeneratorResponse_FileGlobalsTypeInternal _CodeGeneratorResponse_File_globals_;
 PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull CodeGeneratorResponse_File_class_data_;
 class Version;
-struct VersionDefaultTypeInternal;
-PROTOC_EXPORT extern VersionDefaultTypeInternal _Version_default_instance_;
+struct VersionGlobalsTypeInternal;
+PROTOC_EXPORT extern VersionGlobalsTypeInternal _Version_globals_;
 PROTOC_EXPORT extern const ::google::protobuf::internal::ClassDataFull Version_class_data_;
 }  // namespace compiler
 template <>
@ -190,8 +190,7 @@ class PROTOC_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED Version final : publi
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const Version& default_instance() {
-    return *reinterpret_cast<const Version*>(
-        &_Version_default_instance_);
+    return *reinterpret_cast<const Version*>(&_Version_globals_);
  }
  static constexpr int kIndexInFileMessages = 0;
  friend void swap(Version& a, Version& b) { a.Swap(&b); }
@ -435,8 +434,7 @@ class PROTOC_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED CodeGeneratorResponse
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const CodeGeneratorResponse_File& default_instance() {
-    return *reinterpret_cast<const CodeGeneratorResponse_File*>(
-        &_CodeGeneratorResponse_File_default_instance_);
+    return *reinterpret_cast<const CodeGeneratorResponse_File*>(&_CodeGeneratorResponse_File_globals_);
  }
  static constexpr int kIndexInFileMessages = 2;
  friend void swap(CodeGeneratorResponse_File& a, CodeGeneratorResponse_File& b) { a.Swap(&b); }
@ -694,8 +692,7 @@ class PROTOC_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED CodeGeneratorResponse
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const CodeGeneratorResponse& default_instance() {
-    return *reinterpret_cast<const CodeGeneratorResponse*>(
-        &_CodeGeneratorResponse_default_instance_);
+    return *reinterpret_cast<const CodeGeneratorResponse*>(&_CodeGeneratorResponse_globals_);
  }
  static constexpr int kIndexInFileMessages = 3;
  friend void swap(CodeGeneratorResponse& a, CodeGeneratorResponse& b) { a.Swap(&b); }
@ -983,8 +980,7 @@ class PROTOC_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED CodeGeneratorRequest
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const CodeGeneratorRequest& default_instance() {
-    return *reinterpret_cast<const CodeGeneratorRequest*>(
-        &_CodeGeneratorRequest_default_instance_);
+    return *reinterpret_cast<const CodeGeneratorRequest*>(&_CodeGeneratorRequest_globals_);
  }
  static constexpr int kIndexInFileMessages = 1;
  friend void swap(CodeGeneratorRequest& a, CodeGeneratorRequest& b) { a.Swap(&b); }
@ -1659,7 +1655,7 @@ inline void CodeGeneratorRequest::clear_compiler_version() {
 inline const ::google::protobuf::compiler::Version& CodeGeneratorRequest::_internal_compiler_version() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::compiler::Version* p = _impl_.compiler_version_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::compiler::Version&>(::google::protobuf::compiler::_Version_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::compiler::Version&>(::google::protobuf::compiler::_Version_globals_);
 }
 inline const ::google::protobuf::compiler::Version& CodeGeneratorRequest::compiler_version() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
@ -1963,7 +1959,7 @@ inline bool CodeGeneratorResponse_File::has_generated_code_info() const {
 inline const ::google::protobuf::GeneratedCodeInfo& CodeGeneratorResponse_File::_internal_generated_code_info() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::GeneratedCodeInfo* p = _impl_.generated_code_info_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::GeneratedCodeInfo&>(::google::protobuf::_GeneratedCodeInfo_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::GeneratedCodeInfo&>(::google::protobuf::_GeneratedCodeInfo_globals_);
 }
 inline const ::google::protobuf::GeneratedCodeInfo& CodeGeneratorResponse_File::generated_code_info() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
--- a/src/google/protobuf/cpp_features.pb.cc
+++ b/src/google/protobuf/cpp_features.pb.cc
@ -44,16 +44,16 @@ constexpr CppFeatures::CppFeatures(::_pbi::ConstantInitialized)
 #endif  // PROTOBUF_CUSTOM_VTABLE
      _impl_(internal_visibility(), ::_pbi::ConstantInitialized()) {
 }
-struct CppFeaturesDefaultTypeInternal {
-  constexpr CppFeaturesDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CppFeaturesDefaultTypeInternal() {}
+struct CppFeaturesGlobalsTypeInternal {
+  constexpr CppFeaturesGlobalsTypeInternal() : _default(::_pbi::ConstantInitialized{}) {}
+  ~CppFeaturesGlobalsTypeInternal() {}
  union {
-    CppFeatures _instance;
+    CppFeatures _default;
  };
 };

 PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CppFeaturesDefaultTypeInternal _CppFeatures_default_instance_;
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CppFeaturesGlobalsTypeInternal _CppFeatures_globals_;
 }  // namespace pb
 static const ::_pb::EnumDescriptor* PROTOBUF_NONNULL
    file_level_enum_descriptors_google_2fprotobuf_2fcpp_5ffeatures_2eproto[1];
@ -78,7 +78,7 @@ static const ::_pbi::MigrationSchema
        {0, sizeof(::pb::CppFeatures)},
 };
 static const ::_pb::Message* PROTOBUF_NONNULL const file_default_instances[] = {
-    &::pb::_CppFeatures_default_instance_._instance,
+    &::pb::_CppFeatures_globals_._default,
 };
 const char descriptor_table_protodef_google_2fprotobuf_2fcpp_5ffeatures_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
    protodesc_cold) = {
@ -199,7 +199,7 @@ constexpr auto CppFeatures::InternalNewImpl_() {
 constexpr auto CppFeatures::InternalGenerateClassData_() {
  return ::google::protobuf::internal::ClassDataFull{
      ::google::protobuf::internal::ClassData{
-          &_CppFeatures_default_instance_._instance,
+          &_CppFeatures_globals_._default,
          &_table_.header,
          nullptr,  // IsInitialized
          &CppFeatures::MergeImpl,
@ -427,7 +427,7 @@ void CppFeatures::InternalSwap(CppFeatures* PROTOBUF_RESTRICT PROTOBUF_NONNULL o
 PROTOBUF_CONSTINIT PROTOBUF_EXPORT
    PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 ::_pbi::ExtensionIdentifier<
        ::google::protobuf::FeatureSet, ::_pbi::MessageTypeTraits< ::pb::CppFeatures >, 11, false>
-        cpp(kCppFieldNumber, &::pb::_CppFeatures_default_instance_);
+        cpp(kCppFieldNumber, &::pb::_CppFeatures_globals_);
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace pb
 namespace google {
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@ -59,8 +59,8 @@ namespace pb {
 enum CppFeatures_StringType : int;
 PROTOBUF_EXPORT extern const uint32_t CppFeatures_StringType_internal_data_[];
 class CppFeatures;
-struct CppFeaturesDefaultTypeInternal;
-PROTOBUF_EXPORT extern CppFeaturesDefaultTypeInternal _CppFeatures_default_instance_;
+struct CppFeaturesGlobalsTypeInternal;
+PROTOBUF_EXPORT extern CppFeaturesGlobalsTypeInternal _CppFeatures_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull CppFeatures_class_data_;
 }  // namespace pb
 namespace google {
@ -178,8 +178,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED CppFeatures final :
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const CppFeatures& default_instance() {
-    return *reinterpret_cast<const CppFeatures*>(
-        &_CppFeatures_default_instance_);
+    return *reinterpret_cast<const CppFeatures*>(&_CppFeatures_globals_);
  }
  static constexpr int kIndexInFileMessages = 0;
  friend void swap(CppFeatures& a, CppFeatures& b) { a.Swap(&b); }
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@ -98,140 +98,140 @@ PROTOBUF_EXPORT extern const uint32_t MethodOptions_IdempotencyLevel_internal_da
 enum SymbolVisibility : int;
 PROTOBUF_EXPORT extern const uint32_t SymbolVisibility_internal_data_[];
 class DescriptorProto;
-struct DescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_;
+struct DescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern DescriptorProtoGlobalsTypeInternal _DescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull DescriptorProto_class_data_;
 class DescriptorProto_ExtensionRange;
-struct DescriptorProto_ExtensionRangeDefaultTypeInternal;
-PROTOBUF_EXPORT extern DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_;
+struct DescriptorProto_ExtensionRangeGlobalsTypeInternal;
+PROTOBUF_EXPORT extern DescriptorProto_ExtensionRangeGlobalsTypeInternal _DescriptorProto_ExtensionRange_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull DescriptorProto_ExtensionRange_class_data_;
 class DescriptorProto_ReservedRange;
-struct DescriptorProto_ReservedRangeDefaultTypeInternal;
-PROTOBUF_EXPORT extern DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_;
+struct DescriptorProto_ReservedRangeGlobalsTypeInternal;
+PROTOBUF_EXPORT extern DescriptorProto_ReservedRangeGlobalsTypeInternal _DescriptorProto_ReservedRange_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull DescriptorProto_ReservedRange_class_data_;
 class EnumDescriptorProto;
-struct EnumDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_;
+struct EnumDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern EnumDescriptorProtoGlobalsTypeInternal _EnumDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull EnumDescriptorProto_class_data_;
 class EnumDescriptorProto_EnumReservedRange;
-struct EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal _EnumDescriptorProto_EnumReservedRange_default_instance_;
+struct EnumDescriptorProto_EnumReservedRangeGlobalsTypeInternal;
+PROTOBUF_EXPORT extern EnumDescriptorProto_EnumReservedRangeGlobalsTypeInternal _EnumDescriptorProto_EnumReservedRange_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull EnumDescriptorProto_EnumReservedRange_class_data_;
 class EnumOptions;
-struct EnumOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_;
+struct EnumOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern EnumOptionsGlobalsTypeInternal _EnumOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull EnumOptions_class_data_;
 class EnumValueDescriptorProto;
-struct EnumValueDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_;
+struct EnumValueDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern EnumValueDescriptorProtoGlobalsTypeInternal _EnumValueDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull EnumValueDescriptorProto_class_data_;
 class EnumValueOptions;
-struct EnumValueOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_;
+struct EnumValueOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern EnumValueOptionsGlobalsTypeInternal _EnumValueOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull EnumValueOptions_class_data_;
 class ExtensionRangeOptions;
-struct ExtensionRangeOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern ExtensionRangeOptionsDefaultTypeInternal _ExtensionRangeOptions_default_instance_;
+struct ExtensionRangeOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern ExtensionRangeOptionsGlobalsTypeInternal _ExtensionRangeOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull ExtensionRangeOptions_class_data_;
 class ExtensionRangeOptions_Declaration;
-struct ExtensionRangeOptions_DeclarationDefaultTypeInternal;
-PROTOBUF_EXPORT extern ExtensionRangeOptions_DeclarationDefaultTypeInternal _ExtensionRangeOptions_Declaration_default_instance_;
+struct ExtensionRangeOptions_DeclarationGlobalsTypeInternal;
+PROTOBUF_EXPORT extern ExtensionRangeOptions_DeclarationGlobalsTypeInternal _ExtensionRangeOptions_Declaration_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull ExtensionRangeOptions_Declaration_class_data_;
 class FeatureSet;
-struct FeatureSetDefaultTypeInternal;
-PROTOBUF_EXPORT extern FeatureSetDefaultTypeInternal _FeatureSet_default_instance_;
+struct FeatureSetGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FeatureSetGlobalsTypeInternal _FeatureSet_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FeatureSet_class_data_;
 class FeatureSetDefaults;
-struct FeatureSetDefaultsDefaultTypeInternal;
-PROTOBUF_EXPORT extern FeatureSetDefaultsDefaultTypeInternal _FeatureSetDefaults_default_instance_;
+struct FeatureSetDefaultsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FeatureSetDefaultsGlobalsTypeInternal _FeatureSetDefaults_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FeatureSetDefaults_class_data_;
 class FeatureSetDefaults_FeatureSetEditionDefault;
-struct FeatureSetDefaults_FeatureSetEditionDefaultDefaultTypeInternal;
-PROTOBUF_EXPORT extern FeatureSetDefaults_FeatureSetEditionDefaultDefaultTypeInternal _FeatureSetDefaults_FeatureSetEditionDefault_default_instance_;
+struct FeatureSetDefaults_FeatureSetEditionDefaultGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FeatureSetDefaults_FeatureSetEditionDefaultGlobalsTypeInternal _FeatureSetDefaults_FeatureSetEditionDefault_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FeatureSetDefaults_FeatureSetEditionDefault_class_data_;
 class FeatureSet_VisibilityFeature;
-struct FeatureSet_VisibilityFeatureDefaultTypeInternal;
-PROTOBUF_EXPORT extern FeatureSet_VisibilityFeatureDefaultTypeInternal _FeatureSet_VisibilityFeature_default_instance_;
+struct FeatureSet_VisibilityFeatureGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FeatureSet_VisibilityFeatureGlobalsTypeInternal _FeatureSet_VisibilityFeature_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FeatureSet_VisibilityFeature_class_data_;
 class FieldDescriptorProto;
-struct FieldDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_;
+struct FieldDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FieldDescriptorProtoGlobalsTypeInternal _FieldDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FieldDescriptorProto_class_data_;
 class FieldOptions;
-struct FieldOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
+struct FieldOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FieldOptionsGlobalsTypeInternal _FieldOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FieldOptions_class_data_;
 class FieldOptions_EditionDefault;
-struct FieldOptions_EditionDefaultDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldOptions_EditionDefaultDefaultTypeInternal _FieldOptions_EditionDefault_default_instance_;
+struct FieldOptions_EditionDefaultGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FieldOptions_EditionDefaultGlobalsTypeInternal _FieldOptions_EditionDefault_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FieldOptions_EditionDefault_class_data_;
 class FieldOptions_FeatureSupport;
-struct FieldOptions_FeatureSupportDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldOptions_FeatureSupportDefaultTypeInternal _FieldOptions_FeatureSupport_default_instance_;
+struct FieldOptions_FeatureSupportGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FieldOptions_FeatureSupportGlobalsTypeInternal _FieldOptions_FeatureSupport_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FieldOptions_FeatureSupport_class_data_;
 class FileDescriptorProto;
-struct FileDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_;
+struct FileDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FileDescriptorProtoGlobalsTypeInternal _FileDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FileDescriptorProto_class_data_;
 class FileDescriptorSet;
-struct FileDescriptorSetDefaultTypeInternal;
-PROTOBUF_EXPORT extern FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_;
+struct FileDescriptorSetGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FileDescriptorSetGlobalsTypeInternal _FileDescriptorSet_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FileDescriptorSet_class_data_;
 class FileOptions;
-struct FileOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern FileOptionsDefaultTypeInternal _FileOptions_default_instance_;
+struct FileOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern FileOptionsGlobalsTypeInternal _FileOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull FileOptions_class_data_;
 class GeneratedCodeInfo;
-struct GeneratedCodeInfoDefaultTypeInternal;
-PROTOBUF_EXPORT extern GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_;
+struct GeneratedCodeInfoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern GeneratedCodeInfoGlobalsTypeInternal _GeneratedCodeInfo_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull GeneratedCodeInfo_class_data_;
 class GeneratedCodeInfo_Annotation;
-struct GeneratedCodeInfo_AnnotationDefaultTypeInternal;
-PROTOBUF_EXPORT extern GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_;
+struct GeneratedCodeInfo_AnnotationGlobalsTypeInternal;
+PROTOBUF_EXPORT extern GeneratedCodeInfo_AnnotationGlobalsTypeInternal _GeneratedCodeInfo_Annotation_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull GeneratedCodeInfo_Annotation_class_data_;
 class MessageOptions;
-struct MessageOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_;
+struct MessageOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern MessageOptionsGlobalsTypeInternal _MessageOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull MessageOptions_class_data_;
 class MethodDescriptorProto;
-struct MethodDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_;
+struct MethodDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern MethodDescriptorProtoGlobalsTypeInternal _MethodDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull MethodDescriptorProto_class_data_;
 class MethodOptions;
-struct MethodOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_;
+struct MethodOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern MethodOptionsGlobalsTypeInternal _MethodOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull MethodOptions_class_data_;
 class OneofDescriptorProto;
-struct OneofDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_;
+struct OneofDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern OneofDescriptorProtoGlobalsTypeInternal _OneofDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull OneofDescriptorProto_class_data_;
 class OneofOptions;
-struct OneofOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_;
+struct OneofOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern OneofOptionsGlobalsTypeInternal _OneofOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull OneofOptions_class_data_;
 class ServiceDescriptorProto;
-struct ServiceDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_;
+struct ServiceDescriptorProtoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern ServiceDescriptorProtoGlobalsTypeInternal _ServiceDescriptorProto_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull ServiceDescriptorProto_class_data_;
 class ServiceOptions;
-struct ServiceOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_;
+struct ServiceOptionsGlobalsTypeInternal;
+PROTOBUF_EXPORT extern ServiceOptionsGlobalsTypeInternal _ServiceOptions_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull ServiceOptions_class_data_;
 class SourceCodeInfo;
-struct SourceCodeInfoDefaultTypeInternal;
-PROTOBUF_EXPORT extern SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_;
+struct SourceCodeInfoGlobalsTypeInternal;
+PROTOBUF_EXPORT extern SourceCodeInfoGlobalsTypeInternal _SourceCodeInfo_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull SourceCodeInfo_class_data_;
 class SourceCodeInfo_Location;
-struct SourceCodeInfo_LocationDefaultTypeInternal;
-PROTOBUF_EXPORT extern SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_;
+struct SourceCodeInfo_LocationGlobalsTypeInternal;
+PROTOBUF_EXPORT extern SourceCodeInfo_LocationGlobalsTypeInternal _SourceCodeInfo_Location_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull SourceCodeInfo_Location_class_data_;
 class UninterpretedOption;
-struct UninterpretedOptionDefaultTypeInternal;
-PROTOBUF_EXPORT extern UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_;
+struct UninterpretedOptionGlobalsTypeInternal;
+PROTOBUF_EXPORT extern UninterpretedOptionGlobalsTypeInternal _UninterpretedOption_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull UninterpretedOption_class_data_;
 class UninterpretedOption_NamePart;
-struct UninterpretedOption_NamePartDefaultTypeInternal;
-PROTOBUF_EXPORT extern UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_;
+struct UninterpretedOption_NamePartGlobalsTypeInternal;
+PROTOBUF_EXPORT extern UninterpretedOption_NamePartGlobalsTypeInternal _UninterpretedOption_NamePart_globals_;
 PROTOBUF_EXPORT extern const ::google::protobuf::internal::ClassDataFull UninterpretedOption_NamePart_class_data_;
 template <>
 internal::EnumTraitsT<::google::protobuf::Edition_internal_data_>
@ -1132,8 +1132,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED UninterpretedOption
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const UninterpretedOption_NamePart& default_instance() {
-    return *reinterpret_cast<const UninterpretedOption_NamePart*>(
-        &_UninterpretedOption_NamePart_default_instance_);
+    return *reinterpret_cast<const UninterpretedOption_NamePart*>(&_UninterpretedOption_NamePart_globals_);
  }
  static constexpr int kIndexInFileMessages = 24;
  friend void swap(UninterpretedOption_NamePart& a, UninterpretedOption_NamePart& b) { a.Swap(&b); }
@ -1354,8 +1353,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED SourceCodeInfo_Loca
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const SourceCodeInfo_Location& default_instance() {
-    return *reinterpret_cast<const SourceCodeInfo_Location*>(
-        &_SourceCodeInfo_Location_default_instance_);
+    return *reinterpret_cast<const SourceCodeInfo_Location*>(&_SourceCodeInfo_Location_globals_);
  }
  static constexpr int kIndexInFileMessages = 30;
  friend void swap(SourceCodeInfo_Location& a, SourceCodeInfo_Location& b) { a.Swap(&b); }
@ -1647,8 +1645,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED GeneratedCodeInfo_A
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const GeneratedCodeInfo_Annotation& default_instance() {
-    return *reinterpret_cast<const GeneratedCodeInfo_Annotation*>(
-        &_GeneratedCodeInfo_Annotation_default_instance_);
+    return *reinterpret_cast<const GeneratedCodeInfo_Annotation*>(&_GeneratedCodeInfo_Annotation_globals_);
  }
  static constexpr int kIndexInFileMessages = 32;
  friend void swap(GeneratedCodeInfo_Annotation& a, GeneratedCodeInfo_Annotation& b) { a.Swap(&b); }
@ -1935,8 +1932,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FieldOptions_Featur
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FieldOptions_FeatureSupport& default_instance() {
-    return *reinterpret_cast<const FieldOptions_FeatureSupport*>(
-        &_FieldOptions_FeatureSupport_default_instance_);
+    return *reinterpret_cast<const FieldOptions_FeatureSupport*>(&_FieldOptions_FeatureSupport_globals_);
  }
  static constexpr int kIndexInFileMessages = 17;
  friend void swap(FieldOptions_FeatureSupport& a, FieldOptions_FeatureSupport& b) { a.Swap(&b); }
@ -2199,8 +2195,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FieldOptions_Editio
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FieldOptions_EditionDefault& default_instance() {
-    return *reinterpret_cast<const FieldOptions_EditionDefault*>(
-        &_FieldOptions_EditionDefault_default_instance_);
+    return *reinterpret_cast<const FieldOptions_EditionDefault*>(&_FieldOptions_EditionDefault_globals_);
  }
  static constexpr int kIndexInFileMessages = 16;
  friend void swap(FieldOptions_EditionDefault& a, FieldOptions_EditionDefault& b) { a.Swap(&b); }
@ -2415,8 +2410,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FeatureSet_Visibili
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FeatureSet_VisibilityFeature& default_instance() {
-    return *reinterpret_cast<const FeatureSet_VisibilityFeature*>(
-        &_FeatureSet_VisibilityFeature_default_instance_);
+    return *reinterpret_cast<const FeatureSet_VisibilityFeature*>(&_FeatureSet_VisibilityFeature_globals_);
  }
  static constexpr int kIndexInFileMessages = 26;
  friend void swap(FeatureSet_VisibilityFeature& a, FeatureSet_VisibilityFeature& b) { a.Swap(&b); }
@ -2576,8 +2570,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FeatureSet final :
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FeatureSet& default_instance() {
-    return *reinterpret_cast<const FeatureSet*>(
-        &_FeatureSet_default_instance_);
+    return *reinterpret_cast<const FeatureSet*>(&_FeatureSet_globals_);
  }
  static constexpr int kIndexInFileMessages = 27;
  friend void swap(FeatureSet& a, FeatureSet& b) { a.Swap(&b); }
@ -3217,8 +3210,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED ExtensionRangeOptio
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const ExtensionRangeOptions_Declaration& default_instance() {
-    return *reinterpret_cast<const ExtensionRangeOptions_Declaration*>(
-        &_ExtensionRangeOptions_Declaration_default_instance_);
+    return *reinterpret_cast<const ExtensionRangeOptions_Declaration*>(&_ExtensionRangeOptions_Declaration_globals_);
  }
  static constexpr int kIndexInFileMessages = 5;
  friend void swap(ExtensionRangeOptions_Declaration& a, ExtensionRangeOptions_Declaration& b) { a.Swap(&b); }
@ -3481,8 +3473,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED EnumDescriptorProto
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const EnumDescriptorProto_EnumReservedRange& default_instance() {
-    return *reinterpret_cast<const EnumDescriptorProto_EnumReservedRange*>(
-        &_EnumDescriptorProto_EnumReservedRange_default_instance_);
+    return *reinterpret_cast<const EnumDescriptorProto_EnumReservedRange*>(&_EnumDescriptorProto_EnumReservedRange_globals_);
  }
  static constexpr int kIndexInFileMessages = 9;
  friend void swap(EnumDescriptorProto_EnumReservedRange& a, EnumDescriptorProto_EnumReservedRange& b) { a.Swap(&b); }
@ -3693,8 +3684,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED DescriptorProto_Res
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const DescriptorProto_ReservedRange& default_instance() {
-    return *reinterpret_cast<const DescriptorProto_ReservedRange*>(
-        &_DescriptorProto_ReservedRange_default_instance_);
+    return *reinterpret_cast<const DescriptorProto_ReservedRange*>(&_DescriptorProto_ReservedRange_globals_);
  }
  static constexpr int kIndexInFileMessages = 3;
  friend void swap(DescriptorProto_ReservedRange& a, DescriptorProto_ReservedRange& b) { a.Swap(&b); }
@ -3905,8 +3895,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED UninterpretedOption
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const UninterpretedOption& default_instance() {
-    return *reinterpret_cast<const UninterpretedOption*>(
-        &_UninterpretedOption_default_instance_);
+    return *reinterpret_cast<const UninterpretedOption*>(&_UninterpretedOption_globals_);
  }
  static constexpr int kIndexInFileMessages = 25;
  friend void swap(UninterpretedOption& a, UninterpretedOption& b) { a.Swap(&b); }
@ -4216,8 +4205,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED SourceCodeInfo fina
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const SourceCodeInfo& default_instance() {
-    return *reinterpret_cast<const SourceCodeInfo*>(
-        &_SourceCodeInfo_default_instance_);
+    return *reinterpret_cast<const SourceCodeInfo*>(&_SourceCodeInfo_globals_);
  }
  static constexpr int kIndexInFileMessages = 31;
  friend void swap(SourceCodeInfo& a, SourceCodeInfo& b) { a.Swap(&b); }
@ -4619,8 +4607,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED GeneratedCodeInfo f
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const GeneratedCodeInfo& default_instance() {
-    return *reinterpret_cast<const GeneratedCodeInfo*>(
-        &_GeneratedCodeInfo_default_instance_);
+    return *reinterpret_cast<const GeneratedCodeInfo*>(&_GeneratedCodeInfo_globals_);
  }
  static constexpr int kIndexInFileMessages = 33;
  friend void swap(GeneratedCodeInfo& a, GeneratedCodeInfo& b) { a.Swap(&b); }
@ -4826,8 +4813,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FeatureSetDefaults_
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FeatureSetDefaults_FeatureSetEditionDefault& default_instance() {
-    return *reinterpret_cast<const FeatureSetDefaults_FeatureSetEditionDefault*>(
-        &_FeatureSetDefaults_FeatureSetEditionDefault_default_instance_);
+    return *reinterpret_cast<const FeatureSetDefaults_FeatureSetEditionDefault*>(&_FeatureSetDefaults_FeatureSetEditionDefault_globals_);
  }
  static constexpr int kIndexInFileMessages = 28;
  friend void swap(FeatureSetDefaults_FeatureSetEditionDefault& a, FeatureSetDefaults_FeatureSetEditionDefault& b) { a.Swap(&b); }
@ -5065,8 +5051,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED ServiceOptions fina
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const ServiceOptions& default_instance() {
-    return *reinterpret_cast<const ServiceOptions*>(
-        &_ServiceOptions_default_instance_);
+    return *reinterpret_cast<const ServiceOptions*>(&_ServiceOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 22;
  friend void swap(ServiceOptions& a, ServiceOptions& b) { a.Swap(&b); }
@ -5499,8 +5484,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED OneofOptions final
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const OneofOptions& default_instance() {
-    return *reinterpret_cast<const OneofOptions*>(
-        &_OneofOptions_default_instance_);
+    return *reinterpret_cast<const OneofOptions*>(&_OneofOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 19;
  friend void swap(OneofOptions& a, OneofOptions& b) { a.Swap(&b); }
@ -5919,8 +5903,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED MethodOptions final
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const MethodOptions& default_instance() {
-    return *reinterpret_cast<const MethodOptions*>(
-        &_MethodOptions_default_instance_);
+    return *reinterpret_cast<const MethodOptions*>(&_MethodOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 23;
  friend void swap(MethodOptions& a, MethodOptions& b) { a.Swap(&b); }
@ -6388,8 +6371,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED MessageOptions fina
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const MessageOptions& default_instance() {
-    return *reinterpret_cast<const MessageOptions*>(
-        &_MessageOptions_default_instance_);
+    return *reinterpret_cast<const MessageOptions*>(&_MessageOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 15;
  friend void swap(MessageOptions& a, MessageOptions& b) { a.Swap(&b); }
@ -6878,8 +6860,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FileOptions final :
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FileOptions& default_instance() {
-    return *reinterpret_cast<const FileOptions*>(
-        &_FileOptions_default_instance_);
+    return *reinterpret_cast<const FileOptions*>(&_FileOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 14;
  friend void swap(FileOptions& a, FileOptions& b) { a.Swap(&b); }
@ -7635,8 +7616,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FieldOptions final
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FieldOptions& default_instance() {
-    return *reinterpret_cast<const FieldOptions*>(
-        &_FieldOptions_default_instance_);
+    return *reinterpret_cast<const FieldOptions*>(&_FieldOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 18;
  friend void swap(FieldOptions& a, FieldOptions& b) { a.Swap(&b); }
@ -8336,8 +8316,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FeatureSetDefaults
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FeatureSetDefaults& default_instance() {
-    return *reinterpret_cast<const FeatureSetDefaults*>(
-        &_FeatureSetDefaults_default_instance_);
+    return *reinterpret_cast<const FeatureSetDefaults*>(&_FeatureSetDefaults_globals_);
  }
  static constexpr int kIndexInFileMessages = 29;
  friend void swap(FeatureSetDefaults& a, FeatureSetDefaults& b) { a.Swap(&b); }
@ -8576,8 +8555,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED ExtensionRangeOptio
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const ExtensionRangeOptions& default_instance() {
-    return *reinterpret_cast<const ExtensionRangeOptions*>(
-        &_ExtensionRangeOptions_default_instance_);
+    return *reinterpret_cast<const ExtensionRangeOptions*>(&_ExtensionRangeOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 6;
  friend void swap(ExtensionRangeOptions& a, ExtensionRangeOptions& b) { a.Swap(&b); }
@ -9053,8 +9031,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED EnumValueOptions fi
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const EnumValueOptions& default_instance() {
-    return *reinterpret_cast<const EnumValueOptions*>(
-        &_EnumValueOptions_default_instance_);
+    return *reinterpret_cast<const EnumValueOptions*>(&_EnumValueOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 21;
  friend void swap(EnumValueOptions& a, EnumValueOptions& b) { a.Swap(&b); }
@ -9519,8 +9496,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED EnumOptions final :
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const EnumOptions& default_instance() {
-    return *reinterpret_cast<const EnumOptions*>(
-        &_EnumOptions_default_instance_);
+    return *reinterpret_cast<const EnumOptions*>(&_EnumOptions_globals_);
  }
  static constexpr int kIndexInFileMessages = 20;
  friend void swap(EnumOptions& a, EnumOptions& b) { a.Swap(&b); }
@ -9981,8 +9957,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED OneofDescriptorProt
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const OneofDescriptorProto& default_instance() {
-    return *reinterpret_cast<const OneofDescriptorProto*>(
-        &_OneofDescriptorProto_default_instance_);
+    return *reinterpret_cast<const OneofDescriptorProto*>(&_OneofDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 8;
  friend void swap(OneofDescriptorProto& a, OneofDescriptorProto& b) { a.Swap(&b); }
@ -10207,8 +10182,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED MethodDescriptorPro
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const MethodDescriptorProto& default_instance() {
-    return *reinterpret_cast<const MethodDescriptorProto*>(
-        &_MethodDescriptorProto_default_instance_);
+    return *reinterpret_cast<const MethodDescriptorProto*>(&_MethodDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 13;
  friend void swap(MethodDescriptorProto& a, MethodDescriptorProto& b) { a.Swap(&b); }
@ -10499,8 +10473,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FieldDescriptorProt
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FieldDescriptorProto& default_instance() {
-    return *reinterpret_cast<const FieldDescriptorProto*>(
-        &_FieldDescriptorProto_default_instance_);
+    return *reinterpret_cast<const FieldDescriptorProto*>(&_FieldDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 7;
  friend void swap(FieldDescriptorProto& a, FieldDescriptorProto& b) { a.Swap(&b); }
@ -10928,8 +10901,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED EnumValueDescriptor
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const EnumValueDescriptorProto& default_instance() {
-    return *reinterpret_cast<const EnumValueDescriptorProto*>(
-        &_EnumValueDescriptorProto_default_instance_);
+    return *reinterpret_cast<const EnumValueDescriptorProto*>(&_EnumValueDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 11;
  friend void swap(EnumValueDescriptorProto& a, EnumValueDescriptorProto& b) { a.Swap(&b); }
@ -11168,8 +11140,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED DescriptorProto_Ext
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const DescriptorProto_ExtensionRange& default_instance() {
-    return *reinterpret_cast<const DescriptorProto_ExtensionRange*>(
-        &_DescriptorProto_ExtensionRange_default_instance_);
+    return *reinterpret_cast<const DescriptorProto_ExtensionRange*>(&_DescriptorProto_ExtensionRange_globals_);
  }
  static constexpr int kIndexInFileMessages = 2;
  friend void swap(DescriptorProto_ExtensionRange& a, DescriptorProto_ExtensionRange& b) { a.Swap(&b); }
@ -11403,8 +11374,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED ServiceDescriptorPr
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const ServiceDescriptorProto& default_instance() {
-    return *reinterpret_cast<const ServiceDescriptorProto*>(
-        &_ServiceDescriptorProto_default_instance_);
+    return *reinterpret_cast<const ServiceDescriptorProto*>(&_ServiceDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 12;
  friend void swap(ServiceDescriptorProto& a, ServiceDescriptorProto& b) { a.Swap(&b); }
@ -11651,8 +11621,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED EnumDescriptorProto
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const EnumDescriptorProto& default_instance() {
-    return *reinterpret_cast<const EnumDescriptorProto*>(
-        &_EnumDescriptorProto_default_instance_);
+    return *reinterpret_cast<const EnumDescriptorProto*>(&_EnumDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 10;
  friend void swap(EnumDescriptorProto& a, EnumDescriptorProto& b) { a.Swap(&b); }
@ -11963,8 +11932,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED DescriptorProto fin
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const DescriptorProto& default_instance() {
-    return *reinterpret_cast<const DescriptorProto*>(
-        &_DescriptorProto_default_instance_);
+    return *reinterpret_cast<const DescriptorProto*>(&_DescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 4;
  friend void swap(DescriptorProto& a, DescriptorProto& b) { a.Swap(&b); }
@ -12386,8 +12354,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FileDescriptorProto
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FileDescriptorProto& default_instance() {
-    return *reinterpret_cast<const FileDescriptorProto*>(
-        &_FileDescriptorProto_default_instance_);
+    return *reinterpret_cast<const FileDescriptorProto*>(&_FileDescriptorProto_globals_);
  }
  static constexpr int kIndexInFileMessages = 1;
  friend void swap(FileDescriptorProto& a, FileDescriptorProto& b) { a.Swap(&b); }
@ -12866,8 +12833,7 @@ class PROTOBUF_EXPORT  PROTOBUF_FUTURE_ADD_EARLY_WARN_UNUSED FileDescriptorSet f
    return default_instance().GetMetadata().reflection;
  }
  [[nodiscard]] static const FileDescriptorSet& default_instance() {
-    return *reinterpret_cast<const FileDescriptorSet*>(
-        &_FileDescriptorSet_default_instance_);
+    return *reinterpret_cast<const FileDescriptorSet*>(&_FileDescriptorSet_globals_);
  }
  static constexpr int kIndexInFileMessages = 0;
  friend void swap(FileDescriptorSet& a, FileDescriptorSet& b) { a.Swap(&b); }
@ -13915,7 +13881,7 @@ inline void FileDescriptorProto::clear_options() {
 inline const ::google::protobuf::FileOptions& FileDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FileOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FileOptions&>(::google::protobuf::_FileOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FileOptions&>(::google::protobuf::_FileOptions_globals_);
 }
 inline const ::google::protobuf::FileOptions& FileDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options)
@ -14014,7 +13980,7 @@ inline void FileDescriptorProto::clear_source_code_info() {
 inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::_internal_source_code_info() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::SourceCodeInfo* p = _impl_.source_code_info_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::SourceCodeInfo&>(::google::protobuf::_SourceCodeInfo_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::SourceCodeInfo&>(::google::protobuf::_SourceCodeInfo_globals_);
 }
 inline const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_code_info() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info)
@ -14276,7 +14242,7 @@ inline void DescriptorProto_ExtensionRange::clear_options() {
 inline const ::google::protobuf::ExtensionRangeOptions& DescriptorProto_ExtensionRange::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::ExtensionRangeOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::ExtensionRangeOptions&>(::google::protobuf::_ExtensionRangeOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::ExtensionRangeOptions&>(::google::protobuf::_ExtensionRangeOptions_globals_);
 }
 inline const ::google::protobuf::ExtensionRangeOptions& DescriptorProto_ExtensionRange::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.options)
@ -14846,7 +14812,7 @@ inline void DescriptorProto::clear_options() {
 inline const ::google::protobuf::MessageOptions& DescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::MessageOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::MessageOptions&>(::google::protobuf::_MessageOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::MessageOptions&>(::google::protobuf::_MessageOptions_globals_);
 }
 inline const ::google::protobuf::MessageOptions& DescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options)
@ -15451,7 +15417,7 @@ inline void ExtensionRangeOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& ExtensionRangeOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& ExtensionRangeOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.ExtensionRangeOptions.features)
@ -16053,7 +16019,7 @@ inline void FieldDescriptorProto::clear_options() {
 inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FieldOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions&>(::google::protobuf::_FieldOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions&>(::google::protobuf::_FieldOptions_globals_);
 }
 inline const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options)
@ -16254,7 +16220,7 @@ inline void OneofDescriptorProto::clear_options() {
 inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::OneofOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::OneofOptions&>(::google::protobuf::_OneofOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::OneofOptions&>(::google::protobuf::_OneofOptions_globals_);
 }
 inline const ::google::protobuf::OneofOptions& OneofDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.options)
@ -16544,7 +16510,7 @@ inline void EnumDescriptorProto::clear_options() {
 inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::EnumOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::EnumOptions&>(::google::protobuf::_EnumOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::EnumOptions&>(::google::protobuf::_EnumOptions_globals_);
 }
 inline const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options)
@ -16906,7 +16872,7 @@ inline void EnumValueDescriptorProto::clear_options() {
 inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::EnumValueOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::EnumValueOptions&>(::google::protobuf::_EnumValueOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::EnumValueOptions&>(::google::protobuf::_EnumValueOptions_globals_);
 }
 inline const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options)
@ -17134,7 +17100,7 @@ inline void ServiceDescriptorProto::clear_options() {
 inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::ServiceOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::ServiceOptions&>(::google::protobuf::_ServiceOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::ServiceOptions&>(::google::protobuf::_ServiceOptions_globals_);
 }
 inline const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options)
@ -17444,7 +17410,7 @@ inline void MethodDescriptorProto::clear_options() {
 inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::_internal_options() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::MethodOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::MethodOptions&>(::google::protobuf::_MethodOptions_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::MethodOptions&>(::google::protobuf::_MethodOptions_globals_);
 }
 inline const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options)
@ -18559,7 +18525,7 @@ inline void FileOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& FileOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& FileOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.features)
@ -18863,7 +18829,7 @@ inline void MessageOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& MessageOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& MessageOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.features)
@ -19748,7 +19714,7 @@ inline void FieldOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& FieldOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& FieldOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.features)
@ -19847,7 +19813,7 @@ inline void FieldOptions::clear_feature_support() {
 inline const ::google::protobuf::FieldOptions_FeatureSupport& FieldOptions::_internal_feature_support() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FieldOptions_FeatureSupport* p = _impl_.feature_support_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions_FeatureSupport&>(::google::protobuf::_FieldOptions_FeatureSupport_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions_FeatureSupport&>(::google::protobuf::_FieldOptions_FeatureSupport_globals_);
 }
 inline const ::google::protobuf::FieldOptions_FeatureSupport& FieldOptions::feature_support() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.feature_support)
@ -20006,7 +19972,7 @@ inline void OneofOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& OneofOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& OneofOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.OneofOptions.features)
@ -20252,7 +20218,7 @@ inline void EnumOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& EnumOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& EnumOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.features)
@ -20440,7 +20406,7 @@ inline void EnumValueOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& EnumValueOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& EnumValueOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.features)
@ -20568,7 +20534,7 @@ inline void EnumValueOptions::clear_feature_support() {
 inline const ::google::protobuf::FieldOptions_FeatureSupport& EnumValueOptions::_internal_feature_support() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FieldOptions_FeatureSupport* p = _impl_.feature_support_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions_FeatureSupport&>(::google::protobuf::_FieldOptions_FeatureSupport_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FieldOptions_FeatureSupport&>(::google::protobuf::_FieldOptions_FeatureSupport_globals_);
 }
 inline const ::google::protobuf::FieldOptions_FeatureSupport& EnumValueOptions::feature_support() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.feature_support)
@ -20727,7 +20693,7 @@ inline void ServiceOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& ServiceOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& ServiceOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.features)
@ -20976,7 +20942,7 @@ inline void MethodOptions::clear_features() {
 inline const ::google::protobuf::FeatureSet& MethodOptions::_internal_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& MethodOptions::features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.features)
@ -21887,7 +21853,7 @@ inline void FeatureSetDefaults_FeatureSetEditionDefault::clear_overridable_featu
 inline const ::google::protobuf::FeatureSet& FeatureSetDefaults_FeatureSetEditionDefault::_internal_overridable_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.overridable_features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& FeatureSetDefaults_FeatureSetEditionDefault::overridable_features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.overridable_features)
@ -21986,7 +21952,7 @@ inline void FeatureSetDefaults_FeatureSetEditionDefault::clear_fixed_features()
 inline const ::google::protobuf::FeatureSet& FeatureSetDefaults_FeatureSetEditionDefault::_internal_fixed_features() const {
  ::google::protobuf::internal::TSanRead(&_impl_);
  const ::google::protobuf::FeatureSet* p = _impl_.fixed_features_;
-  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_default_instance_);
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::FeatureSet&>(::google::protobuf::_FeatureSet_globals_);
 }
 inline const ::google::protobuf::FeatureSet& FeatureSetDefaults_FeatureSetEditionDefault::fixed_features() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
  // @@protoc_insertion_point(field_get:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.fixed_features)