Auto-generate files after cl/597019522

pull/15337/head
Protobuf Team Bot 11 months ago
parent facf959a78
commit afd94185f7
  1. 9
      php/ext/google/protobuf/php-upb.h
  2. 9
      ruby/ext/google/protobuf_c/ruby-upb.h

@ -2698,6 +2698,7 @@ UPB_INLINE struct upb_Map* _upb_Message_GetOrCreateMutableMap(
#ifndef UPB_MESSAGE_INTERNAL_ARRAY_H_ #ifndef UPB_MESSAGE_INTERNAL_ARRAY_H_
#define UPB_MESSAGE_INTERNAL_ARRAY_H_ #define UPB_MESSAGE_INTERNAL_ARRAY_H_
#include <stdint.h>
#include <string.h> #include <string.h>
@ -2721,7 +2722,7 @@ struct upb_Array {
// 3 maps to elem size 16 // 3 maps to elem size 16
// //
// Bit #2 contains the frozen/immutable flag (currently unimplemented). // Bit #2 contains the frozen/immutable flag (currently unimplemented).
uintptr_t data; uintptr_t UPB_ONLYBITS(data);
size_t UPB_ONLYBITS(size); // The number of elements in the array. size_t UPB_ONLYBITS(size); // The number of elements in the array.
size_t UPB_PRIVATE(capacity); // Allocated storage. Measured in elements. size_t UPB_PRIVATE(capacity); // Allocated storage. Measured in elements.
@ -2732,19 +2733,19 @@ UPB_INLINE void UPB_PRIVATE(_upb_Array_SetTaggedPtr)(struct upb_Array* array,
UPB_ASSERT(lg2 != 1); UPB_ASSERT(lg2 != 1);
UPB_ASSERT(lg2 <= 4); UPB_ASSERT(lg2 <= 4);
const size_t bits = lg2 - (lg2 != 0); const size_t bits = lg2 - (lg2 != 0);
array->data = (uintptr_t)data | bits; array->UPB_ONLYBITS(data) = (uintptr_t)data | bits;
} }
UPB_INLINE size_t UPB_INLINE size_t
UPB_PRIVATE(_upb_Array_ElemSizeLg2)(const struct upb_Array* array) { UPB_PRIVATE(_upb_Array_ElemSizeLg2)(const struct upb_Array* array) {
const size_t bits = array->data & _UPB_ARRAY_MASK_LG2; const size_t bits = array->UPB_ONLYBITS(data) & _UPB_ARRAY_MASK_LG2;
const size_t lg2 = bits + (bits != 0); const size_t lg2 = bits + (bits != 0);
return lg2; return lg2;
} }
UPB_INLINE const void* _upb_array_constptr(const struct upb_Array* array) { UPB_INLINE const void* _upb_array_constptr(const struct upb_Array* array) {
UPB_PRIVATE(_upb_Array_ElemSizeLg2)(array); // Check assertions. UPB_PRIVATE(_upb_Array_ElemSizeLg2)(array); // Check assertions.
return (void*)(array->data & ~(uintptr_t)_UPB_ARRAY_MASK_ALL); return (void*)(array->UPB_ONLYBITS(data) & ~(uintptr_t)_UPB_ARRAY_MASK_ALL);
} }
UPB_INLINE void* _upb_array_ptr(struct upb_Array* array) { UPB_INLINE void* _upb_array_ptr(struct upb_Array* array) {

@ -2700,6 +2700,7 @@ UPB_INLINE struct upb_Map* _upb_Message_GetOrCreateMutableMap(
#ifndef UPB_MESSAGE_INTERNAL_ARRAY_H_ #ifndef UPB_MESSAGE_INTERNAL_ARRAY_H_
#define UPB_MESSAGE_INTERNAL_ARRAY_H_ #define UPB_MESSAGE_INTERNAL_ARRAY_H_
#include <stdint.h>
#include <string.h> #include <string.h>
@ -2723,7 +2724,7 @@ struct upb_Array {
// 3 maps to elem size 16 // 3 maps to elem size 16
// //
// Bit #2 contains the frozen/immutable flag (currently unimplemented). // Bit #2 contains the frozen/immutable flag (currently unimplemented).
uintptr_t data; uintptr_t UPB_ONLYBITS(data);
size_t UPB_ONLYBITS(size); // The number of elements in the array. size_t UPB_ONLYBITS(size); // The number of elements in the array.
size_t UPB_PRIVATE(capacity); // Allocated storage. Measured in elements. size_t UPB_PRIVATE(capacity); // Allocated storage. Measured in elements.
@ -2734,19 +2735,19 @@ UPB_INLINE void UPB_PRIVATE(_upb_Array_SetTaggedPtr)(struct upb_Array* array,
UPB_ASSERT(lg2 != 1); UPB_ASSERT(lg2 != 1);
UPB_ASSERT(lg2 <= 4); UPB_ASSERT(lg2 <= 4);
const size_t bits = lg2 - (lg2 != 0); const size_t bits = lg2 - (lg2 != 0);
array->data = (uintptr_t)data | bits; array->UPB_ONLYBITS(data) = (uintptr_t)data | bits;
} }
UPB_INLINE size_t UPB_INLINE size_t
UPB_PRIVATE(_upb_Array_ElemSizeLg2)(const struct upb_Array* array) { UPB_PRIVATE(_upb_Array_ElemSizeLg2)(const struct upb_Array* array) {
const size_t bits = array->data & _UPB_ARRAY_MASK_LG2; const size_t bits = array->UPB_ONLYBITS(data) & _UPB_ARRAY_MASK_LG2;
const size_t lg2 = bits + (bits != 0); const size_t lg2 = bits + (bits != 0);
return lg2; return lg2;
} }
UPB_INLINE const void* _upb_array_constptr(const struct upb_Array* array) { UPB_INLINE const void* _upb_array_constptr(const struct upb_Array* array) {
UPB_PRIVATE(_upb_Array_ElemSizeLg2)(array); // Check assertions. UPB_PRIVATE(_upb_Array_ElemSizeLg2)(array); // Check assertions.
return (void*)(array->data & ~(uintptr_t)_UPB_ARRAY_MASK_ALL); return (void*)(array->UPB_ONLYBITS(data) & ~(uintptr_t)_UPB_ARRAY_MASK_ALL);
} }
UPB_INLINE void* _upb_array_ptr(struct upb_Array* array) { UPB_INLINE void* _upb_array_ptr(struct upb_Array* array) {

Loading…
Cancel
Save