Remove unverified_lazy_message_sets option.

PiperOrigin-RevId: 550453428
protocolbuffers · Jul 24, 2023 · 4f6fc33 · 4f6fc33
1 parent dd4ffc6
commit 4f6fc33
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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");
     }