Internal changes

PiperOrigin-RevId: 542310031

src/google/protobuf/BUILD.bazel

@@ -398,6 +398,7 @@ cc_library(
         ":varint_shuffle",
         "//src/google/protobuf/io",
         "//src/google/protobuf/stubs:lite",
+        "@com_google_absl//absl/base",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/hash",

src/google/protobuf/compiler/cpp/extension.cc

@@ -44,6 +44,13 @@ namespace google {
 namespace protobuf {
 namespace compiler {
 namespace cpp {
+namespace {
+
+bool RequiresLazyInitialization(const FieldDescriptor* descriptor) {
+  return false;
+}
+
+}  // namespace
 
 ExtensionGenerator::ExtensionGenerator(const FieldDescriptor* descriptor,
                                        const Options& options,
@@ -172,12 +179,20 @@ void ExtensionGenerator::GenerateDefinition(io::Printer* printer) {
         "#endif\n");
   }
 
-  format(
-      "PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 "
-      "::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n"
-      "    ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$>\n"
-      "  $scoped_name$($constant_name$, $1$, $verify_fn$);\n",
-      default_str);
+  if (RequiresLazyInitialization(descriptor_)) {
+    format(
+        "PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY2\n"
+        "::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n"
+        "    ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$>\n"
+        "  $scoped_name$($constant_name$);\n");
+  } else {
+    format(
+        "PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 "
+        "::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n"
+        "    ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$>\n"
+        "  $scoped_name$($constant_name$, $1$, $verify_fn$);\n",
+        default_str);
+  }
 }
 
 }  // namespace cpp

src/google/protobuf/compiler/cpp/file.cc

@@ -1137,11 +1137,12 @@ void FileGenerator::GenerateReflectionInitializationCode(io::Printer* p) {
         }
       )cc");
 
-  // For descriptor.proto we want to avoid doing any dynamic initialization,
-  // because in some situations that would otherwise pull in a lot of
-  // unnecessary code that can't be stripped by --gc-sections. Descriptor
-  // initialization will still be performed lazily when it's needed.
-  if (file_->name() != "net/proto2/proto/descriptor.proto") {
+  // For descriptor.proto and cpp_features.proto we want to avoid doing any
+  // dynamic initialization, because in some situations that would otherwise
+  // pull in a lot of unnecessary code that can't be stripped by --gc-sections.
+  // Descriptor initialization will still be performed lazily when it's needed.
+  if (file_->name() != "net/proto2/proto/descriptor.proto"
+  ) {
     p->Emit({{"dummy", UniqueName("dynamic_init_dummy", file_, options_)}},
             R"cc(
               // Force running AddDescriptors() at dynamic initialization time.

src/google/protobuf/descriptor.cc

@@ -1964,10 +1964,11 @@ DescriptorPool* DescriptorPool::internal_generated_pool() {
 
 const DescriptorPool* DescriptorPool::generated_pool() {
   const DescriptorPool* pool = internal_generated_pool();
-  // Ensure that descriptor.proto gets registered in the generated pool. It is a
-  // special case because it is included in the full runtime. We have to avoid
-  // registering it pre-main, because we need to ensure that the linker
-  // --gc-sections step can strip out the full runtime if it is unused.
+  // Ensure that descriptor.proto and cpp_features.proto get registered in the
+  // generated pool. They're special cases because they're included in the full
+  // runtime. We have to avoid registering it pre-main, because we need to
+  // ensure that the linker --gc-sections step can strip out the full runtime if
+  // it is unused.
   DescriptorProto::descriptor();
   return pool;
 }
@@ -1997,6 +1998,7 @@ void DescriptorPool::InternalAddGeneratedFile(
   // Therefore, when we parse one, we have to be very careful to avoid using
   // any descriptor-based operations, since this might cause infinite recursion
   // or deadlock.
+  absl::MutexLockMaybe lock(internal_generated_pool()->mutex_);
   ABSL_CHECK(GeneratedDatabase()->Add(encoded_file_descriptor, size));
 }
 
@@ -4348,7 +4350,8 @@ DescriptorBuilder::DescriptorBuilder(
       error_collector_(error_collector),
       had_errors_(false),
       possible_undeclared_dependency_(nullptr),
-      undefine_resolved_name_("") {}
+      undefine_resolved_name_("") {
+}
 
 DescriptorBuilder::~DescriptorBuilder() {}
 

src/google/protobuf/descriptor_unittest.cc

@@ -34,6 +34,8 @@
 //
 // This file makes extensive use of RFC 3092.  :)
 
+#include "google/protobuf/descriptor.h"
+
 #include <cstdlib>
 #include <limits>
 #include <memory>
@@ -55,7 +57,6 @@
 #include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor_database.h"
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/text_format.h"

src/google/protobuf/extension_set.h

@@ -41,10 +41,12 @@
 #include <algorithm>
 #include <cassert>
 #include <string>
+#include <type_traits>
 #include <utility>
 #include <vector>
 
 #include "google/protobuf/stubs/common.h"
+#include "absl/base/call_once.h"
 #include "absl/container/btree_map.h"
 #include "absl/log/absl_check.h"
 #include "google/protobuf/port.h"
@@ -1535,6 +1537,7 @@ class ExtensionIdentifier {
 extern PROTOBUF_ATTRIBUTE_WEAK ExtensionSet::LazyMessageExtension*
 MaybeCreateLazyExtension(Arena* arena);
 
+
 }  // namespace internal
 
 // Call this function to ensure that this extensions's reflection is linked into