From 369388b472e5cc67d755abd7593617618defdbce Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Thu, 3 Feb 2022 01:09:18 +0000
Subject: [PATCH] More test fixes.

---
 BUILD                                                          | 1 -
 .../protobuf/compiler/cpp/cpp_parse_function_generator.cc      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/BUILD b/BUILD
index 5092c961f..9528848bd 100644
--- a/BUILD
+++ b/BUILD
@@ -48,7 +48,6 @@ COPTS = select({
     ":msvc": MSVC_COPTS,
     "//conditions:default": [
         "-DHAVE_ZLIB",
-        "-Wmissing-field-initializers",
         "-Woverloaded-virtual",
         "-Wno-sign-compare",
     ],
diff --git a/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc b/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
index 1070cae06..a0bd93756 100644
--- a/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
@@ -283,8 +283,7 @@ TailCallTableInfo::TailCallTableInfo(
   // Fill in mini table entries.
   for (const FieldDescriptor* field : ordered_fields) {
     field_entries.push_back(
-        {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1), 0, 0}
-    );
+        {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1)});
     auto& entry = field_entries.back();
 
     if (field->type() == FieldDescriptor::TYPE_MESSAGE ||