Cleanup unused, always-false log_debug_utf8_failure flag.

ckennelly · copybara-github · commit 48bbc19e685c · 2025-08-06T11:46:44.000-07:00
PiperOrigin-RevId: 791779036
diff --git a/src/google/protobuf/compiler/cpp/parse_function_generator.cc b/src/google/protobuf/compiler/cpp/parse_function_generator.cc
@@ -460,18 +460,15 @@ void ParseFunctionGenerator::GenerateTailCallTable(io::Printer* p) {
           p->Emit(
               {
                   {"strict", utf8_check == Utf8CheckMode::kStrict},
-                  // TODO: Remove this.
-                  {"verify", false},
                   {"validate", validated_enum},
                   {"key_wire", map_key->type()},
                   {"value_wire", map_value->type()},
                   {"is_lite",
                    !HasDescriptorMethods(aux_entry.field->file(), options_)},
               },
               R"cc(
-                {::_pbi::TcParser::GetMapAuxInfo($strict$, $verify$, $validate$,
-                                                 $key_wire$, $value_wire$,
-                                                 $is_lite$)},
+                {::_pbi::TcParser::GetMapAuxInfo(
+                    $strict$, $validate$, $key_wire$, $value_wire$, $is_lite$)},
               )cc");
           break;
         }
diff --git a/src/google/protobuf/generated_message_tctable_decl.h b/src/google/protobuf/generated_message_tctable_decl.h
@@ -253,8 +253,6 @@ struct MapAuxInfo {
   uint8_t use_lite : 1;
   // If true UTF8 errors cause the parsing to fail.
   uint8_t fail_on_utf8_failure : 1;
-  // If true UTF8 errors are logged, but they are accepted.
-  uint8_t log_debug_utf8_failure : 1;
   // If true the next aux contains the enum validator.
   uint8_t value_is_validated_enum : 1;
 };
diff --git a/src/google/protobuf/generated_message_tctable_impl.h b/src/google/protobuf/generated_message_tctable_impl.h
@@ -838,7 +838,6 @@ class PROTOBUF_EXPORT TcParser final {
 
   // For `map` mini parsing generate a type card for the key/value.
   static constexpr MapAuxInfo GetMapAuxInfo(bool fail_on_utf8_failure,
-                                            bool log_debug_utf8_failure,
                                             bool validated_enum_value,
                                             int key_type, int value_type,
                                             bool is_lite) {
@@ -848,7 +847,6 @@ class PROTOBUF_EXPORT TcParser final {
         true,
         is_lite,
         fail_on_utf8_failure,
-        log_debug_utf8_failure,
         validated_enum_value,
     };
   }
diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc
@@ -2916,9 +2916,6 @@ const char* TcParser::ParseOneMapEntry(
           ptr = ctx->ReadString(ptr, size, str);
           if (ABSL_PREDICT_FALSE(ptr == nullptr)) return nullptr;
           bool do_utf8_check = map_info.fail_on_utf8_failure;
-#ifndef NDEBUG
-          do_utf8_check |= map_info.log_debug_utf8_failure;
-#endif
           if (type_card.is_utf8() && do_utf8_check &&
               !utf8_range::IsStructurallyValid(*str)) {
             PrintUTF8ErrorLog(MessageName(table), FieldName(table, &entry),
