Sync from Piper @439400376

PROTOBUF_SYNC_PIPER
quchwe · Apr 4, 2022 · a29e0e3 · a29e0e3
1 parent 40db3da
commit a29e0e3
Show file tree

Hide file tree

Showing 210 changed files with 17,729 additions and 15,756 deletions.
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -13,4 +13,4 @@ jobs:
  with:
  check_filenames: true
  skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
- ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,sur"
+ ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur"
diff --git a/.gitignore b/.gitignore
@@ -46,7 +46,7 @@ src/.libs
 any_test.pb.*
 map*unittest.pb.*
 unittest*.pb.*
-cpp_test*.pb.*
+src/google/protobuf/compiler/cpp/test*.pb.*
 src/google/protobuf/util/**/*.pb.cc
 src/google/protobuf/util/**/*.pb.h
 
@@ -89,6 +89,10 @@ java/**/*.iml
 # Windows native output.
 cmake/build
 build_msvc
+# Directories suggested by cmake/README.md
+/debug/
+/solution/
+/release/
 
 # NuGet packages: we want the repository configuration, but not the
 # packages themselves.

diff --git a/BUILD b/BUILD
@@ -159,6 +159,7 @@ cc_library(
  "src/google/protobuf/any_lite.cc",
  "src/google/protobuf/arena.cc",
  "src/google/protobuf/arenastring.cc",
+ "src/google/protobuf/arenaz_sampler.cc",
  "src/google/protobuf/extension_set.cc",
  "src/google/protobuf/generated_enum_util.cc",
  "src/google/protobuf/generated_message_tctable_lite.cc",
@@ -419,21 +420,21 @@ cc_library(
  # AUTOGEN(protoc_lib_srcs)
  "src/google/protobuf/compiler/code_generator.cc",
  "src/google/protobuf/compiler/command_line_interface.cc",
- "src/google/protobuf/compiler/cpp/cpp_enum.cc",
- "src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
- "src/google/protobuf/compiler/cpp/cpp_extension.cc",
- "src/google/protobuf/compiler/cpp/cpp_field.cc",
- "src/google/protobuf/compiler/cpp/cpp_file.cc",
- "src/google/protobuf/compiler/cpp/cpp_generator.cc",
- "src/google/protobuf/compiler/cpp/cpp_helpers.cc",
- "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
- "src/google/protobuf/compiler/cpp/cpp_message.cc",
- "src/google/protobuf/compiler/cpp/cpp_message_field.cc",
- "src/google/protobuf/compiler/cpp/cpp_padding_optimizer.cc",
- "src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc",
- "src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
- "src/google/protobuf/compiler/cpp/cpp_service.cc",
- "src/google/protobuf/compiler/cpp/cpp_string_field.cc",
+ "src/google/protobuf/compiler/cpp/enum.cc",
+ "src/google/protobuf/compiler/cpp/enum_field.cc",
+ "src/google/protobuf/compiler/cpp/extension.cc",
+ "src/google/protobuf/compiler/cpp/field.cc",
+ "src/google/protobuf/compiler/cpp/file.cc",
+ "src/google/protobuf/compiler/cpp/generator.cc",
+ "src/google/protobuf/compiler/cpp/helpers.cc",
+ "src/google/protobuf/compiler/cpp/map_field.cc",
+ "src/google/protobuf/compiler/cpp/message.cc",
+ "src/google/protobuf/compiler/cpp/message_field.cc",
+ "src/google/protobuf/compiler/cpp/padding_optimizer.cc",
+ "src/google/protobuf/compiler/cpp/parse_function_generator.cc",
+ "src/google/protobuf/compiler/cpp/primitive_field.cc",
+ "src/google/protobuf/compiler/cpp/service.cc",
+ "src/google/protobuf/compiler/cpp/string_field.cc",
  "src/google/protobuf/compiler/csharp/csharp_doc_comment.cc",
  "src/google/protobuf/compiler/csharp/csharp_enum.cc",
  "src/google/protobuf/compiler/csharp/csharp_enum_field.cc",
@@ -450,35 +451,35 @@ cc_library(
  "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
  "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
  "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
- "src/google/protobuf/compiler/java/java_context.cc",
- "src/google/protobuf/compiler/java/java_doc_comment.cc",
- "src/google/protobuf/compiler/java/java_enum.cc",
- "src/google/protobuf/compiler/java/java_enum_field.cc",
- "src/google/protobuf/compiler/java/java_enum_field_lite.cc",
- "src/google/protobuf/compiler/java/java_enum_lite.cc",
- "src/google/protobuf/compiler/java/java_extension.cc",
- "src/google/protobuf/compiler/java/java_extension_lite.cc",
- "src/google/protobuf/compiler/java/java_field.cc",
- "src/google/protobuf/compiler/java/java_file.cc",
- "src/google/protobuf/compiler/java/java_generator.cc",
- "src/google/protobuf/compiler/java/java_generator_factory.cc",
- "src/google/protobuf/compiler/java/java_helpers.cc",
- "src/google/protobuf/compiler/java/java_kotlin_generator.cc",
- "src/google/protobuf/compiler/java/java_map_field.cc",
- "src/google/protobuf/compiler/java/java_map_field_lite.cc",
- "src/google/protobuf/compiler/java/java_message.cc",
- "src/google/protobuf/compiler/java/java_message_builder.cc",
- "src/google/protobuf/compiler/java/java_message_builder_lite.cc",
- "src/google/protobuf/compiler/java/java_message_field.cc",
- "src/google/protobuf/compiler/java/java_message_field_lite.cc",
- "src/google/protobuf/compiler/java/java_message_lite.cc",
- "src/google/protobuf/compiler/java/java_name_resolver.cc",
- "src/google/protobuf/compiler/java/java_primitive_field.cc",
- "src/google/protobuf/compiler/java/java_primitive_field_lite.cc",
- "src/google/protobuf/compiler/java/java_service.cc",
- "src/google/protobuf/compiler/java/java_shared_code_generator.cc",
- "src/google/protobuf/compiler/java/java_string_field.cc",
- "src/google/protobuf/compiler/java/java_string_field_lite.cc",
+ "src/google/protobuf/compiler/java/context.cc",
+ "src/google/protobuf/compiler/java/doc_comment.cc",
+ "src/google/protobuf/compiler/java/enum.cc",
+ "src/google/protobuf/compiler/java/enum_field.cc",
+ "src/google/protobuf/compiler/java/enum_field_lite.cc",
+ "src/google/protobuf/compiler/java/enum_lite.cc",
+ "src/google/protobuf/compiler/java/extension.cc",
+ "src/google/protobuf/compiler/java/extension_lite.cc",
+ "src/google/protobuf/compiler/java/field.cc",
+ "src/google/protobuf/compiler/java/file.cc",
+ "src/google/protobuf/compiler/java/generator.cc",
+ "src/google/protobuf/compiler/java/generator_factory.cc",
+ "src/google/protobuf/compiler/java/helpers.cc",
+ "src/google/protobuf/compiler/java/kotlin_generator.cc",
+ "src/google/protobuf/compiler/java/map_field.cc",
+ "src/google/protobuf/compiler/java/map_field_lite.cc",
+ "src/google/protobuf/compiler/java/message.cc",
+ "src/google/protobuf/compiler/java/message_builder.cc",
+ "src/google/protobuf/compiler/java/message_builder_lite.cc",
+ "src/google/protobuf/compiler/java/message_field.cc",
+ "src/google/protobuf/compiler/java/message_field_lite.cc",
+ "src/google/protobuf/compiler/java/message_lite.cc",
+ "src/google/protobuf/compiler/java/name_resolver.cc",
+ "src/google/protobuf/compiler/java/primitive_field.cc",
+ "src/google/protobuf/compiler/java/primitive_field_lite.cc",
+ "src/google/protobuf/compiler/java/service.cc",
+ "src/google/protobuf/compiler/java/shared_code_generator.cc",
+ "src/google/protobuf/compiler/java/string_field.cc",
+ "src/google/protobuf/compiler/java/string_field_lite.cc",
  "src/google/protobuf/compiler/js/js_generator.cc",
  "src/google/protobuf/compiler/js/well_known_types_embed.cc",
  "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
@@ -496,9 +497,9 @@ cc_library(
  "src/google/protobuf/compiler/php/php_generator.cc",
  "src/google/protobuf/compiler/plugin.cc",
  "src/google/protobuf/compiler/plugin.pb.cc",
- "src/google/protobuf/compiler/python/python_generator.cc",
- "src/google/protobuf/compiler/python/python_helpers.cc",
- "src/google/protobuf/compiler/python/python_pyi_generator.cc",
+ "src/google/protobuf/compiler/python/generator.cc",
+ "src/google/protobuf/compiler/python/helpers.cc",
+ "src/google/protobuf/compiler/python/pyi_generator.cc",
  "src/google/protobuf/compiler/ruby/ruby_generator.cc",
  "src/google/protobuf/compiler/subprocess.cc",
  "src/google/protobuf/compiler/zip_writer.cc",
@@ -605,8 +606,8 @@ LITE_TEST_PROTOS = ["src/" + s for s in RELATIVE_LITE_TEST_PROTOS]
 RELATIVE_TEST_PROTOS = [
  # AUTOGEN(test_protos)
  "google/protobuf/any_test.proto",
- "google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto",
- "google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto",
+ "google/protobuf/compiler/cpp/test_bad_identifiers.proto",
+ "google/protobuf/compiler/cpp/test_large_enum_value.proto",
  "google/protobuf/map_proto2_unittest.proto",
  "google/protobuf/map_unittest.proto",
  "google/protobuf/unittest.proto",
@@ -765,30 +766,32 @@ cc_test(
  "src/google/protobuf/any_test.cc",
  "src/google/protobuf/arena_unittest.cc",
  "src/google/protobuf/arenastring_unittest.cc",
+ "src/google/protobuf/arenaz_sampler_test.cc",
  "src/google/protobuf/compiler/annotation_test_util.cc",
  "src/google/protobuf/compiler/command_line_interface_unittest.cc",
- "src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc",
- "src/google/protobuf/compiler/cpp/cpp_move_unittest.cc",
- "src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc",
- "src/google/protobuf/compiler/cpp/cpp_unittest.cc",
- "src/google/protobuf/compiler/cpp/cpp_unittest.inc",
+ "src/google/protobuf/compiler/cpp/bootstrap_unittest.cc",
  "src/google/protobuf/compiler/cpp/metadata_test.cc",
+ "src/google/protobuf/compiler/cpp/move_unittest.cc",
+ "src/google/protobuf/compiler/cpp/plugin_unittest.cc",
+ "src/google/protobuf/compiler/cpp/unittest.cc",
+ "src/google/protobuf/compiler/cpp/unittest.inc",
  "src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc",
  "src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc",
  "src/google/protobuf/compiler/importer_unittest.cc",
- "src/google/protobuf/compiler/java/java_doc_comment_unittest.cc",
- "src/google/protobuf/compiler/java/java_plugin_unittest.cc",
+ "src/google/protobuf/compiler/java/doc_comment_unittest.cc",
+ "src/google/protobuf/compiler/java/plugin_unittest.cc",
  "src/google/protobuf/compiler/mock_code_generator.cc",
  "src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc",
  "src/google/protobuf/compiler/parser_unittest.cc",
- "src/google/protobuf/compiler/python/python_plugin_unittest.cc",
+ "src/google/protobuf/compiler/python/plugin_unittest.cc",
  "src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc",
  "src/google/protobuf/descriptor_database_unittest.cc",
  "src/google/protobuf/descriptor_unittest.cc",
  "src/google/protobuf/drop_unknown_fields_test.cc",
  "src/google/protobuf/dynamic_message_unittest.cc",
  "src/google/protobuf/extension_set_unittest.cc",
  "src/google/protobuf/generated_message_reflection_unittest.cc",
+ "src/google/protobuf/generated_message_tctable_lite_test.cc",
  "src/google/protobuf/inlined_string_field_unittest.cc",
  "src/google/protobuf/io/coded_stream_unittest.cc",
  "src/google/protobuf/io/io_win32_unittest.cc",

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -17,8 +17,11 @@ Python
 
  Ruby
  * Dropped Ruby 2.3 and 2.4 support for CI and releases. (#9311)
- * Message.decode/encode: Add max_recursion_depth option (#9218)
- * Rename max_recursion_depth to recursion_limit (#9486)
+ * Added Ruby 3.1 support for CI and releases (#9566).
+ * Message.decode/encode: Add recursion_limit option (#9218/#9486)
+ * Allocate with xrealloc()/xfree() so message allocation is visible to the
+ Ruby GC. In certain tests this leads to much lower memory usage due to more
+ frequent GC runs (#9586).
  * Fix conversion of singleton classes in Ruby (#9342)
  * Suppress warning for intentional circular require (#9556)
  * JSON will now output shorter strings for double and float fields when possible

diff --git a/Protobuf.podspec b/Protobuf.podspec
@@ -5,7 +5,7 @@
 # dependent projects use the :git notation to refer to the library.
 Pod::Spec.new do |s|
  s.name = 'Protobuf'
- s.version = '3.20.0-rc1'
+ s.version = '3.20.0'
  s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
  s.homepage = 'https://github.com/protocolbuffers/protobuf'
  s.license = 'BSD-3-Clause'

diff --git a/cmake/tests.cmake b/cmake/tests.cmake
@@ -145,6 +145,7 @@ set(tests_files
  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h
  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc
  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
+ ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_size_unittest.cc
  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/metadata_test.cc
  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/move_unittest.cc
  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/plugin_unittest.cc

diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc
@@ -2226,11 +2226,11 @@ void BinaryAndJsonConformanceSuite::RunJsonTestsForNonRepeatedTypes() {
  "optional_aliased_enum: ALIAS_BAZ");
  RunValidJsonTest(
  "EnumFieldWithAliasUseAlias", REQUIRED,
- R"({"optionalAliasedEnum": "QUX"})",
+ R"({"optionalAliasedEnum": "MOO"})",
  "optional_aliased_enum: ALIAS_BAZ");
  RunValidJsonTest(
  "EnumFieldWithAliasLowerCase", REQUIRED,
- R"({"optionalAliasedEnum": "qux"})",
+ R"({"optionalAliasedEnum": "moo"})",
  "optional_aliased_enum: ALIAS_BAZ");
  RunValidJsonTest(
  "EnumFieldWithAliasDifferentCase", REQUIRED,

diff --git a/csharp/.editorconfig b/csharp/.editorconfig
@@ -0,0 +1,17 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# New line preferences
+end_of_line = lf
+insert_final_newline = false
+trim_trailing_whitespace = true
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
@@ -5,7 +5,7 @@
  <title>Google Protocol Buffers tools</title>
  <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
  <description>See project site for more info.</description>
- <version>3.20.0-rc1</version>
+ <version>3.20.0</version>
  <authors>Google Inc.</authors>
  <owners>protobuf-packages</owners>
  <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>