From 528344245eeb87e26e9b5d0c187685bbd2608ee7 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Fri, 30 Jun 2023 15:26:14 -0700 Subject: [PATCH] Remove code for the paused linker-guided field stripping (go/lgpfs-paused). PiperOrigin-RevId: 544763667 --- src/google/protobuf/compiler/cpp/helpers.h | 4 ---- src/google/protobuf/compiler/cpp/message.cc | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/helpers.h b/src/google/protobuf/compiler/cpp/helpers.h index 79e07dd07f..8f0c6cacfe 100644 --- a/src/google/protobuf/compiler/cpp/helpers.h +++ b/src/google/protobuf/compiler/cpp/helpers.h @@ -396,10 +396,6 @@ bool ShouldSplit(const FieldDescriptor* field, const Options& options); bool ShouldForceAllocationOnConstruction(const Descriptor* desc, const Options& options); -inline bool IsFieldUsed(const FieldDescriptor* /* field */, const Options&) { - return true; -} - // Does the file contain any definitions that need extension_set.h? bool HasExtensionsOrExtendableMessage(const FileDescriptor* file); diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index 6ab4114932..a623bf66eb 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -3999,12 +3999,6 @@ void MessageGenerator::GenerateSerializeWithCachedSizesBodyShuffled( std::vector ordered_fields = SortFieldsByNumber(descriptor_); - ordered_fields.erase( - std::remove_if(ordered_fields.begin(), ordered_fields.end(), - [this](const FieldDescriptor* f) { - return !IsFieldUsed(f, options_); - }), - ordered_fields.end()); std::vector sorted_extensions; sorted_extensions.reserve(descriptor_->extension_range_count());