Sync from Piper @401883098

acozzette · acozzette · commit c8284ae4241f · 2021-10-08T16:45:26.000-07:00
PROTOBUF_SYNC_PIPER
diff --git a/binary/utils.js b/binary/utils.js
@@ -202,7 +202,11 @@ jspb.utils.splitFloat32 = function(value) {
 
   exp = Math.floor(Math.log(value) / Math.LN2);
   mant = value * Math.pow(2, -exp);
-  mant = Math.round(mant * jspb.BinaryConstants.TWO_TO_23) & 0x7FFFFF;
+  mant = Math.round(mant * jspb.BinaryConstants.TWO_TO_23);
+  if (mant >= 0x1000000) {
+    ++exp;
+  }
+  mant = mant & 0x7FFFFF;
 
   jspb.utils.split64High = 0;
   jspb.utils.split64Low = ((sign << 31) | ((exp + 127) << 23) | mant) >>> 0;
diff --git a/binary/utils_test.js b/binary/utils_test.js
@@ -391,6 +391,11 @@ describe('binaryUtilsTest', function() {
     // Pi.
     test(f32_pi, 0x40490fdb);
 
+    // corner cases
+    test(0.9999999762949594, 0x3f800000);
+    test(7.99999999999999, 0x41000000);
+    test(Math.sin(30 * Math.PI / 180), 0x3f000000);  // sin(30 degrees)
+
     // Various positive values.
     var cursor = f32_eps * 10;
     while (cursor != Infinity) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.17.3",
+  "version": "3.18.1",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "files": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "google-protobuf",`
`3`		`- "version": "3.17.3",`
	`3`	`+ "version": "3.18.1",`
`4`	`4`	`"description": "Protocol Buffers for JavaScript",`
`5`	`5`	`"main": "google-protobuf.js",`
`6`	`6`	`"files": [`