From 62f24fdbc803b0516990547ab11717d6c829723f Mon Sep 17 00:00:00 2001 From: klzgrad Date: Thu, 1 Sep 2022 21:37:42 +0800 Subject: [PATCH] third_party/protobuf: Reduce the required alignment of ArenaString from 8 to 4 https://github.com/protocolbuffers/protobuf/pull/10298 --- src/third_party/protobuf/src/google/protobuf/arenastring.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/third_party/protobuf/src/google/protobuf/arenastring.cc b/src/third_party/protobuf/src/google/protobuf/arenastring.cc index d886ddad66..276cced75a 100644 --- a/src/third_party/protobuf/src/google/protobuf/arenastring.cc +++ b/src/third_party/protobuf/src/google/protobuf/arenastring.cc @@ -64,8 +64,8 @@ constexpr size_t kNewAlign = alignof(std::max_align_t); #endif constexpr size_t kStringAlign = alignof(std::string); -static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); -static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); +static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 4, ""); +static_assert(alignof(ExplicitlyConstructedArenaString) >= 4, ""); } // namespace