Merge branch '21.x' into 21.x-php-add-previous-classname-to-descriptor-pool

BUILD.bazel

@@ -929,7 +929,7 @@ py_proto_library(
     default_runtime = "",
     protoc = ":protoc",
     srcs_version = "PY2AND3",
-    visibility = ["@upb//:__subpackages__"],
+    visibility = ["//visibility:public"],
 )
 
 py_library(
@@ -941,6 +941,7 @@ py_library(
             ":python/google/protobuf/pyext/_message.so",
         ],
     }),
+    visibility = ["//visibility:public"],
     deps = [
         ":python_srcs",
         ":well_known_types_py_pb2",

CHANGES.txt

@@ -1,13 +1,21 @@
+2022-06-27 version 21.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+  C++
+  * ArenaString improvements (fix alignment issue)
+
+  PHP
+  * API changes for OneOf  (#10102)
+
+
 2022-05-27 version 21.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-  
+
   C++
-  * cmake: Revert "Fix cmake install targets (#9822)" (#10060) 
+  * cmake: Revert "Fix cmake install targets (#9822)" (#10060)
   * Remove Abseil dependency from CMake build (#10056)
 
   Python
   * Update python wheel metadata with more information incl. required python version (#10058)
   * Fix segmentation fault when instantiating field via repeated field assignment (#10066)
-  
+
 2022-05-25 version 21.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
 
   C++
@@ -1099,11 +1107,11 @@ mistakenly tagged at the wrong commit.
 
 
 2020-02-14 version 3.11.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  
+
   C#
   * Fix latest ArgumentException for C# extensions (#7188)
   * Enforce recursion depth checking for unknown fields (#7210)
-  
+
   Ruby
   * Fix wrappers with a zero value (#7195)
   * Fix JSON serialization of 0/empty-valued wrapper types (#7198)
@@ -1116,13 +1124,13 @@ mistakenly tagged at the wrong commit.
   PHP
   * Refactored ulong to zend_ulong for php7.4 compatibility (#7147)
   * Call register_class before getClass from desc to fix segfault (#7077)
-  
+
 
 2019-12-10 version 3.11.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
   PHP
   * Make c extension portable for php 7.4 (#6968)
-  
+
 
 2019-12-02 version 3.11.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
@@ -1198,7 +1206,7 @@ mistakenly tagged at the wrong commit.
   * Support 32 bit values for ProtoStreamObjectWriter to Struct.
   * Removed the internal-only header coded_stream_inl.h and the internal-only methods defined there.
   * Enforced no SWIG wrapping of descriptor_database.h (other headers already had this restriction).
-  * Implementation of the equivalent of the MOMI parser for serialization. This removes one of the two serialization routines, by making the fast array serialization routine completely general. SerializeToCodedStream can now be implemented in terms of the much much faster array serialization. The array serialization regresses slightly, but when array serialization is not possible this wins big. 
+  * Implementation of the equivalent of the MOMI parser for serialization. This removes one of the two serialization routines, by making the fast array serialization routine completely general. SerializeToCodedStream can now be implemented in terms of the much much faster array serialization. The array serialization regresses slightly, but when array serialization is not possible this wins big.
   * Do not convert unknown field name to snake case to accurately report error.
   * Fix a UBSAN warnings. (#6333)
   * Add podspec for C++ (#6404)
@@ -1232,7 +1240,7 @@ mistakenly tagged at the wrong commit.
   * Change the parameter types of binaryReaderFn in ExtensionFieldBinaryInfo to (number, ?, ?).
   * Create dates.ts and time_of_days.ts to mirror Java versions. This is a near-identical conversion of c.g.type.util.{Dates,TimeOfDays} respectively.
   * Migrate moneys to TypeScript.
-  
+
   PHP
   * Fix incorrect leap day for Timestamp (#6696)
   * Initialize well known type values (#6713)
@@ -1246,7 +1254,7 @@ mistakenly tagged at the wrong commit.
   * Optimization for layout_init() (#6547)
   * Fix for GC of Ruby map frames. (#6533)
   * Fixed leap year handling by reworking upb_mktime() -> upb_timegm(). (#6695)
-  
+
   Objective C
   * Remove OSReadLittle* due to alignment requirements (#6678)
   * Don't use unions and instead use memcpy for the type swaps. (#6672)

Protobuf-C++.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '3.21.1'
+  s.version  = '3.21.2'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

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.21.1'
+  s.version  = '3.21.2'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = 'BSD-3-Clause'

configure.ac

@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.21.1],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.21.2],[protobuf@googlegroups.com],[protobuf])
 
 AM_MAINTAINER_MODE([enable])
 

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.21.1</version>
+    <version>3.21.2</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

csharp/src/Google.Protobuf/Google.Protobuf.csproj

@@ -4,7 +4,7 @@
     <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
     <Copyright>Copyright 2015, Google Inc.</Copyright>
     <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-    <VersionPrefix>3.21.1</VersionPrefix>
+    <VersionPrefix>3.21.2</VersionPrefix>
     <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
     <LangVersion>7.2</LangVersion>
     <Authors>Google Inc.</Authors>

java/README.md

@@ -23,7 +23,7 @@ If you are using Maven, use the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java</artifactId>
-  <version>3.21.1</version>
+  <version>3.21.2</version>
 </dependency>
 ```
 
@@ -37,7 +37,7 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.21.1</version>
+  <version>3.21.2</version>
 </dependency>
 ```
 
@@ -45,7 +45,7 @@ protobuf-java-util package:
 
 If you are using Gradle, add the following to your `build.gradle` file's dependencies:
 ```
-    implementation 'com.google.protobuf:protobuf-java:3.21.1'
+    implementation 'com.google.protobuf:protobuf-java:3.21.2'
 ```
 Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.
 

java/bom/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.21.1</version>
+  <version>3.21.2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

java/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.1</version>
+    <version>3.21.2</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

java/kotlin-lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.1</version>
+    <version>3.21.2</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

java/kotlin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.1</version>
+    <version>3.21.2</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

java/lite.md

@@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-javalite</artifactId>
-  <version>3.21.1</version>
+  <version>3.21.2</version>
 </dependency>
 ```
 

java/lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.1</version>
+    <version>3.21.2</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.21.1</version>
+  <version>3.21.2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

java/util/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.1</version>
+    <version>3.21.2</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

kokoro/linux/dockerfile/test/php_32bit/Dockerfile

@@ -47,8 +47,10 @@ RUN cd /var/local \
   && make install
 
 # Install composer
-RUN curl -sS https://getcomposer.org/installer | php
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN mv composer.phar /usr/local/bin/composer
+RUN php composer-setup.php
+RUN mv composer.phar /usr/bin/composer
+RUN php -r "unlink('composer-setup.php');"
 
 # Download php source code
 RUN git clone https://github.com/php/php-src

kokoro/macos/php7.0_mac/build.sh

@@ -8,4 +8,5 @@ cd $(dirname $0)/../../..
 # Prepare worker environment to run tests
 source kokoro/macos/prepare_build_macos_rc
 
-./tests.sh php7.0_mac
+# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
+#./tests.sh php7.0_mac

kokoro/macos/php7.3_mac/build.sh

@@ -8,4 +8,5 @@ cd $(dirname $0)/../../..
 # Prepare worker environment to run tests
 source kokoro/macos/prepare_build_macos_rc
 
-./tests.sh php7.3_mac
+# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
+#./tests.sh php7.3_mac

php/composer.json

@@ -9,7 +9,7 @@
     "php": ">=7.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": ">=5.0.0"
+    "phpunit/phpunit": ">=5.0.0 <8.5.27"
   },
   "autoload": {
     "psr-4": {

php/ext/google/protobuf/package.xml

@@ -10,11 +10,11 @@
   <email>protobuf-opensource@google.com</email>
   <active>yes</active>
  </lead>
- <date>2022-05-27</date>
+ <date>2022-06-23</date>
- <time>09:36:34</time>
+ <time>12:12:44</time>
  <version>
-  <release>3.21.1</release>
+  <release>3.21.2</release>
-  <api>3.21.1</api>
+  <api>3.21.2</api>
  </version>
  <stability>
   <release>stable</release>
@@ -1343,5 +1343,20 @@ G  A release.
    <notes>
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.21.2</release>
+    <api>3.21.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2022-06-23</date>
+   <time>12:12:44</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
+   <notes>
+   </notes>
+  </release>
  </changelog>
 </package>

php/ext/google/protobuf/protobuf.h

@@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-#define PHP_PROTOBUF_VERSION "3.21.1"
+#define PHP_PROTOBUF_VERSION "3.21.2"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

php/src/Google/Protobuf/FieldDescriptor.php

@@ -39,6 +39,7 @@ class FieldDescriptor
 {
     use GetPublicDescriptorTrait;
 
+    /** @var  \Google\Protobuf\Internal\FieldDescriptor $internal_desc */
     private $internal_desc;
 
     /**
@@ -81,6 +82,32 @@ class FieldDescriptor
         return $this->internal_desc->getType();
     }
 
+    /**
+     * @return OneofDescriptor
+     */
+    public function getContainingOneof()
+    {
+        return $this->getPublicDescriptor($this->internal_desc->getContainingOneof());
+    }
+
+    /**
+     * Gets the field's containing oneof, only if non-synthetic.
+     *
+     * @return null|OneofDescriptor
+     */
+    public function getRealContainingOneof()
+    {
+        return $this->getPublicDescriptor($this->internal_desc->getRealContainingOneof());
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasOptionalKeyword()
+    {
+        return $this->internal_desc->hasOptionalKeyword();
+    }
+
     /**
      * @return Descriptor Returns a descriptor for the field type if the field type is a message, otherwise throws \Exception
      * @throws \Exception
@@ -114,12 +141,4 @@ class FieldDescriptor
     {
         return $this->internal_desc->isMap();
     }
-
-    /**
-     * @return boolean
-     */
-    public function hasOptionalKeyword()
-    {
-        return $this->internal_desc->hasOptionalKeyword();
-    }
 }

php/src/Google/Protobuf/Internal/FieldDescriptor.php

@@ -46,8 +46,11 @@ class FieldDescriptor
     private $message_type;
     private $enum_type;
     private $packed;
-    private $is_map;
     private $oneof_index = -1;
+    private $proto3_optional;
+
+    /** @var OneofDescriptor $containing_oneof */
+    private $containing_oneof;
 
     public function __construct()
     {
@@ -169,6 +172,32 @@ class FieldDescriptor
         return $this->packed;
     }
 
+    public function getProto3Optional()
+    {
+        return $this->proto3_optional;
+    }
+
+    public function setProto3Optional($proto3_optional)
+    {
+        $this->proto3_optional = $proto3_optional;
+    }
+
+    public function getContainingOneof()
+    {
+        return $this->containing_oneof;
+    }
+
+    public function setContainingOneof($containing_oneof)
+    {
+        $this->containing_oneof = $containing_oneof;
+    }
+
+    public function getRealContainingOneof()
+    {
+        return !is_null($this->containing_oneof) && !$this->containing_oneof->isSynthetic()
+            ? $this->containing_oneof : null;
+    }
+
     public function isPackable()
     {
         return $this->isRepeated() && self::isTypePackable($this->type);
@@ -214,6 +243,10 @@ class FieldDescriptor
             $field_type !== GPBType::BYTES);
     }
 
+    /**
+     * @param FieldDescriptorProto $proto
+     * @return FieldDescriptor
+     */
     public static function getFieldDescriptor($proto)
     {
         $type_name = null;
@@ -248,8 +281,6 @@ class FieldDescriptor
         $field = new FieldDescriptor();
         $field->setName($proto->getName());
 
-        $json_name = $proto->hasJsonName() ? $proto->getJsonName() :
-            lcfirst(implode('', array_map('ucwords', explode('_', $proto->getName()))));
         if ($proto->hasJsonName()) {
             $json_name = $proto->getJsonName();
         } else {
@@ -269,6 +300,7 @@ class FieldDescriptor
         $field->setLabel($proto->getLabel());
         $field->setPacked($packed);
         $field->setOneofIndex($oneof_index);
+        $field->setProto3Optional($proto->getProto3Optional());
 
         // At this time, the message/enum type may have not been added to pool.
         // So we use the type name as place holder and will replace it with the

php/src/Google/Protobuf/Internal/OneofDescriptor.php

@@ -37,6 +37,7 @@ class OneofDescriptor
     use HasPublicDescriptorTrait;
 
     private $name;
+    /** @var \Google\Protobuf\FieldDescriptor[] $fields */
     private $fields;
 
     public function __construct()
@@ -64,13 +65,21 @@ class OneofDescriptor
         return $this->fields;
     }
 
+    public function isSynthetic()
+    {
+        return !is_null($this->fields) && count($this->fields) === 1
+            && $this->fields[0]->getProto3Optional();
+    }
+
     public static function buildFromProto($oneof_proto, $desc, $index)
     {
         $oneof = new OneofDescriptor();
         $oneof->setName($oneof_proto->getName());
         foreach ($desc->getField() as $field) {
+            /** @var FieldDescriptor $field */
             if ($field->getOneofIndex() == $index) {
                 $oneof->addField($field);
+                $field->setContainingOneof($oneof);
             }
         }
         return $oneof;

php/src/Google/Protobuf/OneofDescriptor.php

@@ -38,6 +38,7 @@ class OneofDescriptor
 {
     use GetPublicDescriptorTrait;
 
+    /** @var  \Google\Protobuf\Internal\OneofDescriptor $internal_desc */
     private $internal_desc;
 
     /**
@@ -62,6 +63,12 @@ class OneofDescriptor
      */
     public function getField($index)
     {
+        if (
+            is_null($this->internal_desc->getFields())
+            || !isset($this->internal_desc->getFields()[$index])
+        ) {
+            return null;
+        }
         return $this->getPublicDescriptor($this->internal_desc->getFields()[$index]);
     }
 
@@ -75,6 +82,6 @@ class OneofDescriptor
 
     public function isSynthetic()
     {
-      return $this->internal_desc->isSynthetic();
+        return $this->internal_desc->isSynthetic();
     }
 }

protobuf_version.bzl

@@ -1,3 +1,3 @@
-PROTOC_VERSION = '21.1'
+PROTOC_VERSION = '21.2'
-PROTOBUF_JAVA_VERSION = '3.21.1'
+PROTOBUF_JAVA_VERSION = '3.21.2'
-PROTOBUF_PYTHON_VERSION = '4.21.1'
+PROTOBUF_PYTHON_VERSION = '4.21.2'

protoc-artifacts/pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
-  <version>3.21.1</version>
+  <version>3.21.2</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

python/google/protobuf/__init__.py

@@ -30,4 +30,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '4.21.1'
+__version__ = '4.21.2'

ruby/google-protobuf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
-  s.version     = "3.21.1"
+  s.version     = "3.21.2"
   git_tag       = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
   s.licenses    = ["BSD-3-Clause"]
   s.summary     = "Protocol Buffers"

ruby/pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.google.protobuf.jruby</groupId>
     <artifactId>protobuf-jruby</artifactId>
-    <version>3.21.1</version>
+    <version>3.21.2</version>
     <name>Protocol Buffer JRuby native extension</name>
     <description>
       Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
         <dependency>
           <groupId>com.google.protobuf</groupId>
           <artifactId>protobuf-java-util</artifactId>
-          <version>3.21.1</version>
+          <version>3.21.2</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

src/Makefile.am

@@ -18,7 +18,7 @@ else
 PTHREAD_DEF =
 endif
 
-PROTOBUF_VERSION = 32:1:0
+PROTOBUF_VERSION = 32:2:0
 
 if GCC
 # Turn on all warnings except for sign comparison (we ignore sign comparison

src/google/protobuf/any.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/api.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/arena_impl.h

@@ -55,6 +55,13 @@ namespace google {
 namespace protobuf {
 namespace internal {
 
+// To prevent sharing cache lines between threads
+#ifdef __cpp_aligned_new
+enum { kCacheAlignment = 64 };
+#else
+enum { kCacheAlignment = alignof(max_align_t) };  // do the best we can
+#endif
+
 inline constexpr size_t AlignUpTo8(size_t n) {
   // Align n to next multiple of 8 (from Hacker's Delight, Chapter 3.)
   return (n + 7) & static_cast<size_t>(-8);
@@ -497,10 +504,10 @@ class PROTOBUF_EXPORT ThreadSafeArena {
   // have fallback function calls in tail position. This substantially improves
   // code for the happy path.
   PROTOBUF_NDEBUG_INLINE bool MaybeAllocateAligned(size_t n, void** out) {
-    SerialArena* a;
+    SerialArena* arena;
     if (PROTOBUF_PREDICT_TRUE(!alloc_policy_.should_record_allocs() &&
-                              GetSerialArenaFromThreadCache(&a))) {
+                              GetSerialArenaFromThreadCache(&arena))) {
-      return a->MaybeAllocateAligned(n, out);
+      return arena->MaybeAllocateAligned(n, out);
     }
     return false;
   }
@@ -564,7 +571,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
     // fast path optimizes the case where a single thread uses multiple arenas.
     ThreadCache* tc = &thread_cache();
     SerialArena* serial = hint_.load(std::memory_order_acquire);
-    if (PROTOBUF_PREDICT_TRUE(serial != NULL && serial->owner() == tc)) {
+    if (PROTOBUF_PREDICT_TRUE(serial != nullptr && serial->owner() == tc)) {
       *arena = serial;
       return true;
     }
@@ -602,7 +609,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
 #ifdef _MSC_VER
 #pragma warning(disable : 4324)
 #endif
-  struct alignas(64) ThreadCache {
+  struct alignas(kCacheAlignment) ThreadCache {
 #if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
     // If we are using the ThreadLocalStorage class to store the ThreadCache,
     // then the ThreadCache's default constructor has to be responsible for
@@ -610,7 +617,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
     ThreadCache()
         : next_lifecycle_id(0),
           last_lifecycle_id_seen(-1),
-          last_serial_arena(NULL) {}
+          last_serial_arena(nullptr) {}
 #endif
 
     // Number of per-thread lifecycle IDs to reserve. Must be power of two.
@@ -633,7 +640,7 @@ class PROTOBUF_EXPORT ThreadSafeArena {
 #ifdef _MSC_VER
 #pragma warning(disable : 4324)
 #endif
-  struct alignas(64) CacheAlignedLifecycleIdGenerator {
+  struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
     std::atomic<LifecycleIdAtomic> id;
   };
   static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;

src/google/protobuf/arenastring.cc

@@ -187,7 +187,7 @@ std::string* ArenaStringPtr::Release() {
   if (IsDefault()) return nullptr;
 
   std::string* released = tagged_ptr_.Get();
-  if (!tagged_ptr_.IsAllocated()) {
+  if (tagged_ptr_.IsArena()) {
     released = tagged_ptr_.IsMutable() ? new std::string(std::move(*released))
                                        : new std::string(*released);
   }
@@ -216,9 +216,7 @@ void ArenaStringPtr::SetAllocated(std::string* value, Arena* arena) {
 }
 
 void ArenaStringPtr::Destroy() {
-  if (tagged_ptr_.IsAllocated()) {
+  delete tagged_ptr_.GetIfAllocated();
-    delete tagged_ptr_.Get();
-  }
 }
 
 void ArenaStringPtr::ClearToEmpty() {

src/google/protobuf/arenastring.h

@@ -96,13 +96,12 @@ class PROTOBUF_EXPORT LazyString {
 
 class TaggedStringPtr {
  public:
-  // Bit flags qualifying string properties. We can use up to 3 bits as
+  // Bit flags qualifying string properties. We can use 2 bits as
-  // ptr_ is guaranteed and enforced to be aligned on 8 byte boundaries.
+  // ptr_ is guaranteed and enforced to be aligned on 4 byte boundaries.
   enum Flags {
     kArenaBit = 0x1,      // ptr is arena allocated
-    kAllocatedBit = 0x2,  // ptr is heap allocated
+    kMutableBit = 0x2,    // ptr contents are fully mutable
-    kMutableBit = 0x4,    // ptr contents are fully mutable
+    kMask = 0x3           // Bit mask
-    kMask = 0x7           // Bit mask
   };
 
   // Composed logical types
@@ -112,7 +111,7 @@ class TaggedStringPtr {
 
     // Allocated strings are mutable and (as the name implies) owned.
     // A heap allocated string must be deleted.
-    kAllocated = kAllocatedBit | kMutableBit,
+    kAllocated = kMutableBit,
 
     // Mutable arena strings are strings where the string instance is owned
     // by the arena, but the string contents itself are owned by the string
@@ -166,8 +165,16 @@ class TaggedStringPtr {
   // Returns true if the current string is an immutable default value.
   inline bool IsDefault() const { return (as_int() & kMask) == kDefault; }
 
-  // Returns true if the current string is a heap allocated mutable value.
+  // If the current string is a heap-allocated mutable value, returns a pointer
-  inline bool IsAllocated() const { return as_int() & kAllocatedBit; }
+  // to it.  Returns nullptr otherwise.
+  inline std::string *GetIfAllocated() const {
+    auto allocated = as_int() ^ kAllocated;
+    if (allocated & kMask) return nullptr;
+
+    auto ptr = reinterpret_cast<std::string*>(allocated);
+    PROTOBUF_ASSUME(ptr != nullptr);
+    return ptr;
+  }
 
   // Returns true if the current string is an arena allocated value.
   // This means it's either a mutable or fixed size arena string.
@@ -224,8 +231,8 @@ static_assert(std::is_trivial<TaggedStringPtr>::value,
 // Because ArenaStringPtr is used in oneof unions, its constructor is a NOP and
 // the field is always manually initialized via method calls.
 //
-// See TaggedPtr for more information about the types of string values being
+// See TaggedStringPtr for more information about the types of string values
-// held, and the mutable and ownership invariants for each type.
+// being held, and the mutable and ownership invariants for each type.
 struct PROTOBUF_EXPORT ArenaStringPtr {
   ArenaStringPtr() = default;
   constexpr ArenaStringPtr(ExplicitlyConstructedArenaString* default_value,

src/google/protobuf/compiler/plugin.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/descriptor.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/duration.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/empty.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/field_mask.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/port_def.inc

@@ -178,7 +178,7 @@
 #ifdef PROTOBUF_VERSION
 #error PROTOBUF_VERSION was previously defined
 #endif
-#define PROTOBUF_VERSION 3021001
+#define PROTOBUF_VERSION 3021002
 
 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
 #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined

src/google/protobuf/source_context.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/struct.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/stubs/common.h

@@ -82,7 +82,7 @@ namespace internal {
 
 // The current version, represented as a single integer to make comparison
 // easier:  major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 3021001
+#define GOOGLE_PROTOBUF_VERSION 3021002
 
 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
 #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""

src/google/protobuf/timestamp.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/type.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

src/google/protobuf/wrappers.pb.h

@@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.

version.json

@@ -1,17 +1,17 @@
 {
     "21.x": {
-        "protoc_version": "21.2-dev",
+        "protoc_version": "21.2",
         "lts": false,
-        "date": "2022-05-27",
+        "date": "2022-06-23",
         "languages": {
-            "cpp": "3.21.2-dev",
+            "cpp": "3.21.2",
-            "csharp": "3.21.2-dev",
+            "csharp": "3.21.2",
-            "java": "3.21.2-dev",
+            "java": "3.21.2",
-            "javascript": "3.21.2-dev",
+            "javascript": "3.21.2",
-            "objectivec": "3.21.2-dev",
+            "objectivec": "3.21.2",
-            "php": "3.21.2-dev",
+            "php": "3.21.2",
-            "python": "4.21.2-dev",
+            "python": "4.21.2",
-            "ruby": "3.21.2-dev"
+            "ruby": "3.21.2"
         }
     }
 }