Move `ClassData` and friends out of `MessageLite` and into the `internal` namespace.

This will simplify runtime code that wants to access and use the structures. This is a refactor with no expected behavior change. PiperOrigin-RevId: 679316372
2 months ago · 49bb305147
parent df5a4d63e8
commit 49bb305147
17 changed files with 1107 additions and 1147 deletions
--- a/src/google/protobuf/arena_unittest.cc
+++ b/src/google/protobuf/arena_unittest.cc
@ -205,7 +205,7 @@ void TestCtorAndDtorTraits(std::vector<absl::string_view> def,
      ABSL_LOG(FATAL);
      return nullptr;
    }
-    const ClassData* GetClassData() const PROTOBUF_FINAL {
+    const internal::ClassData* GetClassData() const PROTOBUF_FINAL {
      ABSL_LOG(FATAL);
      return nullptr;
    }
@ -528,7 +528,9 @@ class DispatcherTestProto : public Message {
      : Message(nullptr, nullptr) {
    ABSL_LOG(FATAL);
  }
-  const ClassData* GetClassData() const PROTOBUF_FINAL { ABSL_LOG(FATAL); }
+  const internal::ClassData* GetClassData() const PROTOBUF_FINAL {
    ABSL_LOG(FATAL);
  }
 };
 // We use a specialization to inject behavior for the test.
 // This test is very intrusive and will have to be fixed if we change the
--- a/src/google/protobuf/compiler/cpp/message.cc
+++ b/src/google/protobuf/compiler/cpp/message.cc
@ -1399,11 +1399,11 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) {
          $parse_decls$;
          $decl_annotate$;
-          const $superclass$::ClassData* GetClassData() const PROTOBUF_FINAL;
+          const $pbi$::ClassData* GetClassData() const PROTOBUF_FINAL;
          static void* PlacementNew_(const void*, void* mem,
                                     ::$proto_ns$::Arena* arena);
          static constexpr auto InternalNewImpl_();
-          static const $superclass$::ClassDataFull _class_data_;
+          static const $pbi$::ClassDataFull _class_data_;
        };
      )cc");
 }
@ -2182,11 +2182,11 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
            *this = ::std::move(from);
          }
          $arena_dtor$;
-          const $superclass$::ClassData* GetClassData() const PROTOBUF_FINAL;
+          const $pbi$::ClassData* GetClassData() const PROTOBUF_FINAL;
          static void* PlacementNew_(const void*, void* mem,
                                     ::$proto_ns$::Arena* arena);
          static constexpr auto InternalNewImpl_();
-          static const $superclass$::$classdata_type$ _class_data_;
+          static const $pbi$::$classdata_type$ _class_data_;
         public:
          $get_metadata$;
