Cherry-pick the fix for protocolbuffers#7463.

bithium · May 12, 2020 · ccdc12d · ccdc12d
1 parent b316ce3
commit ccdc12d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/google/protobuf/unittest_proto3_optional.proto b/google/protobuf/unittest_proto3_optional.proto
@@ -72,4 +72,8 @@ message TestProto3Optional {
   optional NestedMessage optional_nested_message = 18;
   optional NestedMessage lazy_nested_message = 19 [lazy = true];
   optional NestedEnum optional_nested_enum = 21;
+
+  // Add some non-optional fields to verify we can mix them.
+  int32 singular_int32 = 22;
+  int64 singular_int64 = 23;
 }