Auto-generate files after cl/679316372

src/google/protobuf/any.pb.cc

@@ -197,28 +197,27 @@ constexpr auto Any::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Any::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Any_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Any::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Any>(),
+const ::google::protobuf::internal::ClassDataFull Any::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Any_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Any::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Any>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Any::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Any>(), &Any::ByteSizeLong,
-                &Any::_InternalSerialize,
+        &Any::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Any>(), &Any::ByteSizeLong,
+            &Any::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Any, _impl_._cached_size_),
-            false,
-        },
-        &Any::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fany_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Any, _impl_._cached_size_),
+        false,
+    },
+    &Any::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fany_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Any::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Any::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/any.pb.h

@@ -257,11 +257,11 @@ class PROTOBUF_EXPORT Any final
       : Any(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;

src/google/protobuf/api.pb.cc

@@ -366,28 +366,27 @@ constexpr auto Api::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Api::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Api_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Api::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Api>(),
+const ::google::protobuf::internal::ClassDataFull Api::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Api_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Api::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Api>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Api::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Api>(), &Api::ByteSizeLong,
-                &Api::_InternalSerialize,
+        &Api::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Api>(), &Api::ByteSizeLong,
+            &Api::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Api, _impl_._cached_size_),
-            false,
-        },
-        &Api::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fapi_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Api, _impl_._cached_size_),
+        false,
+    },
+    &Api::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fapi_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Api::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Api::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -822,28 +821,27 @@ constexpr auto Method::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Method::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Method_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Method::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Method>(),
+const ::google::protobuf::internal::ClassDataFull Method::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Method_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Method::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Method>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Method::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Method>(), &Method::ByteSizeLong,
-                &Method::_InternalSerialize,
+        &Method::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Method>(), &Method::ByteSizeLong,
+            &Method::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Method, _impl_._cached_size_),
-            false,
-        },
-        &Method::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fapi_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Method, _impl_._cached_size_),
+        false,
+    },
+    &Method::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fapi_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Method::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Method::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1209,28 +1207,27 @@ constexpr auto Mixin::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Mixin::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Mixin_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Mixin::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Mixin>(),
+const ::google::protobuf::internal::ClassDataFull Mixin::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Mixin_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Mixin::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Mixin>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Mixin::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Mixin>(), &Mixin::ByteSizeLong,
-                &Mixin::_InternalSerialize,
+        &Mixin::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Mixin>(), &Mixin::ByteSizeLong,
+            &Mixin::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Mixin, _impl_._cached_size_),
-            false,
-        },
-        &Mixin::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fapi_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Mixin, _impl_._cached_size_),
+        false,
+    },
+    &Mixin::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fapi_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Mixin::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Mixin::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/api.pb.h

@@ -209,11 +209,11 @@ class PROTOBUF_EXPORT Mixin final
       : Mixin(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;
@@ -425,11 +425,11 @@ class PROTOBUF_EXPORT Method final
       : Method(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;
@@ -714,11 +714,11 @@ class PROTOBUF_EXPORT Api final
       : Api(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;

src/google/protobuf/duration.pb.cc

@@ -163,28 +163,27 @@ constexpr auto Duration::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Duration::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Duration_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Duration::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Duration>(),
+const ::google::protobuf::internal::ClassDataFull Duration::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Duration_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Duration::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Duration>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Duration::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Duration>(), &Duration::ByteSizeLong,
-                &Duration::_InternalSerialize,
+        &Duration::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Duration>(), &Duration::ByteSizeLong,
+            &Duration::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Duration, _impl_._cached_size_),
-            false,
-        },
-        &Duration::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fduration_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Duration, _impl_._cached_size_),
+        false,
+    },
+    &Duration::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fduration_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Duration::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Duration::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/duration.pb.h

