From f483a68e84d953178ad80377c2dc95f391a6d9ea Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 13 Dec 2022 12:48:27 -0800 Subject: [PATCH] Remove inlined strings from the fallback. The parser can already handle these fields. The fallback was dead code. PiperOrigin-RevId: 495100162 --- .../protobuf/generated_message_tctable_gen.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/google/protobuf/generated_message_tctable_gen.cc b/src/google/protobuf/generated_message_tctable_gen.cc index fd39199f1f..e2c5deb5ab 100644 --- a/src/google/protobuf/generated_message_tctable_gen.cc +++ b/src/google/protobuf/generated_message_tctable_gen.cc @@ -336,8 +336,6 @@ std::vector FilterMiniParsedFields( std::vector generated_fallback_fields; for (const auto* field : fields) { - auto options = option_provider.GetForField(field); - bool handled = false; switch (field->type()) { case FieldDescriptor::TYPE_DOUBLE: @@ -354,20 +352,13 @@ std::vector FilterMiniParsedFields( case FieldDescriptor::TYPE_SINT64: case FieldDescriptor::TYPE_INT64: case FieldDescriptor::TYPE_ENUM: + case FieldDescriptor::TYPE_BYTES: + case FieldDescriptor::TYPE_STRING: // These are handled by MiniParse, so we don't need any generated // fallback code. handled = true; break; - case FieldDescriptor::TYPE_BYTES: - case FieldDescriptor::TYPE_STRING: - if (options.is_string_inlined) { - // TODO(b/198211897): support InilnedStringField. - handled = false; - } else { - handled = true; - } - break; case FieldDescriptor::TYPE_MESSAGE: case FieldDescriptor::TYPE_GROUP: