From 5257fc60860de36334c84812fc0d3e269a783c0d Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Fri, 6 Sep 2024 10:04:37 -0700 Subject: [PATCH] Automated rollback of commit a1b33f41365e16c74a8095ecd9ab90b434e24e7b. PiperOrigin-RevId: 671805657 --- src/google/protobuf/extension_set.cc | 8 -------- src/google/protobuf/extension_set.h | 2 -- src/google/protobuf/wire_format.cc | 21 +-------------------- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc index 8f01460397..34a13fe503 100644 --- a/src/google/protobuf/extension_set.cc +++ b/src/google/protobuf/extension_set.cc @@ -513,14 +513,6 @@ const int& ExtensionSet::GetRefRepeatedEnum(int number, int index) const { return extension->ptr.repeated_enum_value->Get(index); } -size_t ExtensionSet::GetMessageByteSizeLong(int number) const { - const Extension* extension = FindOrNull(number); - ABSL_CHECK(extension != nullptr) << "not present"; - ABSL_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE); - return extension->is_lazy ? extension->ptr.lazymessage_value->ByteSizeLong() - : extension->ptr.message_value->ByteSizeLong(); -} - void ExtensionSet::SetRepeatedEnum(int number, int index, int value) { Extension* extension = FindOrNull(number); ABSL_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty)."; diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h index 704075c063..5a8d9abff3 100644 --- a/src/google/protobuf/extension_set.h +++ b/src/google/protobuf/extension_set.h @@ -576,8 +576,6 @@ class PROTOBUF_EXPORT ExtensionSet { const bool& GetRefRepeatedBool(int number, int index) const; const int& GetRefRepeatedEnum(int number, int index) const; - size_t GetMessageByteSizeLong(int number) const; - // Implementation of _InternalSerialize for non-empty map_. uint8_t* _InternalSerializeImpl(const MessageLite* extendee, int start_field_number, int end_field_number, diff --git a/src/google/protobuf/wire_format.cc b/src/google/protobuf/wire_format.cc index 11028a8364..4d7fb6707c 100644 --- a/src/google/protobuf/wire_format.cc +++ b/src/google/protobuf/wire_format.cc @@ -1705,26 +1705,7 @@ size_t WireFormat::FieldDataOnlyByteSize(const FieldDescriptor* field, HANDLE_FIXED_TYPE(BOOL, Bool) HANDLE_TYPE(GROUP, Group, Message) - - case FieldDescriptor::TYPE_MESSAGE: { - if (field->is_repeated()) { - for (size_t j = 0; j < count; ++j) { - data_size += WireFormatLite::MessageSize( - message_reflection->GetRepeatedMessage(message, field, j)); - } - break; - } - if (field->is_extension()) { - data_size += WireFormatLite::LengthDelimitedSize( - message_reflection->GetExtensionSet(message).GetMessageByteSizeLong( - field->number())); - break; - } - data_size += WireFormatLite::MessageSize( - message_reflection->GetMessage(message, field)); - break; - } - + HANDLE_TYPE(MESSAGE, Message, Message) #undef HANDLE_TYPE #undef HANDLE_FIXED_TYPE