From 4f6fc33c5b89d34c3497c5ad6155a7f4a086b2be Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Sun, 23 Jul 2023 23:06:14 -0700 Subject: [PATCH] Remove unverified_lazy_message_sets option. PiperOrigin-RevId: 550453428 --- src/google/protobuf/compiler/cpp/generator.cc | 2 -- src/google/protobuf/compiler/cpp/options.h | 1 - src/google/protobuf/compiler/cpp/parse_function_generator.cc | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/generator.cc b/src/google/protobuf/compiler/cpp/generator.cc index 5fdb9b15f6..c23a71b8a2 100644 --- a/src/google/protobuf/compiler/cpp/generator.cc +++ b/src/google/protobuf/compiler/cpp/generator.cc @@ -189,8 +189,6 @@ bool CppGenerator::Generate(const FileDescriptor* file, .emplace(value.substr(pos, next_pos - pos)); pos = next_pos + 1; } while (pos < value.size()); - } else if (key == "unverified_lazy_message_sets") { - file_options.unverified_lazy_message_sets = true; } else if (key == "force_eagerly_verified_lazy") { file_options.force_eagerly_verified_lazy = true; } else if (key == "experimental_tail_call_table_mode") { diff --git a/src/google/protobuf/compiler/cpp/options.h b/src/google/protobuf/compiler/cpp/options.h index 56411f9ef3..210cc7ddba 100644 --- a/src/google/protobuf/compiler/cpp/options.h +++ b/src/google/protobuf/compiler/cpp/options.h @@ -77,7 +77,6 @@ struct Options { bool bootstrap = false; bool opensource_runtime = false; bool annotate_accessor = false; - bool unverified_lazy_message_sets = false; bool profile_driven_inline_string = true; bool force_split = false; bool profile_driven_split = true; diff --git a/src/google/protobuf/compiler/cpp/parse_function_generator.cc b/src/google/protobuf/compiler/cpp/parse_function_generator.cc index 4d4be0391d..091474229a 100644 --- a/src/google/protobuf/compiler/cpp/parse_function_generator.cc +++ b/src/google/protobuf/compiler/cpp/parse_function_generator.cc @@ -175,8 +175,7 @@ void ParseFunctionGenerator::GenerateMethodImpls(io::Printer* printer) { "const char* $classname$::_InternalParse(const char* ptr,\n" " ::_pbi::ParseContext* ctx) {\n" "$annotate_deserialize$"); - if (!options_.unverified_lazy_message_sets && - ShouldVerify(descriptor_, options_, scc_analyzer_)) { + if (ShouldVerify(descriptor_, options_, scc_analyzer_)) { format( " ctx->set_lazy_eager_verify_func(&$classname$::InternalVerify);\n"); }