@@ -201,11 +201,11 @@ class PROTOBUF_EXPORT Duration final
       : Duration(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;

src/google/protobuf/empty.pb.cc

@@ -137,28 +137,27 @@ constexpr auto Empty::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Empty::_class_data_ = {
-        ::google::protobuf::internal::ZeroFieldsBase::ClassData{
-            &_Empty_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Empty::MergeImpl,
-            ::google::protobuf::internal::ZeroFieldsBase::GetNewImpl<Empty>(),
+const ::google::protobuf::internal::ClassDataFull Empty::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Empty_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Empty::MergeImpl,
+        ::google::protobuf::internal::ZeroFieldsBase::GetNewImpl<Empty>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Empty::SharedDtor,
-            ::google::protobuf::internal::ZeroFieldsBase::GetClearImpl<Empty>(), &Empty::ByteSizeLong,
-                &Empty::_InternalSerialize,
+        &Empty::SharedDtor,
+        ::google::protobuf::internal::ZeroFieldsBase::GetClearImpl<Empty>(), &Empty::ByteSizeLong,
+            &Empty::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Empty, _impl_._cached_size_),
-            false,
-        },
-        &Empty::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fempty_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Empty, _impl_._cached_size_),
+        false,
+    },
+    &Empty::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fempty_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Empty::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Empty::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/empty.pb.h

@@ -173,11 +173,11 @@ class PROTOBUF_EXPORT Empty final
       : Empty(arena) {
     *this = ::std::move(from);
   }
-  const ::google::protobuf::internal::ZeroFieldsBase::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::internal::ZeroFieldsBase::ClassDataFull _class_data_;
+  static const ::google::protobuf::internal::ClassDataFull _class_data_;
 
  public:
   ::google::protobuf::Metadata GetMetadata() const;

src/google/protobuf/field_mask.pb.cc

@@ -185,28 +185,27 @@ constexpr auto FieldMask::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    FieldMask::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_FieldMask_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &FieldMask::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<FieldMask>(),
+const ::google::protobuf::internal::ClassDataFull FieldMask::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_FieldMask_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &FieldMask::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<FieldMask>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &FieldMask::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<FieldMask>(), &FieldMask::ByteSizeLong,
-                &FieldMask::_InternalSerialize,
+        &FieldMask::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<FieldMask>(), &FieldMask::ByteSizeLong,
+            &FieldMask::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(FieldMask, _impl_._cached_size_),
-            false,
-        },
-        &FieldMask::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(FieldMask, _impl_._cached_size_),
+        false,
+    },
+    &FieldMask::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FieldMask::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FieldMask::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/field_mask.pb.h

