diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 8ab24bca85801..e135373f36c7e 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -19,9 +19,9 @@ jobs: config: - { name: Optimized, flags: --config=opt } - { name: Debug, flags: --config=dbg } - - { name: ASAN, flags: --config=asan, runner: ubuntu-20-large } - - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-large } - - { name: TSAN, flags: --config=tsan, runner: ubuntu-20-large } + - { name: ASAN, flags: --config=asan, runner: ubuntu-20-4core } + - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-4core } + - { name: TSAN, flags: --config=tsan, runner: ubuntu-20-4core } - { name: UBSAN, flags: --config=ubsan } - { name: No-RTTI, flags: --cxxopt=-fno-rtti } include: @@ -80,7 +80,7 @@ jobs: matrix: arch: [x86_64, aarch64] name: Linux Release ${{ matrix.arch}} - runs-on: ubuntu-latest + runs-on: ubuntu-20-4core steps: - name: Checkout pending changes uses: protocolbuffers/protobuf-ci/checkout@v3 @@ -426,6 +426,12 @@ jobs: arch: ${{ matrix.windows-arch || 'x64' }} vsversion: ${{ matrix.vsversion }} + # Workaround for Abseil incompatibility with CMake 3.30 (b/352354235). + - name: Downgrade CMake + if: ${{ runner.os == 'Windows' }} + run: choco install cmake --version 3.29.6 --force + shell: bash + # Workaround for incompatibility between gcloud and windows-2019 runners. - name: Install Python if: ${{ matrix.python-version }} diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml index e0e0d4d12870f..3ae8705d53208 100644 --- a/.github/workflows/test_upb.yml +++ b/.github/workflows/test_upb.yml @@ -20,7 +20,7 @@ jobs: - { name: "Bazel 7", bazel_version: "7.1.1" } - { name: "Fastbuild" } - { name: "Optimized", flags: "-c opt" } - - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-large } + - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-4core } - { name: "UBSAN", flags: "--config=ubsan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/... -//lua/..." } - { name: "32-bit", flags: "--copt=-m32 --linkopt=-m32", exclude-targets: "-//benchmarks:benchmark -//python/..." } # TODO: Add 32-bit ASAN test @@ -172,13 +172,13 @@ jobs: # supported Python versions and assume this gives us sufficient test # coverage. - { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'binary' } - - { os: macos-11, python-version: "3.8", architecture: x64, type: 'binary' } + - { os: macos-12, python-version: "3.8", architecture: x64, type: 'binary' } - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'binary' } - - { os: macos-12, python-version: "3.12", architecture: x64, type: 'binary' } + - { os: macos-13, python-version: "3.12", architecture: x64, type: 'binary' } - { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source' } - - { os: macos-11, python-version: "3.8", architecture: x64, type: 'source' } + - { os: macos-12, python-version: "3.8", architecture: x64, type: 'source' } - { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'source' } - - { os: macos-12, python-version: "3.12", architecture: x64, type: 'source' } + - { os: macos-13, python-version: "3.12", architecture: x64, type: 'source' } # Windows uses the full API up until Python 3.10. - { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary' } diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b51e9722d90b..807ef014afea6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "5.27.2") +set(protobuf_VERSION_STRING "5.27.3") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/MODULE.bazel b/MODULE.bazel index f5a4afa5fd19a..d5b60ea11032e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,7 +2,7 @@ # https://github.com/protocolbuffers/protobuf/issues/14313 module( name = "protobuf", - version = "27.2", # Automatically updated on release + version = "27.3", # Automatically updated on release compatibility_level = 1, repo_name = "com_google_protobuf", ) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index c386b90afda95..cf9efda99d01b 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '5.27.2' + s.version = '5.27.3' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' diff --git a/Protobuf.podspec b/Protobuf.podspec index d405322e20b12..aa85c96008de2 100644 --- 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.27.2' + s.version = '3.27.3' 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/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl index f667a40881fd4..46b60252f62ba 100644 --- a/build_defs/cpp_opts.bzl +++ b/build_defs/cpp_opts.bzl @@ -15,7 +15,6 @@ COPTS = select({ "/wd4506", # no definition for inline function 'function' "/wd4800", # 'type' : forcing value to bool 'true' or 'false' (performance warning) "/wd4996", # The compiler encountered a deprecated declaration. - "/utf-8", # Set source and execution character sets to UTF-8 ], "//conditions:default": [ "-DHAVE_ZLIB", diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index febe2404fa5eb..759e166caced4 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.27.2 + 3.27.3 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 7aa480c7e278e..4ab5f8a0d9450 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.27.2 + 3.27.3 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 12e99cbf0f0db..61243884b82c1 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 4.27.2 + 4.27.3 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index e3c9d00bd928b..ae25bc3d873b2 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.27.2 + 4.27.3 protobuf-java diff --git a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java index b6fc86e0a1b5d..94b28d6d1df15 100644 --- a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java +++ b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java @@ -28,7 +28,7 @@ public enum RuntimeDomain { public static final RuntimeDomain DOMAIN = RuntimeDomain.PUBLIC; public static final int MAJOR = 4; public static final int MINOR = 27; - public static final int PATCH = 2; + public static final int PATCH = 3; public static final String SUFFIX = ""; private static final String VERSION_STRING = versionString(MAJOR, MINOR, PATCH, SUFFIX); diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index e981e94039fb5..43fe7aac03eab 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.27.2 + 4.27.3 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 5c25135e5751a..40ae7d0f0e534 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.27.2 + 4.27.3 protobuf-kotlin diff --git a/java/lite/pom.xml b/java/lite/pom.xml index f67e24165b397..3a4b118012ae9 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.27.2 + 4.27.3 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 06a42795e6196..5054acde9b3a2 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.27.2 + 4.27.3 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 605574b02cd25..06fb22970d57c 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 4.27.2 + 4.27.3 pom Protobuf Compiler diff --git a/java/util/pom.xml b/java/util/pom.xml index 3302e434e9a11..2d474b2f5e643 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.27.2 + 4.27.3 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.c b/php/ext/google/protobuf/protobuf.c index 1f36ed09529e8..1f6889ff7432b 100644 --- a/php/ext/google/protobuf/protobuf.c +++ b/php/ext/google/protobuf/protobuf.c @@ -143,11 +143,11 @@ static PHP_GINIT_FUNCTION(protobuf) { protobuf_globals->global_symtab = NULL; } static PHP_RINIT_FUNCTION(protobuf) { // Create the global generated pool. // Reuse the symtab (if any) left to us by the last request. - upb_DefPool* symtab = PROTOBUF_G(global_symtab); - if (!symtab) { - PROTOBUF_G(global_symtab) = symtab = upb_DefPool_New(); - zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, 0); - zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, 0); + if (!PROTOBUF_G(global_symtab)) { + zend_bool persistent = PROTOBUF_G(keep_descriptor_pool_after_request); + PROTOBUF_G(global_symtab) = upb_DefPool_New(); + zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, persistent); + zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, persistent); } zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0); @@ -308,7 +308,7 @@ zend_module_entry protobuf_module_entry = { protobuf_functions, // function list PHP_MINIT(protobuf), // process startup PHP_MSHUTDOWN(protobuf), // process shutdown - PHP_RINIT(protobuf), // request shutdown + PHP_RINIT(protobuf), // request startup PHP_RSHUTDOWN(protobuf), // request shutdown NULL, // extension info PHP_PROTOBUF_VERSION, // extension version diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index c966b65f41c52..b80436d3124ff 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "4.27.2" +#define PHP_PROTOBUF_VERSION "4.27.3" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff --git a/protobuf_version.bzl b/protobuf_version.bzl index bba645c1c5271..4363bcbef41ce 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,6 +1,6 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "27.2" -PROTOBUF_JAVA_VERSION = "4.27.2" -PROTOBUF_PYTHON_VERSION = "5.27.2" -PROTOBUF_PHP_VERSION = "4.27.2" -PROTOBUF_RUBY_VERSION = "4.27.2" +PROTOC_VERSION = "27.3" +PROTOBUF_JAVA_VERSION = "4.27.3" +PROTOBUF_PYTHON_VERSION = "5.27.3" +PROTOBUF_PHP_VERSION = "4.27.3" +PROTOBUF_RUBY_VERSION = "4.27.3" diff --git a/protos/protos_extension_lock_test.cc b/protos/protos_extension_lock_test.cc index cc02bc57d5521..9c2444b606fef 100644 --- a/protos/protos_extension_lock_test.cc +++ b/protos/protos_extension_lock_test.cc @@ -102,8 +102,6 @@ void TestConcurrentExtensionAccess(::protos::ExtensionRegistry registry) { test_theme(); test_theme_extension(); } -#ifndef _MSC_VER -// TODO Re-enable this once github runner issue is resolved. TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothLazy) { ::upb::Arena arena; @@ -122,7 +120,5 @@ TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothEager) { {{&theme, &ThemeExtension::theme_extension}, arena}); } -#endif // _MSC_VER - } // namespace } // namespace protos_generator::test::protos diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 86534c17a2b34..297cccfbfc0ab 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -7,4 +7,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '5.27.2' +__version__ = '5.27.3' diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py index 67f52ca4c6e7e..36d67dca095f7 100644 --- a/python/google/protobuf/runtime_version.py +++ b/python/google/protobuf/runtime_version.py @@ -31,7 +31,7 @@ class VersionError(Exception): DOMAIN = Domain.PUBLIC MAJOR = 5 MINOR = 27 -PATCH = 2 +PATCH = 3 SUFFIX = '' diff --git a/ruby/ext/google/protobuf_c/defs.c b/ruby/ext/google/protobuf_c/defs.c index 5ef73d5ac9d30..7fd834acf617b 100644 --- a/ruby/ext/google/protobuf_c/defs.c +++ b/ruby/ext/google/protobuf_c/defs.c @@ -1510,7 +1510,7 @@ static VALUE MethodDescriptor_initialize(VALUE _self, VALUE cookie, } RB_OBJ_WRITE(_self, &self->descriptor_pool, descriptor_pool); - self->methoddef = (const upb_ServiceDef*)NUM2ULL(ptr); + self->methoddef = (const upb_MethodDef*)NUM2ULL(ptr); return Qnil; } diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 1c6f44f8a05d6..20dac7255fd2a 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "4.27.2" + s.version = "4.27.3" 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" diff --git a/ruby/pom.xml b/ruby/pom.xml index 3a3fac5c99f6f..6146b91ddf9dd 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 4.27.2 + 4.27.3 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 4.27.2 + 4.27.3 org.jruby diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 3476996cd5a6c..4b27db8b4b765 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/any.pb.h" diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index e6c171767d7cc..14059066d444f 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -281,8 +281,6 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message 36, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Any_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 9f6038ad30426..8c1533d3f7ba4 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/api.pb.h" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 2de86ad4c574f..beaa2717fc2fb 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -241,8 +241,6 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message 38, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Mixin_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -504,8 +502,6 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message 68, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Method_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -785,8 +781,6 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message 39, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Api_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index 647f804d2043e..083a239eaa3c4 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -1904,6 +1904,18 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { $pbi$::ParseContext* ctx); )cc"); }}, + {"raw_default_instance", + [&] { + // We can't make a constexpr pointer to the global if we have DLL + // linkage so skip this. The fallback in + // `MessageLite::GetStrongPointerForType` will do the right thing in + // those platforms. + if (!options_.dllexport_decl.empty()) return; + p->Emit(R"cc( + static constexpr const void* _raw_default_instance_ = + &_$classname$_default_instance_; + )cc"); + }}, {"decl_impl", [&] { GenerateImplDefinition(p); }}, {"split_friend", [&] { @@ -2043,8 +2055,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) { $decl_data$; $post_loop_handler$; - static constexpr const void* _raw_default_instance_ = - &_$classname$_default_instance_; + $raw_default_instance$; friend class ::$proto_ns$::MessageLite; friend class ::$proto_ns$::Arena; diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 14ddd5119f2bd..1d305634fc039 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/compiler/java/java_features.pb.h" diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 0c813fca06095..2c9c6011546d7 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -276,8 +276,6 @@ class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_JavaFeatures_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc index 7b2f5dca4b915..a5c7537f4ddce 100644 --- a/src/google/protobuf/compiler/main.cc +++ b/src/google/protobuf/compiler/main.cc @@ -35,10 +35,7 @@ namespace protobuf { namespace compiler { int ProtobufMain(int argc, char* argv[]) { -#ifndef _MSC_VER - // TODO Re-enable this once github runner issue is resolved. absl::InitializeLog(); -#endif // !_MSC_VER CommandLineInterface cli; cli.AllowPlugins("protoc-"); diff --git a/src/google/protobuf/compiler/main_no_generators.cc b/src/google/protobuf/compiler/main_no_generators.cc index 82ba9238eee2a..83a44e8b4c5ed 100644 --- a/src/google/protobuf/compiler/main_no_generators.cc +++ b/src/google/protobuf/compiler/main_no_generators.cc @@ -19,10 +19,7 @@ namespace compiler { // This is a version of protoc that has no built-in code generators. // See go/protobuf-toolchain-protoc int ProtocMain(int argc, char* argv[]) { -#ifndef _MSC_VER - // TODO Re-enable this once github runner issue is resolved. absl::InitializeLog(); -#endif // !_MSC_VER CommandLineInterface cli; cli.AllowPlugins("protoc-"); diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 533f34f052d9f..2e680e0345a2b 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/compiler/plugin.pb.h" diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 2528ffa162437..873c0e80e1eac 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -303,8 +303,6 @@ class PROTOC_EXPORT Version final : public ::google::protobuf::Message 47, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Version_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -537,8 +535,6 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf 86, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_CodeGeneratorResponse_File_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -794,8 +790,6 @@ class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Mes 60, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_CodeGeneratorResponse_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1063,8 +1057,6 @@ class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Mess 79, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_CodeGeneratorRequest_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h index 6ba9cc9d0f8c6..af291806f67ba 100644 --- a/src/google/protobuf/compiler/versions.h +++ b/src/google/protobuf/compiler/versions.h @@ -53,9 +53,9 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "5.27.2" -#define PROTOBUF_JAVA_VERSION_STRING "4.27.2" -#define PROTOBUF_PYTHON_VERSION_STRING "5.27.2" +#define PROTOBUF_CPP_VERSION_STRING "5.27.3" +#define PROTOBUF_JAVA_VERSION_STRING "4.27.3" +#define PROTOBUF_PYTHON_VERSION_STRING "5.27.3" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index 3ca1b0187a1a1..d4711be5c59c3 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/cpp_features.pb.h" diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 8d4ee876105db..60864434a0c4a 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -278,8 +278,6 @@ class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_CppFeatures_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 40f59194351f9..b5730d10a31bc 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index e0c81ee77dc17..0d629d0fc6dfa 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -870,8 +870,6 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::prot 62, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_UninterpretedOption_NamePart_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1135,8 +1133,6 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf: 106, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_SourceCodeInfo_Location_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1395,8 +1391,6 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::prot 64, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_GeneratedCodeInfo_Annotation_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1615,8 +1609,6 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::proto 71, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FieldOptions_FeatureSupport_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1809,8 +1801,6 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::proto 57, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FieldOptions_EditionDefault_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -2348,8 +2338,6 @@ class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FeatureSet_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -2587,8 +2575,6 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google: 71, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_ExtensionRangeOptions_Declaration_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -2776,8 +2762,6 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::goo 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_EnumDescriptorProto_EnumReservedRange_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -2962,8 +2946,6 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::pro 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_DescriptorProto_ReservedRange_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -3238,8 +3220,6 @@ class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Mes 75, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_UninterpretedOption_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -3424,8 +3404,6 @@ class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_SourceCodeInfo_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -3603,8 +3581,6 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Messa 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_GeneratedCodeInfo_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -3812,8 +3788,6 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FeatureSetDefaults_FeatureSetEditionDefault_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -4205,8 +4179,6 @@ class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message 0, 12> _table_; - static constexpr const void* _raw_default_instance_ = - &_ServiceOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -4587,8 +4559,6 @@ class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message 0, 7> _table_; - static constexpr const void* _raw_default_instance_ = - &_OneofOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -5012,8 +4982,6 @@ class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message 0, 12> _table_; - static constexpr const void* _raw_default_instance_ = - &_MethodOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -5455,8 +5423,6 @@ class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message 0, 7> _table_; - static constexpr const void* _raw_default_instance_ = - &_MessageOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -6149,8 +6115,6 @@ class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message 202, 12> _table_; - static constexpr const void* _raw_default_instance_ = - &_FileOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -6800,8 +6764,6 @@ class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message 0, 7> _table_; - static constexpr const void* _raw_default_instance_ = - &_FieldOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -7023,8 +6985,6 @@ class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Mess 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FeatureSetDefaults_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -7454,8 +7414,6 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M 0, 12> _table_; - static constexpr const void* _raw_default_instance_ = - &_ExtensionRangeOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -7877,8 +7835,6 @@ class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Messag 0, 7> _table_; - static constexpr const void* _raw_default_instance_ = - &_EnumValueOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -8297,8 +8253,6 @@ class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message 0, 7> _table_; - static constexpr const void* _raw_default_instance_ = - &_EnumOptions_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -8502,8 +8456,6 @@ class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Me 49, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_OneofDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -8763,8 +8715,6 @@ class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::M 71, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_MethodDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -9155,8 +9105,6 @@ class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Me 96, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FieldDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -9377,8 +9325,6 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf 53, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_EnumValueDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -9585,8 +9531,6 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::pr 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_DescriptorProto_ExtensionRange_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -9805,8 +9749,6 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf:: 51, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_ServiceDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -10073,8 +10015,6 @@ class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Mes 61, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_EnumDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -10434,8 +10374,6 @@ class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message 65, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_DescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -10846,8 +10784,6 @@ class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Mes 79, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FileDescriptorProto_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -11042,8 +10978,6 @@ class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Messa 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FileDescriptorSet_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index baf0a82e986dd..c1f9c6bd3b37e 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/duration.pb.h" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index dda70c64ad591..cbf2b8cf8f2c9 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -221,8 +221,6 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Duration_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index 0157048f676a6..57c5de8123a19 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/empty.pb.h" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index b70dc1147e162..2a1a10f51ac29 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -185,8 +185,6 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Empty_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 499da92eac52c..c0b2ab1e1bbb8 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/field_mask.pb.h" diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 9cc6df15dec8f..c6b599290fe6b 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -228,8 +228,6 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message 39, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FieldMask_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/port.h b/src/google/protobuf/port.h index 4fec7dc138086..afb6f846a6d0e 100644 --- a/src/google/protobuf/port.h +++ b/src/google/protobuf/port.h @@ -49,31 +49,35 @@ inline PROTOBUF_ALWAYS_INLINE void StrongPointer(T* var) { #endif } -// Similar to the overload above, but optimized for constant inputs. +#if defined(__x86_64__) && defined(__linux__) && !defined(__APPLE__) && \ + !defined(__ANDROID__) && defined(__clang__) && __clang_major__ >= 19 +// Optimized implementation for clang where we can generate a relocation without +// adding runtime instructions. template inline PROTOBUF_ALWAYS_INLINE void StrongPointer() { -#if defined(__x86_64__) && defined(__linux__) && !defined(__APPLE__) && \ - !defined(__ANDROID__) && defined(__clang__) && __clang_major__ >= 19 && \ - !defined(PROTOBUF_INTERNAL_TEMPORARY_STRONG_POINTER_OPT_OUT) // This injects a relocation in the code path without having to run code, but // we can only do it with a newer clang. asm(".reloc ., BFD_RELOC_NONE, %p0" ::"Ws"(ptr)); -#else - StrongPointer(ptr); -#endif } template inline PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() { - constexpr auto ptr = T::template GetStrongPointerForType(); -#if defined(__cpp_nontype_template_args) && \ - __cpp_nontype_template_args >= 201411L - // We can only use `ptr` as a template parameter since C++17 + static constexpr auto ptr = T::template GetStrongPointerForType(); return StrongPointer(); -#else - return StrongPointer(ptr); -#endif } +#else // .reloc +// Portable fallback. It usually generates a single LEA instruction or +// equivalent. +template +inline PROTOBUF_ALWAYS_INLINE void StrongPointer() { + StrongPointer(ptr); +} + +template +inline PROTOBUF_ALWAYS_INLINE void StrongReferenceToType() { + return StrongPointer(T::template GetStrongPointerForType()); +} +#endif // .reloc // See comments on `AllocateAtLeast` for information on size returning new. diff --git a/src/google/protobuf/runtime_version.h b/src/google/protobuf/runtime_version.h index 4a30cf6563542..245cc8b575e0e 100644 --- a/src/google/protobuf/runtime_version.h +++ b/src/google/protobuf/runtime_version.h @@ -9,7 +9,7 @@ #error PROTOBUF_VERSION_SUFFIX was previously defined #endif // PROTOBUF_VERSION_SUFFIX -#define PROTOBUF_VERSION 5027002 +#define PROTOBUF_VERSION 5027003 #define PROTOBUF_VERSION_SUFFIX "" #endif // GOOGLE_PROTOBUF_RUNTIME_VERSION_H__ diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 56f6f08ed043f..d6db977d17d5c 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/source_context.pb.h" diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index abc5455c7cc3e..03e83cabd9216 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -216,8 +216,6 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message 47, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_SourceContext_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 02fe4ce89c142..4ae19bced6c73 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/struct.pb.h" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index fe8a4152236e9..b6967dc88a69b 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -262,8 +262,6 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_ListValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -438,8 +436,6 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message 37, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Struct_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -738,8 +734,6 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message 42, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Value_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 4d941703c154c..a8391df41a432 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -45,7 +45,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 5027002 +#define GOOGLE_PROTOBUF_VERSION 5027003 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index 0208e3ef8f5b0..8f6050be657bc 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/timestamp.pb.h" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 9f2efd581422a..9f9018e8dce43 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -221,8 +221,6 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Timestamp_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 3ce3b39d33bee..da6216a0de657 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/type.pb.h" diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 213eba40a3c9f..5d6ea5c35e600 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -366,8 +366,6 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message 35, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Option_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -726,8 +724,6 @@ class PROTOBUF_EXPORT Field final : public ::google::protobuf::Message 72, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Field_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -941,8 +937,6 @@ class PROTOBUF_EXPORT EnumValue final : public ::google::protobuf::Message 38, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_EnumValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1229,8 +1223,6 @@ class PROTOBUF_EXPORT Type final : public ::google::protobuf::Message 46, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Type_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1493,8 +1485,6 @@ class PROTOBUF_EXPORT Enum final : public ::google::protobuf::Message 40, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Enum_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index 2ef4b2dfe5803..19ed061d25f64 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #include "google/protobuf/wrappers.pb.h" diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index f2a559f56ae4f..52ba28b0a4016 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 5.27.2 +// Protobuf C++ Version: 5.27.3 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5027002 +#if PROTOBUF_VERSION != 5027003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" @@ -234,8 +234,6 @@ class PROTOBUF_EXPORT UInt64Value final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_UInt64Value_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -405,8 +403,6 @@ class PROTOBUF_EXPORT UInt32Value final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_UInt32Value_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -582,8 +578,6 @@ class PROTOBUF_EXPORT StringValue final : public ::google::protobuf::Message 41, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_StringValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -753,8 +747,6 @@ class PROTOBUF_EXPORT Int64Value final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Int64Value_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -924,8 +916,6 @@ class PROTOBUF_EXPORT Int32Value final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_Int32Value_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1095,8 +1085,6 @@ class PROTOBUF_EXPORT FloatValue final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_FloatValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1266,8 +1254,6 @@ class PROTOBUF_EXPORT DoubleValue final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_DoubleValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1443,8 +1429,6 @@ class PROTOBUF_EXPORT BytesValue final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_BytesValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; @@ -1614,8 +1598,6 @@ class PROTOBUF_EXPORT BoolValue final : public ::google::protobuf::Message 0, 2> _table_; - static constexpr const void* _raw_default_instance_ = - &_BoolValue_default_instance_; friend class ::google::protobuf::MessageLite; friend class ::google::protobuf::Arena; diff --git a/version.json b/version.json index 3d2a2ff4ce715..2cbe244eaaeaa 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "27.x": { - "protoc_version": "27.2", + "protoc_version": "27.3", "lts": false, - "date": "2024-06-25", + "date": "2024-07-31", "languages": { - "cpp": "5.27.2", - "csharp": "3.27.2", - "java": "4.27.2", - "javascript": "3.27.2", - "objectivec": "3.27.2", - "php": "4.27.2", - "python": "5.27.2", - "ruby": "4.27.2" + "cpp": "5.27.3", + "csharp": "3.27.3", + "java": "4.27.3", + "javascript": "3.27.3", + "objectivec": "3.27.3", + "php": "4.27.3", + "python": "5.27.3", + "ruby": "4.27.3" } } } \ No newline at end of file