Sync from Piper @446230931

PROTOBUF_SYNC_PIPER

CHANGES.txt

@@ -14,6 +14,7 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
   * Refactor generated message class layout
   * Optimize tokenizer ParseInteger by removing division
   * Reserve exactly the right amount of capacity in ExtensionSet::MergeFrom
+  * Parse FLT_MAX correctly when represented in JSON
 
   Compiler
   * Protoc outputs the list of suggested field numbers when invalid field

kokoro/release/collect_all_artifacts.sh

@@ -50,6 +50,9 @@ cp ${INPUT_ARTIFACTS_DIR}/build64/src/protoc protoc/macosx_x64/protoc
 # TODO(jtattermusch): use "mono:5.14" docker image instead so we don't have to apt-get install
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+# NVidia has stopped publishing Cuda packages for Ubuntu 16.04, so we need to
+# delete this file to allow the apt update to run successfully.
+sudo rm -f /etc/apt/sources.list.d/cuda.list
 sudo apt update
 sudo apt-get install -y nuget
 

protobuf_release.bzl

@@ -4,11 +4,11 @@ Generates package naming variables for use with rules_pkg.
 
 load("@rules_pkg//:providers.bzl", "PackageVariablesInfo")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
-load(":protobuf_version.bzl", "PROTOBUF_VERSION")
+load(":protobuf_version.bzl", "PROTOC_VERSION")
 
 def _package_naming_impl(ctx):
   values = {}
-  values["version"] = PROTOBUF_VERSION
+  values["version"] = PROTOC_VERSION
 
   # infer from the current cpp toolchain.
   toolchain = find_cpp_toolchain(ctx)

protobuf_version.bzl

@@ -1 +1,2 @@
-PROTOBUF_VERSION = '3.20.1'
+PROTOC_VERSION = '3.20.1'
+PROTOBUF_JAVA_VERSION = '3.20.1'

src/google/protobuf/parse_context.h

@@ -630,7 +630,7 @@ const char* ReadTagInlined(const char* ptr, uint32_t* out) {
             *out = 0;
             return nullptr;
           }
-          *out = RotateLeft(res, 28);
+          *out = static_cast<uint32_t>(RotateLeft(res, 28));
 #if defined(__GNUC__)
           // Note: this asm statement prevents the compiler from
           // trying to share the "return ptr + constant" among all
@@ -639,16 +639,16 @@ const char* ReadTagInlined(const char* ptr, uint32_t* out) {
 #endif
           return ptr + 5;
         }
-        *out = RotateLeft(res, 21);
+        *out = static_cast<uint32_t>(RotateLeft(res, 21));
         return ptr + 4;
       }
-      *out = RotateLeft(res, 14);
+      *out = static_cast<uint32_t>(RotateLeft(res, 14));
       return ptr + 3;
     }
-    *out = RotateLeft(res, 7);
+    *out = static_cast<uint32_t>(RotateLeft(res, 7));
     return ptr + 2;
   }
-  *out = res;
+  *out = static_cast<uint32_t>(res);
   return ptr + 1;
 }
 

src/google/protobuf/wire_format_lite.h

@@ -41,6 +41,7 @@
 #define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_H__
 
 
+#include <limits>
 #include <string>
 
 #include <google/protobuf/stubs/common.h>