@@ -201,11 +201,11 @@ class PROTOBUF_EXPORT FieldMask final
       : FieldMask(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;

src/google/protobuf/source_context.pb.cc

@@ -176,28 +176,27 @@ constexpr auto SourceContext::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    SourceContext::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_SourceContext_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &SourceContext::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<SourceContext>(),
+const ::google::protobuf::internal::ClassDataFull SourceContext::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_SourceContext_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &SourceContext::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<SourceContext>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &SourceContext::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<SourceContext>(), &SourceContext::ByteSizeLong,
-                &SourceContext::_InternalSerialize,
+        &SourceContext::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<SourceContext>(), &SourceContext::ByteSizeLong,
+            &SourceContext::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(SourceContext, _impl_._cached_size_),
-            false,
-        },
-        &SourceContext::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(SourceContext, _impl_._cached_size_),
+        false,
+    },
+    &SourceContext::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* SourceContext::GetClassData() const {
+const ::google::protobuf::internal::ClassData* SourceContext::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/source_context.pb.h

@@ -201,11 +201,11 @@ class PROTOBUF_EXPORT SourceContext final
       : SourceContext(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;

src/google/protobuf/struct.pb.cc

@@ -255,30 +255,29 @@ bool NullValue_IsValid(int value) {
               }
               PROTOBUF_CONSTINIT
               PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-              const ::google::protobuf::MessageLite::ClassDataFull
-                  Struct_FieldsEntry_DoNotUse::_class_data_ = {
-                      ::google::protobuf::Message::ClassData{
-                          &_Struct_FieldsEntry_DoNotUse_default_instance_._instance,
-                          &_table_.header,
-                          nullptr,  // OnDemandRegisterArenaDtor
-                          nullptr,  // IsInitialized
-                          &Struct_FieldsEntry_DoNotUse::MergeImpl,
-                          ::google::protobuf::Message::GetNewImpl<Struct_FieldsEntry_DoNotUse>(),
+              const ::google::protobuf::internal::ClassDataFull Struct_FieldsEntry_DoNotUse::_class_data_ = {
+                  ::google::protobuf::internal::ClassData{
+                      &_Struct_FieldsEntry_DoNotUse_default_instance_._instance,
+                      &_table_.header,
+                      nullptr,  // OnDemandRegisterArenaDtor
+                      nullptr,  // IsInitialized
+                      &Struct_FieldsEntry_DoNotUse::MergeImpl,
+                      ::google::protobuf::Message::GetNewImpl<Struct_FieldsEntry_DoNotUse>(),
               #if defined(PROTOBUF_CUSTOM_VTABLE)
-                          &Struct_FieldsEntry_DoNotUse::SharedDtor,
-                          static_cast<void (::google::protobuf::MessageLite::*)()>(
-                              &Struct_FieldsEntry_DoNotUse::ClearImpl),
-                              ::google::protobuf::Message::ByteSizeLongImpl, ::google::protobuf::Message::_InternalSerializeImpl
-                              ,
+                      &Struct_FieldsEntry_DoNotUse::SharedDtor,
+                      static_cast<void (::google::protobuf::MessageLite::*)()>(
+                          &Struct_FieldsEntry_DoNotUse::ClearImpl),
+                          ::google::protobuf::Message::ByteSizeLongImpl, ::google::protobuf::Message::_InternalSerializeImpl
+                          ,
               #endif  // PROTOBUF_CUSTOM_VTABLE
-                          PROTOBUF_FIELD_OFFSET(Struct_FieldsEntry_DoNotUse, _impl_._cached_size_),
-                          false,
-                      },
-                      &Struct_FieldsEntry_DoNotUse::kDescriptorMethods,
-                      &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
-                      nullptr,  // tracker
+                      PROTOBUF_FIELD_OFFSET(Struct_FieldsEntry_DoNotUse, _impl_._cached_size_),
+                      false,
+                  },
+                  &Struct_FieldsEntry_DoNotUse::kDescriptorMethods,
+                  &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
+                  nullptr,  // tracker
               };
-              const ::google::protobuf::MessageLite::ClassData* Struct_FieldsEntry_DoNotUse::GetClassData() const {
+              const ::google::protobuf::internal::ClassData* Struct_FieldsEntry_DoNotUse::GetClassData() const {
                 ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
                 ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
                 return _class_data_.base();
@@ -409,28 +408,27 @@ constexpr auto Struct::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Struct::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Struct_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Struct::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Struct>(),
+const ::google::protobuf::internal::ClassDataFull Struct::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Struct_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Struct::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Struct>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Struct::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Struct>(), &Struct::ByteSizeLong,
-                &Struct::_InternalSerialize,
+        &Struct::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Struct>(), &Struct::ByteSizeLong,
+            &Struct::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Struct, _impl_._cached_size_),
-            false,
-        },
-        &Struct::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Struct, _impl_._cached_size_),
+        false,
+    },
+    &Struct::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Struct::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Struct::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -762,28 +760,27 @@ constexpr auto Value::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Value::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Value_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Value::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Value>(),
+const ::google::protobuf::internal::ClassDataFull Value::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Value_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Value::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Value>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Value::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Value>(), &Value::ByteSizeLong,
-                &Value::_InternalSerialize,
+        &Value::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Value>(), &Value::ByteSizeLong,
+            &Value::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Value, _impl_._cached_size_),
-            false,
-        },
-        &Value::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Value, _impl_._cached_size_),
+        false,
+    },
+    &Value::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Value::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Value::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1133,28 +1130,27 @@ constexpr auto ListValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    ListValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_ListValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &ListValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<ListValue>(),
+const ::google::protobuf::internal::ClassDataFull ListValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_ListValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &ListValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<ListValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &ListValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<ListValue>(), &ListValue::ByteSizeLong,
-                &ListValue::_InternalSerialize,
+        &ListValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<ListValue>(), &ListValue::ByteSizeLong,
+            &ListValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(ListValue, _impl_._cached_size_),
-            false,
-        },
-        &ListValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(ListValue, _impl_._cached_size_),
+        false,
+    },
+    &ListValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fstruct_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* ListValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* ListValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/struct.pb.h

