update version (#107)

oathdruid · oathdruid · commit def41819aea2 · 2025-09-21T19:03:18.000+08:00
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.6.1
+8.4.1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,14 +13,12 @@ jobs:
       matrix:
         compiler: [{name: gcc, flag: --action_env=CC=gcc-14}, {name: clang, flag: --action_env=CC=clang-18}]
         mode: [{name: dbg, flag: --compilation_mode=dbg}, {name: opt, flag: --compilation_mode=opt}]
-        std: [{name: c++20, flag: --cxxopt=-std=c++20}, {name: c++14, flag: --cxxopt=-std=c++14}]
+        std: [{name: c++20, flag: --cxxopt=-std=c++20}, {name: c++17, flag: --cxxopt=-std=c++17}]
         stdlib: [{name: stdlibc++}, {name: libc++, flag: --cxxopt=-stdlib=libc++ --linkopt=-stdlib=libc++}]
         feature: [{name: asan, flag: --features=asan}, {name: tsan, flag: --features=tsan}]
         exclude:
         - compiler: {name: gcc}
           stdlib: {name: libc++}
-        - std: {name: c++14}
-          feature: {name: tsan}
     runs-on: ubuntu-24.04
     name: basic-${{matrix.compiler.name}}-${{matrix.mode.name}}-${{matrix.std.name}}-${{matrix.stdlib.name}}-${{matrix.feature.name}}
     steps:
@@ -39,55 +37,38 @@ jobs:
         path: bazel-disk
         key: bazel-disk-basic-${{matrix.compiler.name}}-${{matrix.mode.name}}-${{matrix.std.name}}-${{matrix.stdlib.name}}-${{matrix.feature.name}}-${{github.sha}}
 
-  arenastring:
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [{name: gcc, flag: --action_env=CC=gcc-14}, {name: clang, flag: --action_env=CC=clang-18}]
-        stdlib: [{name: stdlibc++}, {name: libc++, flag: --cxxopt=-stdlib=libc++ --linkopt=-stdlib=libc++}]
-        mutable: [{name: default}, {name: half, flag: --config=arenastring}, {name: full, flag: --config=mutable-donated-string}]
-        exclude:
-        - compiler: {name: gcc}
-          stdlib: {name: libc++}
-        - compiler: {name: clang}
-          mutable: {name: half}
-        - compiler: {name: clang}
-          mutable: {name: full}
-    runs-on: ubuntu-24.04
-    name: arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/cache/restore@v4
-      with:
-        path: bazel-disk
-        key: bazel-disk-arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}-${{github.sha}}
-        restore-keys: bazel-disk-arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}-
-    - if: ${{matrix.stdlib.name == 'libc++'}}
-      run: sudo apt install libc++-18-dev libc++abi-18-dev
-    - run: sed -i "/single_version_override.*protobuf/s/version = '[^']*'/version = '28.3.arenastring'/" MODULE.bazel
-    - run: bazel test --compilation_mode=opt --disk_cache=bazel-disk --verbose_failures --test_output=errors --features=asan --registry=https://bcr.bazel.build --registry=file://%workspace%/registry ${{matrix.compiler.flag}} ${{matrix.stdlib.flag}} ${{matrix.mutable.flag}} test/...
-    - uses: actions/cache/save@v4
-      if: always()
-      with:
-        path: bazel-disk
-        key: bazel-disk-arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}-${{github.sha}}
-
-  cpp14-coroutine:
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/cache/restore@v4
-      with:
-        path: bazel-disk
-        key: bazel-disk-c++14-coroutine-${{github.sha}}
-        restore-keys: bazel-disk-c++14-coroutine-
-    - run: sed -i "/single_version_override.*protobuf/s/version = '[^']*'/version = '27.5'/" MODULE.bazel
-    - run: bazel test --disk_cache=bazel-disk --verbose_failures --test_output=errors --action_env=CC=gcc-12 --cxxopt=-std=c++14 --cxxopt=-fcoroutines --cxxopt=-fconcepts test/...
-    - uses: actions/cache/save@v4
-      if: always()
-      with:
-        path: bazel-disk
-        key: bazel-disk-c++14-coroutine-${{github.sha}}
+  #arenastring:
+  #  strategy:
+  #    fail-fast: false
+  #    matrix:
+  #      compiler: [{name: gcc, flag: --action_env=CC=gcc-14}, {name: clang, flag: --action_env=CC=clang-18}]
+  #      stdlib: [{name: stdlibc++}, {name: libc++, flag: --cxxopt=-stdlib=libc++ --linkopt=-stdlib=libc++}]
+  #      mutable: [{name: default}, {name: half, flag: --config=arenastring}, {name: full, flag: --config=mutable-donated-string}]
+  #      exclude:
+  #      - compiler: {name: gcc}
+  #        stdlib: {name: libc++}
+  #      - compiler: {name: clang}
+  #        mutable: {name: half}
+  #      - compiler: {name: clang}
+  #        mutable: {name: full}
+  #  runs-on: ubuntu-24.04
+  #  name: arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}
+  #  steps:
+  #  - uses: actions/checkout@v4
+  #  - uses: actions/cache/restore@v4
+  #    with:
+  #      path: bazel-disk
+  #      key: bazel-disk-arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}-${{github.sha}}
+  #      restore-keys: bazel-disk-arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}-
+  #  - if: ${{matrix.stdlib.name == 'libc++'}}
+  #    run: sudo apt install libc++-18-dev libc++abi-18-dev
+  #  - run: sed -i "/single_version_override.*protobuf/s/version = '[^']*'/version = '28.3.arenastring'/" MODULE.bazel
+  #  - run: bazel test --compilation_mode=opt --disk_cache=bazel-disk --verbose_failures --test_output=errors --features=asan --registry=https://bcr.bazel.build --registry=file://%workspace%/registry ${{matrix.compiler.flag}} ${{matrix.stdlib.flag}} ${{matrix.mutable.flag}} test/...
+  #  - uses: actions/cache/save@v4
+  #    if: always()
+  #    with:
+  #      path: bazel-disk
+  #      key: bazel-disk-arenastring-${{matrix.compiler.name}}-${{matrix.stdlib.name}}-${{matrix.mutable.name}}-${{github.sha}}
 
   aarch64:
     runs-on: ubuntu-24.04
