From ccdc12d51e2a40823c095bc35df6a5a5872ea58e Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Tue, 12 May 2020 11:06:05 -0700
Subject: [PATCH] Cherry-pick the fix for
 https://github.com/protocolbuffers/protobuf/issues/7463.

---
 google/protobuf/unittest_proto3_optional.proto | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/google/protobuf/unittest_proto3_optional.proto b/google/protobuf/unittest_proto3_optional.proto
index b32a5d22b7a6..3c47f12e28b1 100644
--- 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;
 }