@@ -246,11 +246,11 @@ class PROTOBUF_EXPORT ListValue final
       : ListValue(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;
@@ -445,11 +445,11 @@ class PROTOBUF_EXPORT Struct final
       : Struct(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;
@@ -541,11 +541,11 @@ class Struct_FieldsEntry_DoNotUse final
       46, 2>
       _table_;
 
-  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_;
 };
 // -------------------------------------------------------------------
 
@@ -693,11 +693,11 @@ class PROTOBUF_EXPORT Value final
       : Value(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;

src/google/protobuf/timestamp.pb.cc

@@ -163,28 +163,27 @@ constexpr auto Timestamp::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Timestamp::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Timestamp_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Timestamp::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Timestamp>(),
+const ::google::protobuf::internal::ClassDataFull Timestamp::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Timestamp_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Timestamp::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Timestamp>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Timestamp::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Timestamp>(), &Timestamp::ByteSizeLong,
-                &Timestamp::_InternalSerialize,
+        &Timestamp::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Timestamp>(), &Timestamp::ByteSizeLong,
+            &Timestamp::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Timestamp, _impl_._cached_size_),
-            false,
-        },
-        &Timestamp::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Timestamp, _impl_._cached_size_),
+        false,
+    },
+    &Timestamp::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Timestamp::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Timestamp::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/timestamp.pb.h

@@ -201,11 +201,11 @@ class PROTOBUF_EXPORT Timestamp final
       : Timestamp(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;

src/google/protobuf/type.pb.cc

@@ -558,28 +558,27 @@ constexpr auto Type::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Type::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Type_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Type::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Type>(),
+const ::google::protobuf::internal::ClassDataFull Type::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Type_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Type::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Type>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Type::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Type>(), &Type::ByteSizeLong,
-                &Type::_InternalSerialize,
+        &Type::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Type>(), &Type::ByteSizeLong,
+            &Type::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Type, _impl_._cached_size_),
-            false,
-        },
-        &Type::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ftype_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Type, _impl_._cached_size_),
+        false,
+    },
+    &Type::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ftype_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Type::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Type::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1011,28 +1010,27 @@ constexpr auto Field::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Field::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Field_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Field::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Field>(),
+const ::google::protobuf::internal::ClassDataFull Field::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Field_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Field::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Field>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Field::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Field>(), &Field::ByteSizeLong,
-                &Field::_InternalSerialize,
+        &Field::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Field>(), &Field::ByteSizeLong,
+            &Field::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Field, _impl_._cached_size_),
-            false,
-        },
-        &Field::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ftype_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Field, _impl_._cached_size_),
+        false,
+    },
+    &Field::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ftype_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Field::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Field::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1513,28 +1511,27 @@ constexpr auto Enum::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Enum::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Enum_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Enum::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Enum>(),
+const ::google::protobuf::internal::ClassDataFull Enum::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Enum_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Enum::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Enum>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Enum::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Enum>(), &Enum::ByteSizeLong,
-                &Enum::_InternalSerialize,
+        &Enum::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Enum>(), &Enum::ByteSizeLong,
+            &Enum::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Enum, _impl_._cached_size_),
-            false,
-        },
-        &Enum::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ftype_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Enum, _impl_._cached_size_),
+        false,
+    },
+    &Enum::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ftype_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Enum::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Enum::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1920,28 +1917,27 @@ constexpr auto EnumValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    EnumValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_EnumValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &EnumValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<EnumValue>(),
+const ::google::protobuf::internal::ClassDataFull EnumValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_EnumValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &EnumValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<EnumValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &EnumValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<EnumValue>(), &EnumValue::ByteSizeLong,
-                &EnumValue::_InternalSerialize,
+        &EnumValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<EnumValue>(), &EnumValue::ByteSizeLong,
+            &EnumValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(EnumValue, _impl_._cached_size_),
-            false,
-        },
-        &EnumValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ftype_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(EnumValue, _impl_._cached_size_),
+        false,
+    },
+    &EnumValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ftype_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* EnumValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* EnumValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -2223,28 +2219,27 @@ constexpr auto Option::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Option::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Option_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Option::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Option>(),
+const ::google::protobuf::internal::ClassDataFull Option::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Option_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Option::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Option>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Option::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Option>(), &Option::ByteSizeLong,
-                &Option::_InternalSerialize,
+        &Option::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Option>(), &Option::ByteSizeLong,
+            &Option::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Option, _impl_._cached_size_),
-            false,
-        },
-        &Option::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2ftype_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Option, _impl_._cached_size_),
+        false,
+    },
+    &Option::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2ftype_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Option::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Option::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/type.pb.h