@ -4066,9 +4066,8 @@ void MessageGenerator::GenerateClassData(io::Printer* p) {
        R"cc(
          PROTOBUF_CONSTINIT
          PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-          const ::$proto_ns$::MessageLite::ClassDataFull
+          const $pbi$::ClassDataFull $classname$::_class_data_ = {
-              $classname$::_class_data_ = {
+              $pbi$::ClassData{
                  $superclass$::ClassData{
                  $default_instance$,
                  &_table_.header,
                  $on_demand_register_arena_dtor$,
@ -4087,7 +4086,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) {
              &$desc_table$,
              $tracker_on_get_metadata$,
          };
-          const ::$proto_ns$::MessageLite::ClassData* $classname$::GetClassData() const {
+          const $pbi$::ClassData* $classname$::GetClassData() const {
            $pin_weak_descriptor$;
            $pbi$::PrefetchToLocalCache(&_class_data_);
            $pbi$::PrefetchToLocalCache(_class_data_.tc_table);
@ -4108,8 +4107,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) {
        R"cc(
          PROTOBUF_CONSTINIT
          PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-          const ::$proto_ns$::MessageLite::ClassDataLite<$type_size$>
+          const $pbi$::ClassDataLite<$type_size$> $classname$::_class_data_ = {
              $classname$::_class_data_ = {
              {
                  $default_instance$,
                  &_table_.header,
@ -4127,7 +4125,7 @@ void MessageGenerator::GenerateClassData(io::Printer* p) {
              },
              "$full_name$",
          };
-          const ::$proto_ns$::MessageLite::ClassData* $classname$::GetClassData() const {
+          const $pbi$::ClassData* $classname$::GetClassData() const {
            return _class_data_.base();
          }
        )cc");
--- a/src/google/protobuf/compiler/java/java_features.pb.cc
+++ b/src/google/protobuf/compiler/java/java_features.pb.cc
@ -205,9 +205,8 @@ constexpr auto JavaFeatures::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull JavaFeatures::_class_data_ = {
-    JavaFeatures::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_JavaFeatures_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -226,7 +225,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* JavaFeatures::GetClassData() const {
+const ::google::protobuf::internal::ClassData* JavaFeatures::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@ -234,11 +234,11 @@ class PROTOC_EXPORT JavaFeatures final
      : JavaFeatures(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
--- a/src/google/protobuf/compiler/plugin.pb.cc
+++ b/src/google/protobuf/compiler/plugin.pb.cc
@ -403,9 +403,8 @@ constexpr auto Version::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull Version::_class_data_ = {
-    Version::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_Version_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -424,7 +423,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Version::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Version::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -766,9 +765,8 @@ constexpr auto CodeGeneratorRequest::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull CodeGeneratorRequest::_class_data_ = {
-    CodeGeneratorRequest::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_CodeGeneratorRequest_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -787,7 +785,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* CodeGeneratorRequest::GetClassData() const {
+const ::google::protobuf::internal::ClassData* CodeGeneratorRequest::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -1164,9 +1162,8 @@ constexpr auto CodeGeneratorResponse_File::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull CodeGeneratorResponse_File::_class_data_ = {
-    CodeGeneratorResponse_File::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_CodeGeneratorResponse_File_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -1185,7 +1182,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* CodeGeneratorResponse_File::GetClassData() const {
+const ::google::protobuf::internal::ClassData* CodeGeneratorResponse_File::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -1529,9 +1526,8 @@ constexpr auto CodeGeneratorResponse::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull CodeGeneratorResponse::_class_data_ = {
-    CodeGeneratorResponse::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_CodeGeneratorResponse_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -1550,7 +1546,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* CodeGeneratorResponse::GetClassData() const {
+const ::google::protobuf::internal::ClassData* CodeGeneratorResponse::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@ -251,11 +251,11 @@ class PROTOC_EXPORT Version final
      : Version(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -490,11 +490,11 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final
      : CodeGeneratorResponse_File(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -745,11 +745,11 @@ class PROTOC_EXPORT CodeGeneratorResponse final
      : CodeGeneratorResponse(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -1029,11 +1029,11 @@ class PROTOC_EXPORT CodeGeneratorRequest final
      : CodeGeneratorRequest(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
--- a/src/google/protobuf/cpp_features.pb.cc
+++ b/src/google/protobuf/cpp_features.pb.cc
@ -205,9 +205,8 @@ constexpr auto CppFeatures::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull CppFeatures::_class_data_ = {
-    CppFeatures::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_CppFeatures_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -226,7 +225,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fcpp_5ffeatures_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* CppFeatures::GetClassData() const {
+const ::google::protobuf::internal::ClassData* CppFeatures::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@ -235,11 +235,11 @@ class PROTOBUF_EXPORT CppFeatures final
      : CppFeatures(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@ -2679,9 +2679,8 @@ constexpr auto FileDescriptorSet::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FileDescriptorSet::_class_data_ = {
-    FileDescriptorSet::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FileDescriptorSet_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -2700,7 +2699,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FileDescriptorSet::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FileDescriptorSet::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -2994,9 +2993,8 @@ constexpr auto FileDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FileDescriptorProto::_class_data_ = {
-    FileDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FileDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -3015,7 +3013,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FileDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FileDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -3618,9 +3616,8 @@ constexpr auto DescriptorProto_ExtensionRange::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull DescriptorProto_ExtensionRange::_class_data_ = {
-    DescriptorProto_ExtensionRange::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_DescriptorProto_ExtensionRange_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -3639,7 +3636,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* DescriptorProto_ExtensionRange::GetClassData() const {
+const ::google::protobuf::internal::ClassData* DescriptorProto_ExtensionRange::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -3915,9 +3912,8 @@ constexpr auto DescriptorProto_ReservedRange::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull DescriptorProto_ReservedRange::_class_data_ = {
-    DescriptorProto_ReservedRange::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_DescriptorProto_ReservedRange_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -3936,7 +3932,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* DescriptorProto_ReservedRange::GetClassData() const {
+const ::google::protobuf::internal::ClassData* DescriptorProto_ReservedRange::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -4247,9 +4243,8 @@ constexpr auto DescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull DescriptorProto::_class_data_ = {
-    DescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_DescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -4268,7 +4263,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* DescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* DescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -4804,9 +4799,8 @@ constexpr auto ExtensionRangeOptions_Declaration::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull ExtensionRangeOptions_Declaration::_class_data_ = {
-    ExtensionRangeOptions_Declaration::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_ExtensionRangeOptions_Declaration_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -4825,7 +4819,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* ExtensionRangeOptions_Declaration::GetClassData() const {
+const ::google::protobuf::internal::ClassData* ExtensionRangeOptions_Declaration::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -5187,9 +5181,8 @@ constexpr auto ExtensionRangeOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull ExtensionRangeOptions::_class_data_ = {
-    ExtensionRangeOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_ExtensionRangeOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -5208,7 +5201,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* ExtensionRangeOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* ExtensionRangeOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -5585,9 +5578,8 @@ constexpr auto FieldDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FieldDescriptorProto::_class_data_ = {
-    FieldDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FieldDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -5606,7 +5598,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FieldDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FieldDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -6118,9 +6110,8 @@ constexpr auto OneofDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull OneofDescriptorProto::_class_data_ = {
-    OneofDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_OneofDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -6139,7 +6130,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* OneofDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* OneofDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -6395,9 +6386,8 @@ constexpr auto EnumDescriptorProto_EnumReservedRange::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull EnumDescriptorProto_EnumReservedRange::_class_data_ = {
-    EnumDescriptorProto_EnumReservedRange::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_EnumDescriptorProto_EnumReservedRange_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -6416,7 +6406,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* EnumDescriptorProto_EnumReservedRange::GetClassData() const {
+const ::google::protobuf::internal::ClassData* EnumDescriptorProto_EnumReservedRange::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -6697,9 +6687,8 @@ constexpr auto EnumDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull EnumDescriptorProto::_class_data_ = {
-    EnumDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_EnumDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -6718,7 +6707,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* EnumDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* EnumDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -7092,9 +7081,8 @@ constexpr auto EnumValueDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull EnumValueDescriptorProto::_class_data_ = {
-    EnumValueDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_EnumValueDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -7113,7 +7101,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* EnumValueDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* EnumValueDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -7431,9 +7419,8 @@ constexpr auto ServiceDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull ServiceDescriptorProto::_class_data_ = {
-    ServiceDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_ServiceDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -7452,7 +7439,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* ServiceDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* ServiceDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -7780,9 +7767,8 @@ constexpr auto MethodDescriptorProto::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull MethodDescriptorProto::_class_data_ = {
-    MethodDescriptorProto::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_MethodDescriptorProto_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -7801,7 +7787,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* MethodDescriptorProto::GetClassData() const {
+const ::google::protobuf::internal::ClassData* MethodDescriptorProto::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -8242,9 +8228,8 @@ constexpr auto FileOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FileOptions::_class_data_ = {
-    FileOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FileOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -8263,7 +8248,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FileOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FileOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -9070,9 +9055,8 @@ constexpr auto MessageOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull MessageOptions::_class_data_ = {
-    MessageOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_MessageOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -9091,7 +9075,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* MessageOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* MessageOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -9483,9 +9467,8 @@ constexpr auto FieldOptions_EditionDefault::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FieldOptions_EditionDefault::_class_data_ = {
-    FieldOptions_EditionDefault::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FieldOptions_EditionDefault_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -9504,7 +9487,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FieldOptions_EditionDefault::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FieldOptions_EditionDefault::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -9767,9 +9750,8 @@ constexpr auto FieldOptions_FeatureSupport::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FieldOptions_FeatureSupport::_class_data_ = {
-    FieldOptions_FeatureSupport::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FieldOptions_FeatureSupport_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -9788,7 +9770,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FieldOptions_FeatureSupport::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FieldOptions_FeatureSupport::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -10142,9 +10124,8 @@ constexpr auto FieldOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FieldOptions::_class_data_ = {
-    FieldOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FieldOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -10163,7 +10144,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FieldOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FieldOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -10757,9 +10738,8 @@ constexpr auto OneofOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull OneofOptions::_class_data_ = {
-    OneofOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_OneofOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -10778,7 +10758,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* OneofOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* OneofOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -11096,9 +11076,8 @@ constexpr auto EnumOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull EnumOptions::_class_data_ = {
-    EnumOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_EnumOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -11117,7 +11096,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* EnumOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* EnumOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -11508,9 +11487,8 @@ constexpr auto EnumValueOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull EnumValueOptions::_class_data_ = {
-    EnumValueOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_EnumValueOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -11529,7 +11507,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* EnumValueOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* EnumValueOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -11926,9 +11904,8 @@ constexpr auto ServiceOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull ServiceOptions::_class_data_ = {
-    ServiceOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_ServiceOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -11947,7 +11924,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* ServiceOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* ServiceOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -12293,9 +12270,8 @@ constexpr auto MethodOptions::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull MethodOptions::_class_data_ = {
-    MethodOptions::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_MethodOptions_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -12314,7 +12290,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* MethodOptions::GetClassData() const {
+const ::google::protobuf::internal::ClassData* MethodOptions::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -12659,9 +12635,8 @@ constexpr auto UninterpretedOption_NamePart::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull UninterpretedOption_NamePart::_class_data_ = {
-    UninterpretedOption_NamePart::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_UninterpretedOption_NamePart_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -12680,7 +12655,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* UninterpretedOption_NamePart::GetClassData() const {
+const ::google::protobuf::internal::ClassData* UninterpretedOption_NamePart::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -12970,9 +12945,8 @@ constexpr auto UninterpretedOption::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull UninterpretedOption::_class_data_ = {
-    UninterpretedOption::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_UninterpretedOption_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -12991,7 +12965,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* UninterpretedOption::GetClassData() const {
+const ::google::protobuf::internal::ClassData* UninterpretedOption::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -13406,9 +13380,8 @@ constexpr auto FeatureSet::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FeatureSet::_class_data_ = {
-    FeatureSet::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FeatureSet_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -13427,7 +13400,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FeatureSet::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FeatureSet::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -13796,9 +13769,8 @@ constexpr auto FeatureSetDefaults_FeatureSetEditionDefault::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FeatureSetDefaults_FeatureSetEditionDefault::_class_data_ = {
-    FeatureSetDefaults_FeatureSetEditionDefault::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FeatureSetDefaults_FeatureSetEditionDefault_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -13817,7 +13789,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FeatureSetDefaults_FeatureSetEditionDefault::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FeatureSetDefaults_FeatureSetEditionDefault::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -14144,9 +14116,8 @@ constexpr auto FeatureSetDefaults::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull FeatureSetDefaults::_class_data_ = {
-    FeatureSetDefaults::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_FeatureSetDefaults_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -14165,7 +14136,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FeatureSetDefaults::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FeatureSetDefaults::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -14483,9 +14454,8 @@ constexpr auto SourceCodeInfo_Location::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull SourceCodeInfo_Location::_class_data_ = {
-    SourceCodeInfo_Location::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_SourceCodeInfo_Location_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -14504,7 +14474,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* SourceCodeInfo_Location::GetClassData() const {
+const ::google::protobuf::internal::ClassData* SourceCodeInfo_Location::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -14848,9 +14818,8 @@ constexpr auto SourceCodeInfo::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull SourceCodeInfo::_class_data_ = {
-    SourceCodeInfo::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_SourceCodeInfo_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -14869,7 +14838,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* SourceCodeInfo::GetClassData() const {
+const ::google::protobuf::internal::ClassData* SourceCodeInfo::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -15113,9 +15082,8 @@ constexpr auto GeneratedCodeInfo_Annotation::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull GeneratedCodeInfo_Annotation::_class_data_ = {
-    GeneratedCodeInfo_Annotation::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_GeneratedCodeInfo_Annotation_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -15134,7 +15102,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* GeneratedCodeInfo_Annotation::GetClassData() const {
+const ::google::protobuf::internal::ClassData* GeneratedCodeInfo_Annotation::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
@ -15471,9 +15439,8 @@ constexpr auto GeneratedCodeInfo::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
+const ::google::protobuf::internal::ClassDataFull GeneratedCodeInfo::_class_data_ = {
-    GeneratedCodeInfo::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
        ::google::protobuf::Message::ClassData{
        &_GeneratedCodeInfo_default_instance_._instance,
        &_table_.header,
        nullptr,  // OnDemandRegisterArenaDtor
@ -15492,7 +15459,7 @@ const ::google::protobuf::MessageLite::ClassDataFull
    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* GeneratedCodeInfo::GetClassData() const {
+const ::google::protobuf::internal::ClassData* GeneratedCodeInfo::GetClassData() const {
  ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
  ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
  return _class_data_.base();
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@ -842,11 +842,11 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final
      : UninterpretedOption_NamePart(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -1055,11 +1055,11 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final
      : SourceCodeInfo_Location(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -1340,11 +1340,11 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final
      : GeneratedCodeInfo_Annotation(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -1620,11 +1620,11 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final
      : FieldOptions_FeatureSupport(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -1859,11 +1859,11 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final
      : FieldOptions_EditionDefault(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -2077,11 +2077,11 @@ class PROTOBUF_EXPORT FeatureSet final
      : FeatureSet(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -2637,11 +2637,11 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final
      : ExtensionRangeOptions_Declaration(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -2895,11 +2895,11 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final
      : EnumDescriptorProto_EnumReservedRange(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -3102,11 +3102,11 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final
      : DescriptorProto_ReservedRange(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -3314,11 +3314,11 @@ class PROTOBUF_EXPORT UninterpretedOption final
      : UninterpretedOption(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -3611,11 +3611,11 @@ class PROTOBUF_EXPORT SourceCodeInfo final
      : SourceCodeInfo(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -3811,11 +3811,11 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final
      : GeneratedCodeInfo(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -4016,11 +4016,11 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final
      : FeatureSetDefaults_FeatureSetEditionDefault(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -4249,11 +4249,11 @@ class PROTOBUF_EXPORT ServiceOptions final
      : ServiceOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -4664,11 +4664,11 @@ class PROTOBUF_EXPORT OneofOptions final
      : OneofOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -5066,11 +5066,11 @@ class PROTOBUF_EXPORT MethodOptions final
      : MethodOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -5514,11 +5514,11 @@ class PROTOBUF_EXPORT MessageOptions final
      : MessageOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -5981,11 +5981,11 @@ class PROTOBUF_EXPORT FileOptions final
      : FileOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -6710,11 +6710,11 @@ class PROTOBUF_EXPORT FieldOptions final
      : FieldOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -7375,11 +7375,11 @@ class PROTOBUF_EXPORT FeatureSetDefaults final
      : FeatureSetDefaults(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -7607,11 +7607,11 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final
      : ExtensionRangeOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -8061,11 +8061,11 @@ class PROTOBUF_EXPORT EnumValueOptions final
      : EnumValueOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -8506,11 +8506,11 @@ class PROTOBUF_EXPORT EnumOptions final
      : EnumOptions(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -8947,11 +8947,11 @@ class PROTOBUF_EXPORT OneofDescriptorProto final
      : OneofDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -9169,11 +9169,11 @@ class PROTOBUF_EXPORT MethodDescriptorProto final
      : MethodDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -9455,11 +9455,11 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
      : FieldDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -9873,11 +9873,11 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final
      : EnumValueDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -10108,11 +10108,11 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final
      : DescriptorProto_ExtensionRange(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -10337,11 +10337,11 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final
      : ServiceDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -10578,11 +10578,11 @@ class PROTOBUF_EXPORT EnumDescriptorProto final
      : EnumDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -10863,11 +10863,11 @@ class PROTOBUF_EXPORT DescriptorProto final
      : DescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -11244,11 +11244,11 @@ class PROTOBUF_EXPORT FileDescriptorProto final
      : FileDescriptorProto(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
@ -11674,11 +11674,11 @@ class PROTOBUF_EXPORT FileDescriptorSet final
      : FileDescriptorSet(arena) {
    *this = ::std::move(from);
  }
-  const ::google::protobuf::Message::ClassData* GetClassData() const PROTOBUF_FINAL;
+  const ::google::protobuf::internal::ClassData* GetClassData() const PROTOBUF_FINAL;
  static void* PlacementNew_(const void*, void* mem,
                             ::google::protobuf::Arena* arena);
  static constexpr auto InternalNewImpl_();
-  static const ::google::protobuf::Message::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 public:
  ::google::protobuf::Metadata GetMetadata() const;
--- a/src/google/protobuf/dynamic_message.cc
+++ b/src/google/protobuf/dynamic_message.cc
@ -204,7 +204,7 @@ class DynamicMessage final : public Message {
  // implements Message ----------------------------------------------
-  const ClassData* GetClassData() const PROTOBUF_FINAL;
+  const internal::ClassData* GetClassData() const PROTOBUF_FINAL;
 #if defined(__cpp_lib_destroying_delete) && defined(__cpp_sized_deallocation)
  static void operator delete(DynamicMessage* msg, std::destroying_delete_t);
@ -265,8 +265,8 @@ struct DynamicMessageFactory::TypeInfo {
  std::unique_ptr<uint32_t[]> has_bits_indices;
  int weak_field_map_offset;  // The offset for the weak_field_map;
-  DynamicMessage::ClassDataFull class_data = {
+  internal::ClassDataFull class_data = {
-      DynamicMessage::ClassData{
+      internal::ClassData{
          nullptr,  // default_instance
          nullptr,  // tc_table
          nullptr,  // on_demand_register_arena_dtor
@ -634,7 +634,7 @@ void DynamicMessage::CrossLinkPrototypes() {
  }
 }
-const MessageLite::ClassData* DynamicMessage::GetClassData() const {
+const internal::ClassData* DynamicMessage::GetClassData() const {
  return type_info_->class_data.base();
 }
--- a/src/google/protobuf/generated_message_tctable_decl.h
+++ b/src/google/protobuf/generated_message_tctable_decl.h
@ -287,7 +287,7 @@ struct alignas(uint64_t) TcParseTableBase {
  uint16_t num_aux_entries;
  uint32_t aux_offset;
-  const MessageLite::ClassData* class_data;
+  const ClassData* class_data;
  using PostLoopHandler = const char* (*)(MessageLite* msg, const char* ptr,
                                          ParseContext* ctx);
  PostLoopHandler post_loop_handler;
@ -312,7 +312,7 @@ struct alignas(uint64_t) TcParseTableBase {
                             uint32_t field_entries_offset,
                             uint16_t num_field_entries,
                             uint16_t num_aux_entries, uint32_t aux_offset,
-                             const MessageLite::ClassData* class_data,
+                             const ClassData* class_data,
                             PostLoopHandler post_loop_handler,
                             TailCallParseFunc fallback
 #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
@ -551,8 +551,7 @@ PROTOBUF_CC const char* StubParseImpl(PROTOBUF_TC_PARAM_DECL) {
 }
 template <typename T,
-          PROTOBUF_CC const char* (*func)(T*, const char*, ParseContext*),
+          PROTOBUF_CC const char* (*func)(T*, const char*, ParseContext*)>
          typename ClassData>
 constexpr TcParseTable<0> CreateStubTcParseTable(
    const ClassData* class_data,
    TcParseTableBase::PostLoopHandler post_loop_handler = nullptr) {
--- a/src/google/protobuf/implicit_weak_message.cc
+++ b/src/google/protobuf/implicit_weak_message.cc
@ -62,7 +62,7 @@ const TcParseTable<0> ImplicitWeakMessage::table_ =
    internal::CreateStubTcParseTable<ImplicitWeakMessage, ParseImpl>(
        class_data_.base());
-constexpr MessageLite::ClassDataLite<1> ImplicitWeakMessage::class_data_ = {
+constexpr ClassDataLite<1> ImplicitWeakMessage::class_data_ = {
    {
        &implicit_weak_message_default_instance.instance,
        &table_.header,
@ -81,7 +81,7 @@ constexpr MessageLite::ClassDataLite<1> ImplicitWeakMessage::class_data_ = {
    },
    ""};
-const MessageLite::ClassData* ImplicitWeakMessage::GetClassData() const {
+const ClassData* ImplicitWeakMessage::GetClassData() const {
  return class_data_.base();
 }
--- a/src/google/protobuf/message.cc
+++ b/src/google/protobuf/message.cc
@ -156,7 +156,7 @@ Metadata Message::GetMetadata() const {
  return GetMetadataImpl(GetClassData()->full());
 }
-Metadata Message::GetMetadataImpl(const ClassDataFull& data) {
+Metadata Message::GetMetadataImpl(const internal::ClassDataFull& data) {
  auto* table = data.descriptor_table;
  // Only codegen types provide a table. DynamicMessage does not provide a table
  // and instead eagerly initializes the descriptor/reflection members.
@ -206,7 +206,7 @@ size_t Message::SpaceUsedLong() const {
  return GetClassData()->full().descriptor_methods->space_used_long(*this);
 }
-absl::string_view Message::GetTypeNameImpl(const ClassData* data) {
+absl::string_view Message::GetTypeNameImpl(const internal::ClassData* data) {
  return GetMetadataImpl(data->full()).descriptor->full_name();
 }
@ -228,7 +228,7 @@ static std::string DebugStringImpl(const MessageLite& msg) {
  return DownCastMessage<Message>(msg).DebugString();
 }
-PROTOBUF_CONSTINIT const MessageLite::DescriptorMethods
+PROTOBUF_CONSTINIT const internal::DescriptorMethods
    Message::kDescriptorMethods = {
        GetTypeNameImpl,     InitializationErrorStringImpl,
        GetTcParseTableImpl, SpaceUsedLongImpl,
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@ -377,7 +377,7 @@ class PROTOBUF_EXPORT Message : public MessageLite {
  // Get a struct containing the metadata for the Message, which is used in turn
  // to implement GetDescriptor() and GetReflection() above.
  Metadata GetMetadata() const;
-  static Metadata GetMetadataImpl(const ClassDataFull& data);
+  static Metadata GetMetadataImpl(const internal::ClassDataFull& data);
  // For CODE_SIZE types
  static bool IsInitializedImpl(const MessageLite&);
@ -388,7 +388,7 @@ class PROTOBUF_EXPORT Message : public MessageLite {
      size_t total_size, const internal::CachedSize* cached_size) const;
  // Reflection based version for reflection based types.
-  static absl::string_view GetTypeNameImpl(const ClassData* data);
+  static absl::string_view GetTypeNameImpl(const internal::ClassData* data);
  static void MergeImpl(MessageLite& to, const MessageLite& from);
  void ClearImpl();
  static size_t ByteSizeLongImpl(const MessageLite& msg);
@ -401,7 +401,7 @@ class PROTOBUF_EXPORT Message : public MessageLite {
  static size_t SpaceUsedLongImpl(const MessageLite& msg_lite);
-  static const DescriptorMethods kDescriptorMethods;
+  static const internal::DescriptorMethods kDescriptorMethods;
 };
--- a/src/google/protobuf/message_lite.cc
+++ b/src/google/protobuf/message_lite.cc
@ -104,7 +104,7 @@ absl::string_view TypeId::name() const {
  }
  // For LITE messages, the type name is a char[] just beyond ClassData.
-  return reinterpret_cast<const char*>(data_) + sizeof(MessageLite::ClassData);
+  return reinterpret_cast<const char*>(data_) + sizeof(internal::ClassData);
 }
 void MessageLite::OnDemandRegisterArenaDtor(Arena* arena) {
--- a/src/google/protobuf/message_lite.h
+++ b/src/google/protobuf/message_lite.h
@ -289,6 +289,165 @@ PROTOBUF_EXPORT constexpr const std::string& GetEmptyStringAlreadyInited() {
 PROTOBUF_EXPORT size_t StringSpaceUsedExcludingSelfLong(const std::string& str);
 struct ClassDataFull;
 // Note: The order of arguments in the functions is chosen so that it has
 // the same ABI as the member function that calls them. Eg the `this`
 // pointer becomes the first argument in the free function.
 //
 // Future work:
 // We could save more data by omitting any optional pointer that would
 // otherwise be null. We can have some metadata in ClassData telling us if we
 // have them and their offset.
 struct PROTOBUF_EXPORT ClassData {
  const MessageLite* prototype;
  const internal::TcParseTableBase* tc_table;
  void (*on_demand_register_arena_dtor)(MessageLite& msg, Arena& arena);
  bool (*is_initialized)(const MessageLite&);
  void (*merge_to_from)(MessageLite& to, const MessageLite& from_msg);
  internal::MessageCreator message_creator;
 #if defined(PROTOBUF_CUSTOM_VTABLE)
  void (*destroy_message)(MessageLite& msg);
  void (MessageLite::*clear)();
  size_t (*byte_size_long)(const MessageLite&);
  uint8_t* (*serialize)(const MessageLite& msg, uint8_t* ptr,
                        io::EpsCopyOutputStream* stream);
 #endif  // PROTOBUF_CUSTOM_VTABLE
  // Offset of the CachedSize member.
  uint32_t cached_size_offset;
  // LITE objects (ie !descriptor_methods) collocate their name as a
  // char[] just beyond the ClassData.
  bool is_lite;
  bool is_dynamic = false;
  // In normal mode we have the small constructor to avoid the cost in
  // codegen.
 #if !defined(PROTOBUF_CUSTOM_VTABLE)
  constexpr ClassData(
      const MessageLite* prototype, const internal::TcParseTableBase* tc_table,
      void (*on_demand_register_arena_dtor)(MessageLite&, Arena&),
      bool (*is_initialized)(const MessageLite&),
      void (*merge_to_from)(MessageLite& to, const MessageLite& from_msg),
      internal::MessageCreator message_creator, uint32_t cached_size_offset,
      bool is_lite
      )
      : prototype(prototype),
        tc_table(tc_table),
        on_demand_register_arena_dtor(on_demand_register_arena_dtor),
        is_initialized(is_initialized),
        merge_to_from(merge_to_from),
        message_creator(message_creator),
        cached_size_offset(cached_size_offset),
        is_lite(is_lite)
  {
  }
 #endif  // !PROTOBUF_CUSTOM_VTABLE
  // But we always provide the full constructor even in normal mode to make
  // helper code simpler.
  constexpr ClassData(
      const MessageLite* prototype, const internal::TcParseTableBase* tc_table,
      void (*on_demand_register_arena_dtor)(MessageLite&, Arena&),
      bool (*is_initialized)(const MessageLite&),
      void (*merge_to_from)(MessageLite& to, const MessageLite& from_msg),
      internal::MessageCreator message_creator,
      void (*destroy_message)(MessageLite& msg),  //
      void (MessageLite::*clear)(),
      size_t (*byte_size_long)(const MessageLite&),
      uint8_t* (*serialize)(const MessageLite& msg, uint8_t* ptr,
                            io::EpsCopyOutputStream* stream),
      uint32_t cached_size_offset, bool is_lite
      )
      : prototype(prototype),
        tc_table(tc_table),
        on_demand_register_arena_dtor(on_demand_register_arena_dtor),
        is_initialized(is_initialized),
        merge_to_from(merge_to_from),
        message_creator(message_creator),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
        destroy_message(destroy_message),
        clear(clear),
        byte_size_long(byte_size_long),
        serialize(serialize),
 #endif  // PROTOBUF_CUSTOM_VTABLE
        cached_size_offset(cached_size_offset),
        is_lite(is_lite)
  {
  }
  const ClassDataFull& full() const;
  MessageLite* New(Arena* arena) const {
    return message_creator.New(prototype, prototype, arena);
  }
  MessageLite* PlacementNew(void* mem, Arena* arena) const {
    return message_creator.PlacementNew(prototype, prototype, mem, arena);
  }
  uint32_t allocation_size() const { return message_creator.allocation_size(); }
  uint8_t alignment() const { return message_creator.alignment(); }
 };
 template <size_t N>
 struct ClassDataLite {
  ClassData header;
  const char type_name[N];
  constexpr const ClassData* base() const { return &header; }
 };
 // We use a secondary vtable for descriptor based methods. This way ClassData
 // does not grow with the number of descriptor methods. This avoids extra
 // costs in MessageLite.
 struct PROTOBUF_EXPORT DescriptorMethods {
  absl::string_view (*get_type_name)(const ClassData* data);
  std::string (*initialization_error_string)(const MessageLite&);
  const internal::TcParseTableBase* (*get_tc_table)(const MessageLite&);
  size_t (*space_used_long)(const MessageLite&);
  std::string (*debug_string)(const MessageLite&);
 };
 struct PROTOBUF_EXPORT ClassDataFull : ClassData {
  constexpr ClassDataFull(ClassData base,
                          const DescriptorMethods* descriptor_methods,
                          const internal::DescriptorTable* descriptor_table,
                          void (*get_metadata_tracker)())
      : ClassData(base),
        descriptor_methods(descriptor_methods),
        descriptor_table(descriptor_table),
        reflection(),
        descriptor(),
        get_metadata_tracker(get_metadata_tracker) {}
  constexpr const ClassData* base() const { return this; }
  const DescriptorMethods* descriptor_methods;
  // Codegen types will provide a DescriptorTable to do lazy
  // registration/initialization of the reflection objects.
  // Other types, like DynamicMessage, keep the table as null but eagerly
  // populate `reflection`/`descriptor` fields.
  const internal::DescriptorTable* descriptor_table;
  // Accesses are protected by the once_flag in `descriptor_table`. When the
  // table is null these are populated from the beginning and need to
  // protection.
  mutable const Reflection* reflection;
  mutable const Descriptor* descriptor;
  // When an access tracker is installed, this function notifies the tracker
  // that GetMetadata was called.
  void (*get_metadata_tracker)();
 };
 inline const ClassDataFull& ClassData::full() const {
  ABSL_DCHECK(!is_lite);
  return *static_cast<const ClassDataFull*>(this);
 }
 }  // namespace internal
 // Interface to light weight protocol messages.
@ -682,175 +841,16 @@ class PROTOBUF_EXPORT MessageLite {
    return tc_table;
  }
  // We use a secondary vtable for descriptor based methods. This way ClassData
  // does not grow with the number of descriptor methods. This avoids extra
  // costs in MessageLite.
  struct ClassData;
  struct ClassDataFull;
  struct DescriptorMethods {
    absl::string_view (*get_type_name)(const ClassData* data);
    std::string (*initialization_error_string)(const MessageLite&);
    const internal::TcParseTableBase* (*get_tc_table)(const MessageLite&);
    size_t (*space_used_long)(const MessageLite&);
    std::string (*debug_string)(const MessageLite&);
  };
  // Note: The order of arguments in the functions is chosen so that it has
  // the same ABI as the member function that calls them. Eg the `this`
  // pointer becomes the first argument in the free function.
  //
  // Future work:
  // We could save more data by omitting any optional pointer that would
  // otherwise be null. We can have some metadata in ClassData telling us if we
  // have them and their offset.
  friend internal::MessageCreator;
  using DestroyMessageF = void (*)(MessageLite& msg);
  struct ClassData {
    const MessageLite* prototype;
    const internal::TcParseTableBase* tc_table;
    void (*on_demand_register_arena_dtor)(MessageLite& msg, Arena& arena);
    bool (*is_initialized)(const MessageLite&);
    void (*merge_to_from)(MessageLite& to, const MessageLite& from_msg);
    internal::MessageCreator message_creator;
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-    DestroyMessageF destroy_message;
+  explicit constexpr MessageLite(const internal::ClassData* data)
-    void (MessageLite::*clear)();
+      : _class_data_(data) {}
-    size_t (*byte_size_long)(const MessageLite&);
+  explicit MessageLite(Arena* arena, const internal::ClassData* data)
    uint8_t* (*serialize)(const MessageLite& msg, uint8_t* ptr,
                          io::EpsCopyOutputStream* stream);
 #endif  // PROTOBUF_CUSTOM_VTABLE
    // Offset of the CachedSize member.
    uint32_t cached_size_offset;
    // LITE objects (ie !descriptor_methods) collocate their name as a
    // char[] just beyond the ClassData.
    bool is_lite;
    bool is_dynamic = false;
    // In normal mode we have the small constructor to avoid the cost in
    // codegen.
 #if !defined(PROTOBUF_CUSTOM_VTABLE)
    constexpr ClassData(
        const MessageLite* prototype,
        const internal::TcParseTableBase* tc_table,
        void (*on_demand_register_arena_dtor)(MessageLite&, Arena&),
        bool (*is_initialized)(const MessageLite&),
        void (*merge_to_from)(MessageLite& to, const MessageLite& from_msg),
        internal::MessageCreator message_creator, uint32_t cached_size_offset,
        bool is_lite
        )
        : prototype(prototype),
          tc_table(tc_table),
          on_demand_register_arena_dtor(on_demand_register_arena_dtor),
          is_initialized(is_initialized),
          merge_to_from(merge_to_from),
          message_creator(message_creator),
          cached_size_offset(cached_size_offset),
          is_lite(is_lite)
    {
    }
 #endif  // !PROTOBUF_CUSTOM_VTABLE
    // But we always provide the full constructor even in normal mode to make
    // helper code simpler.
    constexpr ClassData(
        const MessageLite* prototype,
        const internal::TcParseTableBase* tc_table,
        void (*on_demand_register_arena_dtor)(MessageLite&, Arena&),
        bool (*is_initialized)(const MessageLite&),
        void (*merge_to_from)(MessageLite& to, const MessageLite& from_msg),
        internal::MessageCreator message_creator,  //
        DestroyMessageF destroy_message,           //
        void (MessageLite::*clear)(),
        size_t (*byte_size_long)(const MessageLite&),
        uint8_t* (*serialize)(const MessageLite& msg, uint8_t* ptr,
                              io::EpsCopyOutputStream* stream),
        uint32_t cached_size_offset, bool is_lite
        )
        : prototype(prototype),
          tc_table(tc_table),
          on_demand_register_arena_dtor(on_demand_register_arena_dtor),
          is_initialized(is_initialized),
          merge_to_from(merge_to_from),
          message_creator(message_creator),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
          destroy_message(destroy_message),
          clear(clear),
          byte_size_long(byte_size_long),
          serialize(serialize),
 #endif  // PROTOBUF_CUSTOM_VTABLE
          cached_size_offset(cached_size_offset),
          is_lite(is_lite)
    {
    }
    const ClassDataFull& full() const {
      ABSL_DCHECK(!is_lite);
      return *static_cast<const ClassDataFull*>(this);
    }
    MessageLite* New(Arena* arena) const {
      return message_creator.New(prototype, prototype, arena);
    }
    MessageLite* PlacementNew(void* mem, Arena* arena) const {
      return message_creator.PlacementNew(prototype, prototype, mem, arena);
    }
    uint32_t allocation_size() const {
      return message_creator.allocation_size();
    }
    uint8_t alignment() const { return message_creator.alignment(); }
  };
  template <size_t N>
  struct ClassDataLite {
    ClassData header;
    const char type_name[N];
    constexpr const ClassData* base() const { return &header; }
  };
  struct ClassDataFull : ClassData {
    constexpr ClassDataFull(ClassData base,
                            const DescriptorMethods* descriptor_methods,
                            const internal::DescriptorTable* descriptor_table,
                            void (*get_metadata_tracker)())
        : ClassData(base),
          descriptor_methods(descriptor_methods),
          descriptor_table(descriptor_table),
          reflection(),
          descriptor(),
          get_metadata_tracker(get_metadata_tracker) {}
    constexpr const ClassData* base() const { return this; }
    const DescriptorMethods* descriptor_methods;
    // Codegen types will provide a DescriptorTable to do lazy
    // registration/initialization of the reflection objects.
    // Other types, like DynamicMessage, keep the table as null but eagerly
    // populate `reflection`/`descriptor` fields.
    const internal::DescriptorTable* descriptor_table;
    // Accesses are protected by the once_flag in `descriptor_table`. When the
    // table is null these are populated from the beginning and need to
    // protection.
    mutable const Reflection* reflection;
    mutable const Descriptor* descriptor;
    // When an access tracker is installed, this function notifies the tracker
    // that GetMetadata was called.
    void (*get_metadata_tracker)();
  };
 #if defined(PROTOBUF_CUSTOM_VTABLE)
  explicit constexpr MessageLite(const ClassData* data) : _class_data_(data) {}
  explicit MessageLite(Arena* arena, const ClassData* data)
      : _internal_metadata_(arena), _class_data_(data) {}
 #else   // PROTOBUF_CUSTOM_VTABLE
  constexpr MessageLite() {}
  explicit MessageLite(Arena* arena) : _internal_metadata_(arena) {}
-  explicit constexpr MessageLite(const ClassData*) {}
+  explicit constexpr MessageLite(const internal::ClassData*) {}
-  explicit MessageLite(Arena* arena, const ClassData*)
+  explicit MessageLite(Arena* arena, const internal::ClassData*)
      : _internal_metadata_(arena) {}
 #endif  // PROTOBUF_CUSTOM_VTABLE
@ -862,12 +862,12 @@ class PROTOBUF_EXPORT MessageLite {
  // This is a work in progress. There are still some types (eg MapEntry) that
  // return a default table instead of a unique one.
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-  const ClassData* GetClassData() const {
+  const internal::ClassData* GetClassData() const {
    ::absl::PrefetchToLocalCache(_class_data_);
    return _class_data_;
  }
 #else   // PROTOBUF_CUSTOM_VTABLE
-  virtual const ClassData* GetClassData() const = 0;
+  virtual const internal::ClassData* GetClassData() const = 0;
 #endif  // PROTOBUF_CUSTOM_VTABLE
  template <typename T>
@ -882,7 +882,7 @@ class PROTOBUF_EXPORT MessageLite {
  internal::InternalMetadata _internal_metadata_;
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-  const ClassData* _class_data_;
+  const internal::ClassData* _class_data_;
 #endif  // PROTOBUF_CUSTOM_VTABLE
  // Return the cached size object as described by
@ -965,7 +965,7 @@ class PROTOBUF_EXPORT MessageLite {
  friend class internal::WeakFieldMap;
  friend class internal::WireFormatLite;
  friend class internal::RustMapHelper;
-  friend struct internal::TcParseTableBase;
+  friend internal::MessageCreator;
  template <typename Type>
  friend class Arena::InternalHelper;
@ -1067,9 +1067,9 @@ class TypeId {
  }
 private:
-  constexpr explicit TypeId(const MessageLite::ClassData* data) : data_(data) {}
+  constexpr explicit TypeId(const internal::ClassData* data) : data_(data) {}
-  const MessageLite::ClassData* data_;
+  const internal::ClassData* data_;
 };
 namespace internal {