From 4dffa939d269cdf76a8a29307bd0073d36b51057 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 12 Jun 2024 12:05:37 -0700 Subject: [PATCH] When not in custom vtable mode, strip the initializer code via preprocessor. The noop code was causing big .proto files to time out even though it had no effect in the compilation after optimizing. We tried avoiding the extra complexity of preprocessor checks on each use, but it seems necessary for now. PiperOrigin-RevId: 642691974 --- src/google/protobuf/arena_unittest.cc | 22 +- src/google/protobuf/compiler/cpp/message.cc | 31 +- .../compiler/java/java_features.pb.cc | 13 +- src/google/protobuf/compiler/plugin.pb.cc | 68 ++- src/google/protobuf/cpp_features.pb.cc | 13 +- src/google/protobuf/descriptor.pb.cc | 553 ++++++++++++++++-- src/google/protobuf/map_entry.h | 3 + src/google/protobuf/map_test.inc | 3 +- src/google/protobuf/message.h | 3 + src/google/protobuf/message_lite.h | 22 + 10 files changed, 680 insertions(+), 51 deletions(-) diff --git a/src/google/protobuf/arena_unittest.cc b/src/google/protobuf/arena_unittest.cc index 1ce78e24f2..75e1f83d53 100644 --- a/src/google/protobuf/arena_unittest.cc +++ b/src/google/protobuf/arena_unittest.cc @@ -182,20 +182,21 @@ void TestCtorAndDtorTraits(std::vector def, : std::conditional_t>, std::conditional_t>, Message { - TraitsProber() : Message(nullptr) { actions.push_back("()"); } - TraitsProber(const TraitsProber&) : Message(nullptr) { + TraitsProber() : Message(nullptr, nullptr) { actions.push_back("()"); } + TraitsProber(const TraitsProber&) : Message(nullptr, nullptr) { actions.push_back("(const T&)"); } - explicit TraitsProber(int) : Message(nullptr) { + explicit TraitsProber(int) : Message(nullptr, nullptr) { actions.push_back("(int)"); } - explicit TraitsProber(Arena* arena) : Message(nullptr) { + explicit TraitsProber(Arena* arena) : Message(nullptr, nullptr) { actions.push_back("(Arena)"); } - TraitsProber(Arena* arena, const TraitsProber&) : Message(nullptr) { + TraitsProber(Arena* arena, const TraitsProber&) + : Message(nullptr, nullptr) { actions.push_back("(Arena, const T&)"); } - TraitsProber(Arena* arena, int) : Message(nullptr) { + TraitsProber(Arena* arena, int) : Message(nullptr, nullptr) { actions.push_back("(Arena, int)"); } ~TraitsProber() { actions.push_back("~()"); } @@ -519,9 +520,12 @@ class DispatcherTestProto : public Message { using InternalArenaConstructable_ = void; using DestructorSkippable_ = void; // For the test below to construct. - explicit DispatcherTestProto(absl::in_place_t) : Message(nullptr) {} - explicit DispatcherTestProto(Arena*) : Message(nullptr) { ABSL_LOG(FATAL); } - DispatcherTestProto(Arena*, const DispatcherTestProto&) : Message(nullptr) { + explicit DispatcherTestProto(absl::in_place_t) : Message(nullptr, nullptr) {} + explicit DispatcherTestProto(Arena*) : Message(nullptr, nullptr) { + ABSL_LOG(FATAL); + } + DispatcherTestProto(Arena*, const DispatcherTestProto&) + : Message(nullptr, nullptr) { ABSL_LOG(FATAL); } DispatcherTestProto* New(Arena*) const PROTOBUF_FINAL { ABSL_LOG(FATAL); } diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index c020343e4f..61ace77f73 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -2143,9 +2143,14 @@ void MessageGenerator::GenerateClassMethods(io::Printer* p) { }}, {"class_data", [&] { GenerateClassData(p); }}}, R"cc( +#if defined(PROTOBUF_CUSTOM_VTABLE) $classname$::$classname$() : SuperType(_class_data_.base()) {} $classname$::$classname$(::$proto_ns$::Arena* arena) : SuperType(arena, _class_data_.base()) {} +#else // PROTOBUF_CUSTOM_VTABLE + $classname$::$classname$() : SuperType() {} + $classname$::$classname$(::$proto_ns$::Arena* arena) : SuperType(arena) {} +#endif // PROTOBUF_CUSTOM_VTABLE $annotate_accessors$; $verify$; $class_data$; @@ -2859,7 +2864,12 @@ void MessageGenerator::GenerateConstexprConstructor(io::Printer* p) { //~ gcc 12 (warning in gcc 13). template $constexpr$ $classname$::$classname$(::_pbi::ConstantInitialized) - : $base$(_class_data_.base()) {} +#if defined(PROTOBUF_CUSTOM_VTABLE) + : $base$(_class_data_.base()){} +#else // PROTOBUF_CUSTOM_VTABLE + : $base$() { + } +#endif // PROTOBUF_CUSTOM_VTABLE )cc"); return; } @@ -2881,8 +2891,13 @@ void MessageGenerator::GenerateConstexprConstructor(io::Printer* p) { R"cc( template $constexpr$ $classname$::$classname$(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : $superclass$(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : $superclass$(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { + } )cc"); } @@ -3145,7 +3160,11 @@ void MessageGenerator::GenerateArenaEnabledCopyConstructor(io::Printer* p) { ::$proto_ns$::Arena* arena, //~ force alignment const $classname$& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : $superclass$(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : $superclass$(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE $classname$* const _this = this; (void)_this; _internal_metadata_.MergeFrom<$unknown_fields_type$>( @@ -3191,7 +3210,11 @@ void MessageGenerator::GenerateStructors(io::Printer* p) { }, R"cc( $classname$::$classname$(::$proto_ns$::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : $superclass$(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : $superclass$(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE $ctor_body$; // @@protoc_insertion_point(arena_constructor:$full_name$) } @@ -3733,9 +3756,11 @@ void MessageGenerator::GenerateClassData(io::Printer* p) { $on_demand_register_arena_dtor$, $is_initialized$, &$classname$::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) $superclass$::GetDeleteImpl<$classname$>(), $superclass$::GetNewImpl<$classname$>(), $custom_vtable_methods$, +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET($classname$, $cached_size$), false, }, @@ -3768,9 +3793,11 @@ void MessageGenerator::GenerateClassData(io::Printer* p) { $on_demand_register_arena_dtor$, $is_initialized$, &$classname$::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) $superclass$::GetDeleteImpl<$classname$>(), $superclass$::GetNewImpl<$classname$>(), $custom_vtable_methods$, +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET($classname$, $cached_size$), true, }, diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 298a822114..161040aa01 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -33,8 +33,13 @@ inline constexpr JavaFeatures::Impl_::Impl_( template PROTOBUF_CONSTEXPR JavaFeatures::JavaFeatures(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct JavaFeaturesDefaultTypeInternal { PROTOBUF_CONSTEXPR JavaFeaturesDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} ~JavaFeaturesDefaultTypeInternal() {} @@ -151,7 +156,11 @@ class JavaFeatures::_Internal { }; JavaFeatures::JavaFeatures(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:pb.JavaFeatures) } @@ -193,11 +202,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &JavaFeatures::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(JavaFeatures, _impl_._cached_size_), false, }, diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index e556ce0b4e..75b130f9b4 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -39,8 +39,13 @@ inline constexpr Version::Impl_::Impl_( template PROTOBUF_CONSTEXPR Version::Version(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct VersionDefaultTypeInternal { PROTOBUF_CONSTEXPR VersionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} ~VersionDefaultTypeInternal() {} @@ -68,8 +73,13 @@ inline constexpr CodeGeneratorResponse_File::Impl_::Impl_( template PROTOBUF_CONSTEXPR CodeGeneratorResponse_File::CodeGeneratorResponse_File(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct CodeGeneratorResponse_FileDefaultTypeInternal { PROTOBUF_CONSTEXPR CodeGeneratorResponse_FileDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} ~CodeGeneratorResponse_FileDefaultTypeInternal() {} @@ -94,8 +104,13 @@ inline constexpr CodeGeneratorResponse::Impl_::Impl_( template PROTOBUF_CONSTEXPR CodeGeneratorResponse::CodeGeneratorResponse(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct CodeGeneratorResponseDefaultTypeInternal { PROTOBUF_CONSTEXPR CodeGeneratorResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} ~CodeGeneratorResponseDefaultTypeInternal() {} @@ -120,8 +135,13 @@ inline constexpr CodeGeneratorRequest::Impl_::Impl_( template PROTOBUF_CONSTEXPR CodeGeneratorRequest::CodeGeneratorRequest(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct CodeGeneratorRequestDefaultTypeInternal { PROTOBUF_CONSTEXPR CodeGeneratorRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} ~CodeGeneratorRequestDefaultTypeInternal() {} @@ -307,7 +327,11 @@ class Version::_Internal { }; Version::Version(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.Version) } @@ -321,7 +345,11 @@ inline PROTOBUF_NDEBUG_INLINE Version::Impl_::Impl_( Version::Version( ::google::protobuf::Arena* arena, const Version& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE Version* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -372,11 +400,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &Version::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(Version, _impl_._cached_size_), false, }, @@ -618,7 +648,11 @@ void CodeGeneratorRequest::clear_source_file_descriptors() { _impl_.source_file_descriptors_.Clear(); } CodeGeneratorRequest::CodeGeneratorRequest(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorRequest) } @@ -635,7 +669,11 @@ inline PROTOBUF_NDEBUG_INLINE CodeGeneratorRequest::Impl_::Impl_( CodeGeneratorRequest::CodeGeneratorRequest( ::google::protobuf::Arena* arena, const CodeGeneratorRequest& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE CodeGeneratorRequest* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -682,11 +720,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor CodeGeneratorRequest::IsInitializedImpl, &CodeGeneratorRequest::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CodeGeneratorRequest, _impl_._cached_size_), false, }, @@ -981,7 +1021,11 @@ void CodeGeneratorResponse_File::clear_generated_code_info() { _impl_._has_bits_[0] &= ~0x00000008u; } CodeGeneratorResponse_File::CodeGeneratorResponse_File(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorResponse.File) } @@ -997,7 +1041,11 @@ inline PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse_File::Impl_::Impl_( CodeGeneratorResponse_File::CodeGeneratorResponse_File( ::google::protobuf::Arena* arena, const CodeGeneratorResponse_File& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE CodeGeneratorResponse_File* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -1045,11 +1093,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &CodeGeneratorResponse_File::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CodeGeneratorResponse_File, _impl_._cached_size_), false, }, @@ -1297,7 +1347,11 @@ class CodeGeneratorResponse::_Internal { }; CodeGeneratorResponse::CodeGeneratorResponse(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorResponse) } @@ -1312,7 +1366,11 @@ inline PROTOBUF_NDEBUG_INLINE CodeGeneratorResponse::Impl_::Impl_( CodeGeneratorResponse::CodeGeneratorResponse( ::google::protobuf::Arena* arena, const CodeGeneratorResponse& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE CodeGeneratorResponse* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -1364,11 +1422,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &CodeGeneratorResponse::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CodeGeneratorResponse, _impl_._cached_size_), false, }, diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index 99053d9470..c52787e52e 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -33,8 +33,13 @@ inline constexpr CppFeatures::Impl_::Impl_( template PROTOBUF_CONSTEXPR CppFeatures::CppFeatures(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct CppFeaturesDefaultTypeInternal { PROTOBUF_CONSTEXPR CppFeaturesDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} ~CppFeaturesDefaultTypeInternal() {} @@ -146,7 +151,11 @@ class CppFeatures::_Internal { }; CppFeatures::CppFeatures(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:pb.CppFeatures) } @@ -188,11 +197,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &CppFeatures::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(CppFeatures, _impl_._cached_size_), false, }, diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 85a10a53d7..820450d970 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -36,8 +36,13 @@ inline constexpr UninterpretedOption_NamePart::Impl_::Impl_( template PROTOBUF_CONSTEXPR UninterpretedOption_NamePart::UninterpretedOption_NamePart(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct UninterpretedOption_NamePartDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr UninterpretedOption_NamePartDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -71,8 +76,13 @@ inline constexpr SourceCodeInfo_Location::Impl_::Impl_( template PROTOBUF_CONSTEXPR SourceCodeInfo_Location::SourceCodeInfo_Location(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct SourceCodeInfo_LocationDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr SourceCodeInfo_LocationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -103,8 +113,13 @@ inline constexpr GeneratedCodeInfo_Annotation::Impl_::Impl_( template PROTOBUF_CONSTEXPR GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct GeneratedCodeInfo_AnnotationDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr GeneratedCodeInfo_AnnotationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -133,8 +148,13 @@ inline constexpr FieldOptions_FeatureSupport::Impl_::Impl_( template PROTOBUF_CONSTEXPR FieldOptions_FeatureSupport::FieldOptions_FeatureSupport(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FieldOptions_FeatureSupportDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FieldOptions_FeatureSupportDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -161,8 +181,13 @@ inline constexpr FieldOptions_EditionDefault::Impl_::Impl_( template PROTOBUF_CONSTEXPR FieldOptions_EditionDefault::FieldOptions_EditionDefault(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FieldOptions_EditionDefaultDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FieldOptions_EditionDefaultDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -191,8 +216,13 @@ inline constexpr FeatureSet::Impl_::Impl_( template PROTOBUF_CONSTEXPR FeatureSet::FeatureSet(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FeatureSetDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FeatureSetDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -224,8 +254,13 @@ inline constexpr ExtensionRangeOptions_Declaration::Impl_::Impl_( template PROTOBUF_CONSTEXPR ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct ExtensionRangeOptions_DeclarationDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr ExtensionRangeOptions_DeclarationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -250,8 +285,13 @@ inline constexpr EnumDescriptorProto_EnumReservedRange::Impl_::Impl_( template PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -276,8 +316,13 @@ inline constexpr DescriptorProto_ReservedRange::Impl_::Impl_( template PROTOBUF_CONSTEXPR DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct DescriptorProto_ReservedRangeDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr DescriptorProto_ReservedRangeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -313,8 +358,13 @@ inline constexpr UninterpretedOption::Impl_::Impl_( template PROTOBUF_CONSTEXPR UninterpretedOption::UninterpretedOption(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct UninterpretedOptionDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr UninterpretedOptionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -338,8 +388,13 @@ inline constexpr SourceCodeInfo::Impl_::Impl_( template PROTOBUF_CONSTEXPR SourceCodeInfo::SourceCodeInfo(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct SourceCodeInfoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr SourceCodeInfoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -363,8 +418,13 @@ inline constexpr GeneratedCodeInfo::Impl_::Impl_( template PROTOBUF_CONSTEXPR GeneratedCodeInfo::GeneratedCodeInfo(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct GeneratedCodeInfoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr GeneratedCodeInfoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -390,8 +450,13 @@ inline constexpr FeatureSetDefaults_FeatureSetEditionDefault::Impl_::Impl_( template PROTOBUF_CONSTEXPR FeatureSetDefaults_FeatureSetEditionDefault::FeatureSetDefaults_FeatureSetEditionDefault(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FeatureSetDefaults_FeatureSetEditionDefaultDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FeatureSetDefaults_FeatureSetEditionDefaultDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -417,8 +482,13 @@ inline constexpr ServiceOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR ServiceOptions::ServiceOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct ServiceOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr ServiceOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -443,8 +513,13 @@ inline constexpr OneofOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR OneofOptions::OneofOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct OneofOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr OneofOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -471,8 +546,13 @@ inline constexpr MethodOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR MethodOptions::MethodOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct MethodOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr MethodOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -502,8 +582,13 @@ inline constexpr MessageOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR MessageOptions::MessageOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct MessageOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr MessageOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -567,8 +652,13 @@ inline constexpr FileOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR FileOptions::FileOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FileOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FileOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -605,8 +695,13 @@ inline constexpr FieldOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR FieldOptions::FieldOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FieldOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FieldOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -632,8 +727,13 @@ inline constexpr FeatureSetDefaults::Impl_::Impl_( template PROTOBUF_CONSTEXPR FeatureSetDefaults::FeatureSetDefaults(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FeatureSetDefaultsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FeatureSetDefaultsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -660,8 +760,13 @@ inline constexpr ExtensionRangeOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR ExtensionRangeOptions::ExtensionRangeOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct ExtensionRangeOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr ExtensionRangeOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -689,8 +794,13 @@ inline constexpr EnumValueOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR EnumValueOptions::EnumValueOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct EnumValueOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr EnumValueOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -718,8 +828,13 @@ inline constexpr EnumOptions::Impl_::Impl_( template PROTOBUF_CONSTEXPR EnumOptions::EnumOptions(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct EnumOptionsDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr EnumOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -746,8 +861,13 @@ inline constexpr OneofDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR OneofDescriptorProto::OneofDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct OneofDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr OneofDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -782,8 +902,13 @@ inline constexpr MethodDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR MethodDescriptorProto::MethodDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct MethodDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr MethodDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -827,8 +952,13 @@ inline constexpr FieldDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR FieldDescriptorProto::FieldDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FieldDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FieldDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -856,8 +986,13 @@ inline constexpr EnumValueDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR EnumValueDescriptorProto::EnumValueDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct EnumValueDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr EnumValueDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -883,8 +1018,13 @@ inline constexpr DescriptorProto_ExtensionRange::Impl_::Impl_( template PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct DescriptorProto_ExtensionRangeDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr DescriptorProto_ExtensionRangeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -912,8 +1052,13 @@ inline constexpr ServiceDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR ServiceDescriptorProto::ServiceDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct ServiceDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr ServiceDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -943,8 +1088,13 @@ inline constexpr EnumDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR EnumDescriptorProto::EnumDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct EnumDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr EnumDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -979,8 +1129,13 @@ inline constexpr DescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR DescriptorProto::DescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct DescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr DescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -1022,8 +1177,13 @@ inline constexpr FileDescriptorProto::Impl_::Impl_( template PROTOBUF_CONSTEXPR FileDescriptorProto::FileDescriptorProto(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FileDescriptorProtoDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FileDescriptorProtoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -1047,8 +1207,13 @@ inline constexpr FileDescriptorSet::Impl_::Impl_( template PROTOBUF_CONSTEXPR FileDescriptorSet::FileDescriptorSet(::_pbi::ConstantInitialized) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(_class_data_.base()), - _impl_(::_pbi::ConstantInitialized()) {} +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(), +#endif // PROTOBUF_CUSTOM_VTABLE + _impl_(::_pbi::ConstantInitialized()) { +} struct FileDescriptorSetDefaultTypeInternal { #if defined(PROTOBUF_CONSTINIT_DEFAULT_INSTANCES) constexpr FileDescriptorSetDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {} @@ -2441,7 +2606,11 @@ class FileDescriptorSet::_Internal { }; FileDescriptorSet::FileDescriptorSet(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FileDescriptorSet) } @@ -2454,7 +2623,11 @@ inline PROTOBUF_NDEBUG_INLINE FileDescriptorSet::Impl_::Impl_( FileDescriptorSet::FileDescriptorSet( ::google::protobuf::Arena* arena, const FileDescriptorSet& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FileDescriptorSet* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -2491,11 +2664,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FileDescriptorSet::IsInitializedImpl, &FileDescriptorSet::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FileDescriptorSet, _impl_._cached_size_), false, }, @@ -2649,7 +2824,11 @@ class FileDescriptorProto::_Internal { }; FileDescriptorProto::FileDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FileDescriptorProto) } @@ -2672,7 +2851,11 @@ inline PROTOBUF_NDEBUG_INLINE FileDescriptorProto::Impl_::Impl_( FileDescriptorProto::FileDescriptorProto( ::google::protobuf::Arena* arena, const FileDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FileDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -2737,11 +2920,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FileDescriptorProto::IsInitializedImpl, &FileDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FileDescriptorProto, _impl_._cached_size_), false, }, @@ -3262,7 +3447,11 @@ class DescriptorProto_ExtensionRange::_Internal { }; DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto.ExtensionRange) } @@ -3275,7 +3464,11 @@ inline PROTOBUF_NDEBUG_INLINE DescriptorProto_ExtensionRange::Impl_::Impl_( DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange( ::google::protobuf::Arena* arena, const DescriptorProto_ExtensionRange& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE DescriptorProto_ExtensionRange* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -3329,11 +3522,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor DescriptorProto_ExtensionRange::IsInitializedImpl, &DescriptorProto_ExtensionRange::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(DescriptorProto_ExtensionRange, _impl_._cached_size_), false, }, @@ -3554,7 +3749,11 @@ class DescriptorProto_ReservedRange::_Internal { }; DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto.ReservedRange) } @@ -3596,11 +3795,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &DescriptorProto_ReservedRange::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(DescriptorProto_ReservedRange, _impl_._cached_size_), false, }, @@ -3781,7 +3982,11 @@ class DescriptorProto::_Internal { }; DescriptorProto::DescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto) } @@ -3803,7 +4008,11 @@ inline PROTOBUF_NDEBUG_INLINE DescriptorProto::Impl_::Impl_( DescriptorProto::DescriptorProto( ::google::protobuf::Arena* arena, const DescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE DescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -3855,11 +4064,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor DescriptorProto::IsInitializedImpl, &DescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(DescriptorProto, _impl_._cached_size_), false, }, @@ -4309,7 +4520,11 @@ class ExtensionRangeOptions_Declaration::_Internal { }; ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.ExtensionRangeOptions.Declaration) } @@ -4324,7 +4539,11 @@ inline PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions_Declaration::Impl_::Impl_( ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration( ::google::protobuf::Arena* arena, const ExtensionRangeOptions_Declaration& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE ExtensionRangeOptions_Declaration* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -4377,11 +4596,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &ExtensionRangeOptions_Declaration::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions_Declaration, _impl_._cached_size_), false, }, @@ -4644,7 +4865,11 @@ class ExtensionRangeOptions::_Internal { }; ExtensionRangeOptions::ExtensionRangeOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.ExtensionRangeOptions) } @@ -4660,7 +4885,11 @@ inline PROTOBUF_NDEBUG_INLINE ExtensionRangeOptions::Impl_::Impl_( ExtensionRangeOptions::ExtensionRangeOptions( ::google::protobuf::Arena* arena, const ExtensionRangeOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE ExtensionRangeOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -4708,11 +4937,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor ExtensionRangeOptions::IsInitializedImpl, &ExtensionRangeOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_._cached_size_), false, }, @@ -4988,7 +5219,11 @@ class FieldDescriptorProto::_Internal { }; FieldDescriptorProto::FieldDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldDescriptorProto) } @@ -5006,7 +5241,11 @@ inline PROTOBUF_NDEBUG_INLINE FieldDescriptorProto::Impl_::Impl_( FieldDescriptorProto::FieldDescriptorProto( ::google::protobuf::Arena* arena, const FieldDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FieldDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -5072,11 +5311,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FieldDescriptorProto::IsInitializedImpl, &FieldDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_._cached_size_), false, }, @@ -5513,7 +5754,11 @@ class OneofDescriptorProto::_Internal { }; OneofDescriptorProto::OneofDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.OneofDescriptorProto) } @@ -5527,7 +5772,11 @@ inline PROTOBUF_NDEBUG_INLINE OneofDescriptorProto::Impl_::Impl_( OneofDescriptorProto::OneofDescriptorProto( ::google::protobuf::Arena* arena, const OneofDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE OneofDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -5571,11 +5820,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor OneofDescriptorProto::IsInitializedImpl, &OneofDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(OneofDescriptorProto, _impl_._cached_size_), false, }, @@ -5776,7 +6027,11 @@ class EnumDescriptorProto_EnumReservedRange::_Internal { }; EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumDescriptorProto.EnumReservedRange) } @@ -5818,11 +6073,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &EnumDescriptorProto_EnumReservedRange::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumDescriptorProto_EnumReservedRange, _impl_._cached_size_), false, }, @@ -6003,7 +6260,11 @@ class EnumDescriptorProto::_Internal { }; EnumDescriptorProto::EnumDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumDescriptorProto) } @@ -6020,7 +6281,11 @@ inline PROTOBUF_NDEBUG_INLINE EnumDescriptorProto::Impl_::Impl_( EnumDescriptorProto::EnumDescriptorProto( ::google::protobuf::Arena* arena, const EnumDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE EnumDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -6067,11 +6332,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor EnumDescriptorProto::IsInitializedImpl, &EnumDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumDescriptorProto, _impl_._cached_size_), false, }, @@ -6363,7 +6630,11 @@ class EnumValueDescriptorProto::_Internal { }; EnumValueDescriptorProto::EnumValueDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValueDescriptorProto) } @@ -6377,7 +6648,11 @@ inline PROTOBUF_NDEBUG_INLINE EnumValueDescriptorProto::Impl_::Impl_( EnumValueDescriptorProto::EnumValueDescriptorProto( ::google::protobuf::Arena* arena, const EnumValueDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE EnumValueDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -6427,11 +6702,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor EnumValueDescriptorProto::IsInitializedImpl, &EnumValueDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumValueDescriptorProto, _impl_._cached_size_), false, }, @@ -6660,7 +6937,11 @@ class ServiceDescriptorProto::_Internal { }; ServiceDescriptorProto::ServiceDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.ServiceDescriptorProto) } @@ -6675,7 +6956,11 @@ inline PROTOBUF_NDEBUG_INLINE ServiceDescriptorProto::Impl_::Impl_( ServiceDescriptorProto::ServiceDescriptorProto( ::google::protobuf::Arena* arena, const ServiceDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE ServiceDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -6720,11 +7005,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor ServiceDescriptorProto::IsInitializedImpl, &ServiceDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ServiceDescriptorProto, _impl_._cached_size_), false, }, @@ -6959,7 +7246,11 @@ class MethodDescriptorProto::_Internal { }; MethodDescriptorProto::MethodDescriptorProto(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.MethodDescriptorProto) } @@ -6975,7 +7266,11 @@ inline PROTOBUF_NDEBUG_INLINE MethodDescriptorProto::Impl_::Impl_( MethodDescriptorProto::MethodDescriptorProto( ::google::protobuf::Arena* arena, const MethodDescriptorProto& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE MethodDescriptorProto* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -7035,11 +7330,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor MethodDescriptorProto::IsInitializedImpl, &MethodDescriptorProto::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(MethodDescriptorProto, _impl_._cached_size_), false, }, @@ -7344,7 +7641,11 @@ class FileOptions::_Internal { }; FileOptions::FileOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FileOptions) } @@ -7369,7 +7670,11 @@ inline PROTOBUF_NDEBUG_INLINE FileOptions::Impl_::Impl_( FileOptions::FileOptions( ::google::protobuf::Arena* arena, const FileOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FileOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -7448,11 +7753,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FileOptions::IsInitializedImpl, &FileOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FileOptions, _impl_._cached_size_), false, }, @@ -8155,7 +8462,11 @@ class MessageOptions::_Internal { }; MessageOptions::MessageOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.MessageOptions) } @@ -8170,7 +8481,11 @@ inline PROTOBUF_NDEBUG_INLINE MessageOptions::Impl_::Impl_( MessageOptions::MessageOptions( ::google::protobuf::Arena* arena, const MessageOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE MessageOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -8227,11 +8542,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor MessageOptions::IsInitializedImpl, &MessageOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(MessageOptions, _impl_._cached_size_), false, }, @@ -8552,7 +8869,11 @@ class FieldOptions_EditionDefault::_Internal { }; FieldOptions_EditionDefault::FieldOptions_EditionDefault(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions.EditionDefault) } @@ -8566,7 +8887,11 @@ inline PROTOBUF_NDEBUG_INLINE FieldOptions_EditionDefault::Impl_::Impl_( FieldOptions_EditionDefault::FieldOptions_EditionDefault( ::google::protobuf::Arena* arena, const FieldOptions_EditionDefault& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FieldOptions_EditionDefault* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -8606,11 +8931,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &FieldOptions_EditionDefault::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldOptions_EditionDefault, _impl_._cached_size_), false, }, @@ -8792,7 +9119,11 @@ class FieldOptions_FeatureSupport::_Internal { }; FieldOptions_FeatureSupport::FieldOptions_FeatureSupport(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions.FeatureSupport) } @@ -8806,7 +9137,11 @@ inline PROTOBUF_NDEBUG_INLINE FieldOptions_FeatureSupport::Impl_::Impl_( FieldOptions_FeatureSupport::FieldOptions_FeatureSupport( ::google::protobuf::Arena* arena, const FieldOptions_FeatureSupport& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FieldOptions_FeatureSupport* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -8857,11 +9192,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &FieldOptions_FeatureSupport::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldOptions_FeatureSupport, _impl_._cached_size_), false, }, @@ -9096,7 +9433,11 @@ class FieldOptions::_Internal { }; FieldOptions::FieldOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions) } @@ -9113,7 +9454,11 @@ inline PROTOBUF_NDEBUG_INLINE FieldOptions::Impl_::Impl_( FieldOptions::FieldOptions( ::google::protobuf::Arena* arena, const FieldOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FieldOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -9176,11 +9521,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FieldOptions::IsInitializedImpl, &FieldOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_._cached_size_), false, }, @@ -9685,7 +10032,11 @@ class OneofOptions::_Internal { }; OneofOptions::OneofOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.OneofOptions) } @@ -9700,7 +10051,11 @@ inline PROTOBUF_NDEBUG_INLINE OneofOptions::Impl_::Impl_( OneofOptions::OneofOptions( ::google::protobuf::Arena* arena, const OneofOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE OneofOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -9745,11 +10100,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor OneofOptions::IsInitializedImpl, &OneofOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(OneofOptions, _impl_._cached_size_), false, }, @@ -9963,7 +10320,11 @@ class EnumOptions::_Internal { }; EnumOptions::EnumOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumOptions) } @@ -9978,7 +10339,11 @@ inline PROTOBUF_NDEBUG_INLINE EnumOptions::Impl_::Impl_( EnumOptions::EnumOptions( ::google::protobuf::Arena* arena, const EnumOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE EnumOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -10035,11 +10400,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor EnumOptions::IsInitializedImpl, &EnumOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumOptions, _impl_._cached_size_), false, }, @@ -10322,7 +10689,11 @@ class EnumValueOptions::_Internal { }; EnumValueOptions::EnumValueOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValueOptions) } @@ -10337,7 +10708,11 @@ inline PROTOBUF_NDEBUG_INLINE EnumValueOptions::Impl_::Impl_( EnumValueOptions::EnumValueOptions( ::google::protobuf::Arena* arena, const EnumValueOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE EnumValueOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -10398,11 +10773,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor EnumValueOptions::IsInitializedImpl, &EnumValueOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(EnumValueOptions, _impl_._cached_size_), false, }, @@ -10700,7 +11077,11 @@ class ServiceOptions::_Internal { }; ServiceOptions::ServiceOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.ServiceOptions) } @@ -10715,7 +11096,11 @@ inline PROTOBUF_NDEBUG_INLINE ServiceOptions::Impl_::Impl_( ServiceOptions::ServiceOptions( ::google::protobuf::Arena* arena, const ServiceOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE ServiceOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -10766,11 +11151,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor ServiceOptions::IsInitializedImpl, &ServiceOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(ServiceOptions, _impl_._cached_size_), false, }, @@ -11012,7 +11399,11 @@ class MethodOptions::_Internal { }; MethodOptions::MethodOptions(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.MethodOptions) } @@ -11027,7 +11418,11 @@ inline PROTOBUF_NDEBUG_INLINE MethodOptions::Impl_::Impl_( MethodOptions::MethodOptions( ::google::protobuf::Arena* arena, const MethodOptions& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE MethodOptions* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -11084,11 +11479,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor MethodOptions::IsInitializedImpl, &MethodOptions::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_._cached_size_), false, }, @@ -11362,7 +11759,11 @@ class UninterpretedOption_NamePart::_Internal { }; UninterpretedOption_NamePart::UninterpretedOption_NamePart(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.UninterpretedOption.NamePart) } @@ -11376,7 +11777,11 @@ inline PROTOBUF_NDEBUG_INLINE UninterpretedOption_NamePart::Impl_::Impl_( UninterpretedOption_NamePart::UninterpretedOption_NamePart( ::google::protobuf::Arena* arena, const UninterpretedOption_NamePart& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE UninterpretedOption_NamePart* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -11416,11 +11821,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor UninterpretedOption_NamePart::IsInitializedImpl, &UninterpretedOption_NamePart::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(UninterpretedOption_NamePart, _impl_._cached_size_), false, }, @@ -11609,7 +12016,11 @@ class UninterpretedOption::_Internal { }; UninterpretedOption::UninterpretedOption(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.UninterpretedOption) } @@ -11626,7 +12037,11 @@ inline PROTOBUF_NDEBUG_INLINE UninterpretedOption::Impl_::Impl_( UninterpretedOption::UninterpretedOption( ::google::protobuf::Arena* arena, const UninterpretedOption& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE UninterpretedOption* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -11682,11 +12097,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor UninterpretedOption::IsInitializedImpl, &UninterpretedOption::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(UninterpretedOption, _impl_._cached_size_), false, }, @@ -12009,7 +12426,11 @@ class FeatureSet::_Internal { }; FeatureSet::FeatureSet(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FeatureSet) } @@ -12023,7 +12444,11 @@ inline PROTOBUF_NDEBUG_INLINE FeatureSet::Impl_::Impl_( FeatureSet::FeatureSet( ::google::protobuf::Arena* arena, const FeatureSet& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FeatureSet* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -12074,11 +12499,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FeatureSet::IsInitializedImpl, &FeatureSet::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FeatureSet, _impl_._cached_size_), false, }, @@ -12366,7 +12793,11 @@ class FeatureSetDefaults_FeatureSetEditionDefault::_Internal { }; FeatureSetDefaults_FeatureSetEditionDefault::FeatureSetDefaults_FeatureSetEditionDefault(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault) } @@ -12379,7 +12810,11 @@ inline PROTOBUF_NDEBUG_INLINE FeatureSetDefaults_FeatureSetEditionDefault::Impl_ FeatureSetDefaults_FeatureSetEditionDefault::FeatureSetDefaults_FeatureSetEditionDefault( ::google::protobuf::Arena* arena, const FeatureSetDefaults_FeatureSetEditionDefault& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FeatureSetDefaults_FeatureSetEditionDefault* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -12431,11 +12866,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FeatureSetDefaults_FeatureSetEditionDefault::IsInitializedImpl, &FeatureSetDefaults_FeatureSetEditionDefault::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FeatureSetDefaults_FeatureSetEditionDefault, _impl_._cached_size_), false, }, @@ -12668,7 +13105,11 @@ class FeatureSetDefaults::_Internal { }; FeatureSetDefaults::FeatureSetDefaults(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.FeatureSetDefaults) } @@ -12682,7 +13123,11 @@ inline PROTOBUF_NDEBUG_INLINE FeatureSetDefaults::Impl_::Impl_( FeatureSetDefaults::FeatureSetDefaults( ::google::protobuf::Arena* arena, const FeatureSetDefaults& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE FeatureSetDefaults* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -12732,11 +13177,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor FeatureSetDefaults::IsInitializedImpl, &FeatureSetDefaults::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(FeatureSetDefaults, _impl_._cached_size_), false, }, @@ -12953,7 +13400,11 @@ class SourceCodeInfo_Location::_Internal { }; SourceCodeInfo_Location::SourceCodeInfo_Location(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.SourceCodeInfo.Location) } @@ -12973,7 +13424,11 @@ inline PROTOBUF_NDEBUG_INLINE SourceCodeInfo_Location::Impl_::Impl_( SourceCodeInfo_Location::SourceCodeInfo_Location( ::google::protobuf::Arena* arena, const SourceCodeInfo_Location& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SourceCodeInfo_Location* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -13018,11 +13473,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &SourceCodeInfo_Location::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(SourceCodeInfo_Location, _impl_._cached_size_), false, }, @@ -13299,7 +13756,11 @@ class SourceCodeInfo::_Internal { }; SourceCodeInfo::SourceCodeInfo(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.SourceCodeInfo) } @@ -13312,7 +13773,11 @@ inline PROTOBUF_NDEBUG_INLINE SourceCodeInfo::Impl_::Impl_( SourceCodeInfo::SourceCodeInfo( ::google::protobuf::Arena* arena, const SourceCodeInfo& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SourceCodeInfo* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -13349,11 +13814,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &SourceCodeInfo::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(SourceCodeInfo, _impl_._cached_size_), false, }, @@ -13500,7 +13967,11 @@ class GeneratedCodeInfo_Annotation::_Internal { }; GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.GeneratedCodeInfo.Annotation) } @@ -13516,7 +13987,11 @@ inline PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo_Annotation::Impl_::Impl_( GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation( ::google::protobuf::Arena* arena, const GeneratedCodeInfo_Annotation& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE GeneratedCodeInfo_Annotation* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -13569,11 +14044,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &GeneratedCodeInfo_Annotation::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _impl_._cached_size_), false, }, @@ -13838,7 +14315,11 @@ class GeneratedCodeInfo::_Internal { }; GeneratedCodeInfo::GeneratedCodeInfo(::google::protobuf::Arena* arena) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE SharedCtor(arena); // @@protoc_insertion_point(arena_constructor:google.protobuf.GeneratedCodeInfo) } @@ -13851,7 +14332,11 @@ inline PROTOBUF_NDEBUG_INLINE GeneratedCodeInfo::Impl_::Impl_( GeneratedCodeInfo::GeneratedCodeInfo( ::google::protobuf::Arena* arena, const GeneratedCodeInfo& from) +#if defined(PROTOBUF_CUSTOM_VTABLE) : ::google::protobuf::Message(arena, _class_data_.base()) { +#else // PROTOBUF_CUSTOM_VTABLE + : ::google::protobuf::Message(arena) { +#endif // PROTOBUF_CUSTOM_VTABLE GeneratedCodeInfo* const _this = this; (void)_this; _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>( @@ -13888,11 +14373,13 @@ const ::google::protobuf::MessageLite::ClassDataFull nullptr, // OnDemandRegisterArenaDtor nullptr, // IsInitialized &GeneratedCodeInfo::MergeImpl, +#if defined(PROTOBUF_CUSTOM_VTABLE) ::google::protobuf::Message::GetDeleteImpl(), ::google::protobuf::Message::GetNewImpl(), ::google::protobuf::Message::GetClearImpl(), ::google::protobuf::Message::GetByteSizeLongImpl(), ::google::protobuf::Message::GetSerializeImpl(), +#endif // PROTOBUF_CUSTOM_VTABLE PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo, _impl_._cached_size_), false, }, diff --git a/src/google/protobuf/map_entry.h b/src/google/protobuf/map_entry.h index 2424f30af1..16145c9b04 100644 --- a/src/google/protobuf/map_entry.h +++ b/src/google/protobuf/map_entry.h @@ -85,6 +85,9 @@ class MapEntry : public Message { using ValueOnMemory = typename ValueTypeHandler::TypeOnMemory; public: +#if !defined(PROTOBUF_CUSTOM_VTABLE) + constexpr MapEntry() {} +#endif // PROTOBUF_CUSTOM_VTABLE using Message::Message; MapEntry(const MapEntry&) = delete; diff --git a/src/google/protobuf/map_test.inc b/src/google/protobuf/map_test.inc index 280d9c151a..691851b7f2 100644 --- a/src/google/protobuf/map_test.inc +++ b/src/google/protobuf/map_test.inc @@ -2324,7 +2324,8 @@ class MyMapEntry internal::WireFormatLite::TYPE_INT32, internal::WireFormatLite::TYPE_INT32> { public: - constexpr MyMapEntry() : MyMapEntry::MapEntry(nullptr) {} + constexpr MyMapEntry() + : MyMapEntry::MapEntry(static_cast(nullptr)) {} MyMapEntry(Arena* arena) : MyMapEntry::MapEntry(arena, nullptr) {} const ClassData* GetClassData() const { ABSL_CHECK(false); } static bool ValidateKey(void*) { return true; } diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h index a41650fdd0..c0b3d5289f 100644 --- a/src/google/protobuf/message.h +++ b/src/google/protobuf/message.h @@ -370,6 +370,9 @@ class PROTOBUF_EXPORT Message : public MessageLite { const Reflection* GetReflection() const { return GetMetadata().reflection; } protected: +#if !defined(PROTOBUF_CUSTOM_VTABLE) + constexpr Message() {} +#endif // PROTOBUF_CUSTOM_VTABLE using MessageLite::MessageLite; // Get a struct containing the metadata for the Message, which is used in turn diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index c60f0ee6c5..fb8b73b14a 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -650,6 +650,26 @@ class PROTOBUF_EXPORT MessageLite { // char[] just beyond the ClassData. bool is_lite; + // In normal mode we have the small constructor to avoid the cost in + // codegen. +#if !defined(PROTOBUF_CUSTOM_VTABLE) + constexpr ClassData(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), + uint32_t cached_size_offset, bool is_lite) + : tc_table(tc_table), + on_demand_register_arena_dtor(on_demand_register_arena_dtor), + is_initialized(is_initialized), + merge_to_from(merge_to_from), + 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 internal::TcParseTableBase* tc_table, void (*on_demand_register_arena_dtor)(MessageLite&, Arena&), @@ -726,6 +746,8 @@ class PROTOBUF_EXPORT MessageLite { 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 MessageLite(Arena* arena, const ClassData*) : _internal_metadata_(arena) {}