@@ -335,11 +335,11 @@ class PROTOBUF_EXPORT Option final
       : Option(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;
@@ -551,11 +551,11 @@ class PROTOBUF_EXPORT Field final
       : Field(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;
@@ -939,11 +939,11 @@ class PROTOBUF_EXPORT EnumValue final
       : EnumValue(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;
@@ -1168,11 +1168,11 @@ class PROTOBUF_EXPORT Type final
       : Type(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;
@@ -1476,11 +1476,11 @@ class PROTOBUF_EXPORT Enum final
       : Enum(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;

src/google/protobuf/wrappers.pb.cc

@@ -454,28 +454,27 @@ constexpr auto DoubleValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    DoubleValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_DoubleValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &DoubleValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<DoubleValue>(),
+const ::google::protobuf::internal::ClassDataFull DoubleValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_DoubleValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &DoubleValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<DoubleValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &DoubleValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<DoubleValue>(), &DoubleValue::ByteSizeLong,
-                &DoubleValue::_InternalSerialize,
+        &DoubleValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<DoubleValue>(), &DoubleValue::ByteSizeLong,
+            &DoubleValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(DoubleValue, _impl_._cached_size_),
-            false,
-        },
-        &DoubleValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(DoubleValue, _impl_._cached_size_),
+        false,
+    },
+    &DoubleValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* DoubleValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* DoubleValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -661,28 +660,27 @@ constexpr auto FloatValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    FloatValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_FloatValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &FloatValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<FloatValue>(),
+const ::google::protobuf::internal::ClassDataFull FloatValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_FloatValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &FloatValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<FloatValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &FloatValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<FloatValue>(), &FloatValue::ByteSizeLong,
-                &FloatValue::_InternalSerialize,
+        &FloatValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<FloatValue>(), &FloatValue::ByteSizeLong,
+            &FloatValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(FloatValue, _impl_._cached_size_),
-            false,
-        },
-        &FloatValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(FloatValue, _impl_._cached_size_),
+        false,
+    },
+    &FloatValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* FloatValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* FloatValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -868,28 +866,27 @@ constexpr auto Int64Value::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Int64Value::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Int64Value_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Int64Value::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Int64Value>(),
+const ::google::protobuf::internal::ClassDataFull Int64Value::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Int64Value_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Int64Value::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Int64Value>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Int64Value::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Int64Value>(), &Int64Value::ByteSizeLong,
-                &Int64Value::_InternalSerialize,
+        &Int64Value::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Int64Value>(), &Int64Value::ByteSizeLong,
+            &Int64Value::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Int64Value, _impl_._cached_size_),
-            false,
-        },
-        &Int64Value::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Int64Value, _impl_._cached_size_),
+        false,
+    },
+    &Int64Value::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Int64Value::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Int64Value::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1076,28 +1073,27 @@ constexpr auto UInt64Value::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    UInt64Value::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_UInt64Value_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &UInt64Value::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<UInt64Value>(),
+const ::google::protobuf::internal::ClassDataFull UInt64Value::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_UInt64Value_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &UInt64Value::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<UInt64Value>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &UInt64Value::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<UInt64Value>(), &UInt64Value::ByteSizeLong,
-                &UInt64Value::_InternalSerialize,
+        &UInt64Value::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<UInt64Value>(), &UInt64Value::ByteSizeLong,
+            &UInt64Value::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(UInt64Value, _impl_._cached_size_),
-            false,
-        },
-        &UInt64Value::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(UInt64Value, _impl_._cached_size_),
+        false,
+    },
+    &UInt64Value::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* UInt64Value::GetClassData() const {
+const ::google::protobuf::internal::ClassData* UInt64Value::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1284,28 +1280,27 @@ constexpr auto Int32Value::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    Int32Value::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_Int32Value_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &Int32Value::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<Int32Value>(),
+const ::google::protobuf::internal::ClassDataFull Int32Value::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_Int32Value_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &Int32Value::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<Int32Value>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &Int32Value::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<Int32Value>(), &Int32Value::ByteSizeLong,
-                &Int32Value::_InternalSerialize,
+        &Int32Value::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<Int32Value>(), &Int32Value::ByteSizeLong,
+            &Int32Value::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(Int32Value, _impl_._cached_size_),
-            false,
-        },
-        &Int32Value::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(Int32Value, _impl_._cached_size_),
+        false,
+    },
+    &Int32Value::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* Int32Value::GetClassData() const {
+const ::google::protobuf::internal::ClassData* Int32Value::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1492,28 +1487,27 @@ constexpr auto UInt32Value::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    UInt32Value::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_UInt32Value_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &UInt32Value::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<UInt32Value>(),
+const ::google::protobuf::internal::ClassDataFull UInt32Value::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_UInt32Value_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &UInt32Value::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<UInt32Value>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &UInt32Value::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<UInt32Value>(), &UInt32Value::ByteSizeLong,
-                &UInt32Value::_InternalSerialize,
+        &UInt32Value::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<UInt32Value>(), &UInt32Value::ByteSizeLong,
+            &UInt32Value::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(UInt32Value, _impl_._cached_size_),
-            false,
-        },
-        &UInt32Value::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(UInt32Value, _impl_._cached_size_),
+        false,
+    },
+    &UInt32Value::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* UInt32Value::GetClassData() const {
+const ::google::protobuf::internal::ClassData* UInt32Value::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1700,28 +1694,27 @@ constexpr auto BoolValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    BoolValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_BoolValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &BoolValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<BoolValue>(),
+const ::google::protobuf::internal::ClassDataFull BoolValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_BoolValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &BoolValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<BoolValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &BoolValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<BoolValue>(), &BoolValue::ByteSizeLong,
-                &BoolValue::_InternalSerialize,
+        &BoolValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<BoolValue>(), &BoolValue::ByteSizeLong,
+            &BoolValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(BoolValue, _impl_._cached_size_),
-            false,
-        },
-        &BoolValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(BoolValue, _impl_._cached_size_),
+        false,
+    },
+    &BoolValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* BoolValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* BoolValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -1925,28 +1918,27 @@ constexpr auto StringValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    StringValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_StringValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &StringValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<StringValue>(),
+const ::google::protobuf::internal::ClassDataFull StringValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_StringValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &StringValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<StringValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &StringValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<StringValue>(), &StringValue::ByteSizeLong,
-                &StringValue::_InternalSerialize,
+        &StringValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<StringValue>(), &StringValue::ByteSizeLong,
+            &StringValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(StringValue, _impl_._cached_size_),
-            false,
-        },
-        &StringValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(StringValue, _impl_._cached_size_),
+        false,
+    },
+    &StringValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* StringValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* StringValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();
@@ -2157,28 +2149,27 @@ constexpr auto BytesValue::InternalNewImpl_() {
 }
 PROTOBUF_CONSTINIT
 PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::google::protobuf::MessageLite::ClassDataFull
