commit f29dbf01a3210f4e378fcc21696ceb6d80b07f52
author Mike Kruskal <mkruskal@google.com> Wed Oct 26 20:12:46 2022 -0700
committer Mike Kruskal <mkruskal@google.com> Wed Oct 26 20:19:13 2022 -0700
tree a118dd94b62ac5f69cdad0d250e6ac1d753aa694
parent ca7a94661b28b3153c9ce4239b2bc70244ffb906

Fixing merge issues from sync

src/google/protobuf/compiler/csharp/csharp_map_field.cc

diff --git a/src/google/protobuf/compiler/csharp/csharp_map_field.cc b/src/google/protobuf/compiler/csharp/csharp_map_field.cc
index efe87f2..50d8b1d 100644
--- a/src/google/protobuf/compiler/csharp/csharp_map_field.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_map_field.cc
@@ -88,7 +88,7 @@
 void MapFieldGenerator::GenerateMergingCode(io::Printer* printer) {
   printer->Print(
       variables_,
-      "$name$_.Add(other.$name$_);\n");
+      "$name$_.MergeFrom(other.$name$_);\n");
 }
 
 void MapFieldGenerator::GenerateParsingCode(io::Printer* printer) {

src/google/protobuf/json/internal/lexer_test.cc

diff --git a/src/google/protobuf/json/internal/lexer_test.cc b/src/google/protobuf/json/internal/lexer_test.cc
index 92a6f3a..6213172 100644
--- a/src/google/protobuf/json/internal/lexer_test.cc
+++ b/src/google/protobuf/json/internal/lexer_test.cc
@@ -160,6 +160,7 @@
         return Value{std::move(obj)};
       }
     }
+    return absl::InternalError("Unrecognized kind in lexer");
   }
 
   friend std::ostream& operator<<(std::ostream& os, const Value& v) {