commit b64e6c4d566ae6faa1ace2ddd910911d9d9bbfe4
author Clayton Knittel <cknittel@google.com> Wed Sep 10 12:01:38 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 10 12:05:04 2025 -0700
tree 10231f431aa5cd09f5fbad31c8a307ed66406a77
parent cacd59070cfefc4c83ad89663e584f6dbd1d4346

Separate field offset calculation logic in `DynamicMessage` into `FieldOffset` helper.

PiperOrigin-RevId: 805459124

src/google/protobuf/dynamic_message.cc

diff --git a/src/google/protobuf/dynamic_message.cc b/src/google/protobuf/dynamic_message.cc
index 44d1869..c28b7a8 100644
--- a/src/google/protobuf/dynamic_message.cc
+++ b/src/google/protobuf/dynamic_message.cc
@@ -347,6 +347,8 @@
   // If `T` is not `void`, it will mask bits off the offset via alignment.
   // Used to remove feature masks that are part of the reflection
   // implementation.
+  template <typename T>
+  uint32_t FieldOffset(int i) const;
   template <typename T = void>
   T* MutableRaw(int i);
   template <typename T = void>
@@ -441,21 +443,20 @@
 }
 
 template <typename T>
-inline T* DynamicMessage::MutableRaw(int i) {
-  uint32_t mask = ~uint32_t{};
+inline uint32_t DynamicMessage::FieldOffset(int i) const {
+  uint32_t mask = ~uint32_t{0};
   if constexpr (!std::is_void_v<T>) {
     mask = ~(uint32_t{alignof(T)} - 1);
   }
-  return reinterpret_cast<T*>(OffsetToPointer(type_info_->offsets[i] & mask));
+  return type_info_->offsets[i] & mask;
+}
+template <typename T>
+inline T* DynamicMessage::MutableRaw(int i) {
+  return reinterpret_cast<T*>(OffsetToPointer(FieldOffset<T>(i)));
 }
 template <typename T>
 inline const T& DynamicMessage::GetRaw(int i) const {
-  uint32_t mask = ~uint32_t{};
-  if constexpr (!std::is_void_v<T>) {
-    mask = ~(uint32_t{alignof(T)} - 1);
-  }
-  return *reinterpret_cast<const T*>(
-      OffsetToPointer(type_info_->offsets[i] & mask));
+  return *reinterpret_cast<const T*>(OffsetToPointer(FieldOffset<T>(i)));
 }
 inline void* DynamicMessage::MutableExtensionsRaw() {
   return OffsetToPointer(type_info_->extensions_offset);