-    BytesValue::_class_data_ = {
-        ::google::protobuf::Message::ClassData{
-            &_BytesValue_default_instance_._instance,
-            &_table_.header,
-            nullptr,  // OnDemandRegisterArenaDtor
-            nullptr,  // IsInitialized
-            &BytesValue::MergeImpl,
-            ::google::protobuf::Message::GetNewImpl<BytesValue>(),
+const ::google::protobuf::internal::ClassDataFull BytesValue::_class_data_ = {
+    ::google::protobuf::internal::ClassData{
+        &_BytesValue_default_instance_._instance,
+        &_table_.header,
+        nullptr,  // OnDemandRegisterArenaDtor
+        nullptr,  // IsInitialized
+        &BytesValue::MergeImpl,
+        ::google::protobuf::Message::GetNewImpl<BytesValue>(),
 #if defined(PROTOBUF_CUSTOM_VTABLE)
-            &BytesValue::SharedDtor,
-            ::google::protobuf::Message::GetClearImpl<BytesValue>(), &BytesValue::ByteSizeLong,
-                &BytesValue::_InternalSerialize,
+        &BytesValue::SharedDtor,
+        ::google::protobuf::Message::GetClearImpl<BytesValue>(), &BytesValue::ByteSizeLong,
+            &BytesValue::_InternalSerialize,
 #endif  // PROTOBUF_CUSTOM_VTABLE
-            PROTOBUF_FIELD_OFFSET(BytesValue, _impl_._cached_size_),
-            false,
-        },
-        &BytesValue::kDescriptorMethods,
-        &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
-        nullptr,  // tracker
+        PROTOBUF_FIELD_OFFSET(BytesValue, _impl_._cached_size_),
+        false,
+    },
+    &BytesValue::kDescriptorMethods,
+    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto,
+    nullptr,  // tracker
 };
-const ::google::protobuf::MessageLite::ClassData* BytesValue::GetClassData() const {
+const ::google::protobuf::internal::ClassData* BytesValue::GetClassData() const {
   ::google::protobuf::internal::PrefetchToLocalCache(&_class_data_);
   ::google::protobuf::internal::PrefetchToLocalCache(_class_data_.tc_table);
   return _class_data_.base();

src/google/protobuf/wrappers.pb.h

@@ -225,11 +225,11 @@ class PROTOBUF_EXPORT UInt64Value final
       : UInt64Value(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;
@@ -417,11 +417,11 @@ class PROTOBUF_EXPORT UInt32Value final
       : UInt32Value(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;
@@ -609,11 +609,11 @@ class PROTOBUF_EXPORT StringValue final
       : StringValue(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;
@@ -807,11 +807,11 @@ class PROTOBUF_EXPORT Int64Value final
       : Int64Value(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;
@@ -999,11 +999,11 @@ class PROTOBUF_EXPORT Int32Value final
       : Int32Value(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;
@@ -1191,11 +1191,11 @@ class PROTOBUF_EXPORT FloatValue final
       : FloatValue(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;
@@ -1383,11 +1383,11 @@ class PROTOBUF_EXPORT DoubleValue final
       : DoubleValue(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;
@@ -1575,11 +1575,11 @@ class PROTOBUF_EXPORT BytesValue final
       : BytesValue(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;
@@ -1773,11 +1773,11 @@ class PROTOBUF_EXPORT BoolValue final
       : BoolValue(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;