@@ -118,7 +99,7 @@ jobs:
         path: bazel-disk
         key: bazel-disk-workspace-${{github.sha}}
         restore-keys: bazel-disk-workspace-
-    - run: bazel test --disk_cache=bazel-disk --verbose_failures --test_output=errors --enable_bzlmod=false test/...
+    - run: USE_BAZEL_VERSION=7.6.1 bazel test --disk_cache=bazel-disk --verbose_failures --test_output=errors --enable_bzlmod=false test/...
     - uses: actions/cache/save@v4
       if: always()
       with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(babylon VERSION 1.4.3)
+project(babylon VERSION 1.4.4)
 
 include(CTest)                      # for BUILD_TESTING option
 include(CMakePackageConfigHelpers)  # for write_basic_package_version_file
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
   name = 'babylon',
-  version = '1.4.3',
+  version = '1.4.4',
   compatibility_level = 1,
 )
 
@@ -11,19 +11,23 @@ module(
 bazel_dep(name = 'abseil-cpp', version = '20220623.1', repo_name = 'com_google_absl')
 bazel_dep(name = 'bazel_skylib', version = '1.0.3')
 bazel_dep(name = 'boost.preprocessor', version = '1.83.0.bcr.1')
-bazel_dep(name = 'boost.spirit', version = '1.83.0')
+bazel_dep(name = 'boost.spirit', version = '1.83.0.bcr.2')
 bazel_dep(name = 'fmt', version = '8.1.1')
 bazel_dep(name = 'protobuf', version = '3.19.6', repo_name = 'com_google_protobuf')
 ################################################################################
 
 ################################################################################
 # test only dependency
-single_version_override(module_name = 'abseil-cpp', version = '20240722.0')
-single_version_override(module_name = 'protobuf', version = '28.3')
-bazel_dep(name = 'googletest', version = '1.15.2', repo_name = 'com_google_googletest', dev_dependency = True)
-bazel_dep(name = 'platforms', version = '0.0.10', dev_dependency = True)
-bazel_dep(name = 'rules_cc', version = '0.0.13', dev_dependency = True)
-bazel_dep(name = 'rules_cuda', version = '0.2.3', dev_dependency = True)
+single_version_override(module_name = 'abseil-cpp', version = '20250814.0')
+single_version_override(module_name = 'bazel_skylib', version = '1.8.1')
+single_version_override(module_name = 'boost.preprocessor', version = '1.87.0')
+single_version_override(module_name = 'boost.spirit', version = '1.87.0')
+single_version_override(module_name = 'fmt', version = '11.2.0.bcr.1')
+single_version_override(module_name = 'protobuf', version = '32.1')
+bazel_dep(name = 'googletest', version = '1.17.0', repo_name = 'com_google_googletest', dev_dependency = True)
+bazel_dep(name = 'platforms', version = '1.0.0', dev_dependency = True)
+bazel_dep(name = 'rules_cc', version = '0.2.8', dev_dependency = True)
+bazel_dep(name = 'rules_cuda', version = '0.2.5', dev_dependency = True)
 
 # cuda toolchain
 cuda = use_extension('@rules_cuda//cuda:extensions.bzl', 'toolchain', dev_dependency = True)
diff --git a/bazel/cross_toolchain.bzl b/bazel/cross_toolchain.bzl
@@ -1,4 +1,4 @@
-load('@bazel_tools//tools/cpp:cc_configure.bzl', 'cc_autoconf_impl')
+load("@rules_cc//cc/private/toolchain:cc_configure.bzl", 'cc_autoconf_impl')
 
 def cross_config_cc_impl(repository_ctx):
   cc_autoconf_impl(repository_ctx,
diff --git a/src/babylon/absl_base_internal_invoke.h b/src/babylon/absl_base_internal_invoke.h
@@ -3,8 +3,7 @@
 #include "babylon/environment.h"
 
 // clang-format off
-#include BABYLON_EXTERNAL(absl/base/config.h)
-#include BABYLON_EXTERNAL(absl/base/internal/invoke.h)
+#include BABYLON_EXTERNAL(absl/meta/type_traits.h)
 // clang-format on
 
 // add some essential features for old LTS abseil-cpp
@@ -39,9 +38,6 @@
 #endif // !ABSL_LTS_RELEASE_VERSION
 
 #if BABYLON_TMP_NEED_INVOKE_RESULT_R || BABYLON_TMP_NEED_INVOKE_RESULT_T
-// clang-format off
-#include BABYLON_EXTERNAL(absl/meta/type_traits.h)
-// clang-format on
 
 // very old abseil-cpp dont have these macros
 #ifndef ABSL_NAMESPACE_BEGIN
diff --git a/src/babylon/reusable/allocator.hpp b/src/babylon/reusable/allocator.hpp
@@ -5,33 +5,20 @@
 #include <memory> // std::allocator_traits
 
 #if GOOGLE_PROTOBUF_VERSION >= 3000000
-namespace google {
-namespace protobuf {
-namespace internal {
 // protobuf为了避免用户错误地在非Arena内存上调用Arena版本的构造函数
 // 将其设置了protected访问控制，并且从3.12开始将protoc生成的Message子类设置为final
 // 但是为了实现SwissAllocator的兼容分配，需要在已经分配好的内存上调用Arena版本的构造函数
-// 这里利用了Arena对GenericTypeHandler<T>的friend声明来绕过访问了控制
-// 通过Arena::CreateInArenaStorageInternal来达到目的，这也是protobuf::Map所使用的方法
+// 这里利用了Message子类对google::protobuf::Arena::InternalHelper<T>的friend声明来绕过访问了控制
 // 采用了NeverUsed这个内部定义类型来特化GenericTypeHandler，确保这个特化不会产生副作用
 template <>
-class GenericTypeHandler<::babylon::NeverUsed> {
+class google::protobuf::Arena::InternalHelper<::babylon::NeverUsed> {
  public:
   template <typename T, typename... Args>
   inline static void construct(T* ptr, ::google::protobuf::Arena* arena,
                                Args&&... args) {
-#if GOOGLE_PROTOBUF_VERSION >= 3006000
-    ::google::protobuf::Arena::CreateInArenaStorageInternal(
-        ptr, arena, std::true_type(), ::std::forward<Args>(args)...);
-#else  // GOOGLE_PROTOBUF_VERSION < 3006000
-    ::google::protobuf::Arena::CreateInArenaStorageInternal(
-        ptr, arena, true_type(), ::std::forward<Args>(args)...);
-#endif // GOOGLE_PROTOBUF_VERSION < 3006000
+    new (ptr) T {arena, ::std::forward<Args>(args)...};
   }
 };
-} // namespace internal
-} // namespace protobuf
-} // namespace google
 #endif // GOOGLE_PROTOBUF_VERSION >= 3000000
 
 BABYLON_NAMESPACE_BEGIN
@@ -664,16 +651,14 @@ template <typename T>
 template <typename U, typename>
 inline void SwissAllocator<T>::construct(U* ptr) {
   ::google::protobuf::Arena& arena = *this->resource();
-  ::google::protobuf::internal::GenericTypeHandler<NeverUsed>::construct(
-      ptr, &arena);
+  ::google::protobuf::Arena::InternalHelper<NeverUsed>::construct(ptr, &arena);
 }
 
 template <typename T>
 template <typename U, typename V, typename>
 inline void SwissAllocator<T>::construct(U* ptr, V&& other) {
   ::google::protobuf::Arena& arena = *this->resource();
-  ::google::protobuf::internal::GenericTypeHandler<NeverUsed>::construct(
-      ptr, &arena);
+  ::google::protobuf::Arena::InternalHelper<NeverUsed>::construct(ptr, &arena);
   *ptr = ::std::forward<V>(other);
 }
 #endif // GOOGLE_PROTOBUF_VERSION >= 3000000
diff --git a/src/babylon/reusable/message.cpp b/src/babylon/reusable/message.cpp
@@ -117,60 +117,6 @@ void MessageAllocationMetadata::initialize(
   _initialized = true;
 }
 
-void MessageAllocationMetadata::FieldAllocationMetadata::update_repeated_field(
-    const ::google::protobuf::Message& message,
-    const ::google::protobuf::Reflection* reflection) noexcept {
-  switch (descriptor->cpp_type()) {
-#define __BABYLON_TMP_CASE(case_enum, type)                                  \
-  case ::google::protobuf::FieldDescriptor::case_enum: {                     \
-    auto capacity = static_cast<size_t>(                                     \
-        reflection->GetRepeatedField<type>(message, descriptor).Capacity()); \
-    if (repeated_reserved < capacity) {                                      \
-      repeated_reserved = capacity;                                          \
-    }                                                                        \
-    break;                                                                   \
-  }
-    __BABYLON_TMP_CASE(CPPTYPE_INT32, int32_t)
-    __BABYLON_TMP_CASE(CPPTYPE_UINT32, uint32_t)
-    __BABYLON_TMP_CASE(CPPTYPE_INT64, int64_t)
-    __BABYLON_TMP_CASE(CPPTYPE_UINT64, uint64_t)
-    __BABYLON_TMP_CASE(CPPTYPE_DOUBLE, double)
-    __BABYLON_TMP_CASE(CPPTYPE_FLOAT, float)
-    __BABYLON_TMP_CASE(CPPTYPE_BOOL, bool)
-    case ::google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
-      auto capacity = static_cast<size_t>(
-          get_repeated_enum_field(message, reflection, descriptor).Capacity());
-      if (repeated_reserved < capacity) {
-        repeated_reserved = capacity;
-      }
-      break;
-    }
-#undef __BABYLON_TMP_CASE
-#define __BABYLON_TMP_CASE(case_enum, type)                              \
-  case ::google::protobuf::FieldDescriptor::case_enum: {                 \
-    auto& repeated_field =                                               \
-        reflection->GetRepeatedPtrField<type>(message, descriptor);      \
-    auto capacity = static_cast<size_t>(repeated_field.size() +          \
-                                        repeated_field.ClearedCount());  \
-    if (repeated_reserved < capacity) {                                  \
-      repeated_reserved = capacity;                                      \
-    }                                                                    \
-    auto begin = repeated_field.cbegin();                                \
-    auto end = repeated_field.cbegin() + static_cast<ssize_t>(capacity); \
-    for (; begin != end; ++begin) {                                      \
-      update(*begin);                                                    \
-    }                                                                    \
-    break;                                                               \
-  }
-      __BABYLON_TMP_CASE(CPPTYPE_STRING, ::std::string)
-      __BABYLON_TMP_CASE(CPPTYPE_MESSAGE, ::google::protobuf::Message)
-#undef __BABYLON_TMP_CASE
-    default:
-      assert(false);
-      break;
-  }
-}
-
 void MessageAllocationMetadata::FieldAllocationMetadata::reserve_repeated_field(
     ::google::protobuf::Message& message,
     const ::google::protobuf::Reflection* reflection,
diff --git a/src/babylon/reusable/message.trick.cpp b/src/babylon/reusable/message.trick.cpp
@@ -160,6 +160,67 @@ MessageAllocationMetadata::FieldAllocationMetadata::get_repeated_enum_field(
           ::google::protobuf::FieldDescriptor::CPPTYPE_ENUM, -1, nullptr));
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+void MessageAllocationMetadata::FieldAllocationMetadata::update_repeated_field(
+    const ::google::protobuf::Message& message,
+    const ::google::protobuf::Reflection* reflection) noexcept {
+  switch (descriptor->cpp_type()) {
+#define __BABYLON_TMP_CASE(case_enum, type)                                  \
+  case ::google::protobuf::FieldDescriptor::case_enum: {                     \
+    auto capacity = static_cast<size_t>(                                     \
+        reflection->GetRepeatedField<type>(message, descriptor).Capacity()); \
+    if (repeated_reserved < capacity) {                                      \
+      repeated_reserved = capacity;                                          \
+    }                                                                        \
+    break;                                                                   \
+  }
+    __BABYLON_TMP_CASE(CPPTYPE_INT32, int32_t)
+    __BABYLON_TMP_CASE(CPPTYPE_UINT32, uint32_t)
+    __BABYLON_TMP_CASE(CPPTYPE_INT64, int64_t)
+    __BABYLON_TMP_CASE(CPPTYPE_UINT64, uint64_t)
+    __BABYLON_TMP_CASE(CPPTYPE_DOUBLE, double)
+    __BABYLON_TMP_CASE(CPPTYPE_FLOAT, float)
+    __BABYLON_TMP_CASE(CPPTYPE_BOOL, bool)
+    case ::google::protobuf::FieldDescriptor::CPPTYPE_ENUM: {
+      auto capacity = static_cast<size_t>(
+          get_repeated_enum_field(message, reflection, descriptor).Capacity());
+      if (repeated_reserved < capacity) {
+        repeated_reserved = capacity;
+      }
+      break;
+    }
+#undef __BABYLON_TMP_CASE
+#define __BABYLON_TMP_CASE(case_enum, type)                              \
+  case ::google::protobuf::FieldDescriptor::case_enum: {                 \
+    auto& repeated_field =                                               \
+        reflection->GetRepeatedPtrField<type>(message, descriptor);      \
+    auto capacity = static_cast<size_t>(                                 \
+        repeated_field.size() +                                          \
+        reinterpret_cast<                                                \
+            const ::google::protobuf::internal::RepeatedPtrFieldBase&>(  \
+            repeated_field)                                              \
+            .ClearedCount());                                            \
+    if (repeated_reserved < capacity) {                                  \
+      repeated_reserved = capacity;                                      \
+    }                                                                    \
+    auto begin = repeated_field.cbegin();                                \
+    auto end = repeated_field.cbegin() + static_cast<ssize_t>(capacity); \
+    for (; begin != end; ++begin) {                                      \
+      update(*begin);                                                    \
+    }                                                                    \
+    break;                                                               \
+  }
+      __BABYLON_TMP_CASE(CPPTYPE_STRING, ::std::string)
+      __BABYLON_TMP_CASE(CPPTYPE_MESSAGE, ::google::protobuf::Message)
+#undef __BABYLON_TMP_CASE
+    default:
+      assert(false);
+      break;
+  }
+}
+#pragma GCC diagnostic pop
+
 BABYLON_NAMESPACE_END
 
 #endif // GOOGLE_PROTOBUF_VERSION >= 3000000
diff --git a/src/babylon/reusable/patch/arena.32.0.inc b/src/babylon/reusable/patch/arena.32.0.inc
diff --git a/src/babylon/reusable/patch/arena.cpp b/src/babylon/reusable/patch/arena.cpp
diff --git a/src/babylon/serialization.h b/src/babylon/serialization.h
diff --git a/test/reusable/test_message.cpp b/test/reusable/test_message.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load('@bazel_tools//tools/cpp:cc_configure.bzl', 'cc_autoconf_impl')`
	`1`	`+load("@rules_cc//cc/private/toolchain:cc_configure.bzl", 'cc_autoconf_impl')`
`2`	`2`
`3`	`3`	`def cross_config_cc_impl(repository_ctx):`
`4`	`4`	`cc_autoconf_impl(repository_ctx,`