upb: make upb_Array_Reserve() a public function

PiperOrigin-RevId: 620303837
pull/16351/head
Eric Salo 8 months ago committed by Copybara-Service
parent 74ddc48fa9
commit d51df2d2d7
  1. 4
      upb/message/array.h
  2. 6
      upb/message/internal/array.h

@ -63,6 +63,10 @@ UPB_API bool upb_Array_Insert(upb_Array* array, size_t i, size_t count,
// REQUIRES: `i + count <= upb_Array_Size(arr)` // REQUIRES: `i + count <= upb_Array_Size(arr)`
UPB_API void upb_Array_Delete(upb_Array* array, size_t i, size_t count); UPB_API void upb_Array_Delete(upb_Array* array, size_t i, size_t count);
// Reserves |size| elements of storage for the array.
UPB_API_INLINE bool upb_Array_Reserve(struct upb_Array* array, size_t size,
upb_Arena* arena);
// Changes the size of a vector. New elements are initialized to NULL/0. // Changes the size of a vector. New elements are initialized to NULL/0.
// Returns false on allocation failure. // Returns false on allocation failure.
UPB_API bool upb_Array_Resize(upb_Array* array, size_t size, upb_Arena* arena); UPB_API bool upb_Array_Resize(upb_Array* array, size_t size, upb_Arena* arena);

@ -94,8 +94,8 @@ UPB_INLINE struct upb_Array* UPB_PRIVATE(_upb_Array_New)(upb_Arena* arena,
bool UPB_PRIVATE(_upb_Array_Realloc)(struct upb_Array* array, size_t min_size, bool UPB_PRIVATE(_upb_Array_Realloc)(struct upb_Array* array, size_t min_size,
upb_Arena* arena); upb_Arena* arena);
UPB_INLINE bool UPB_PRIVATE(_upb_Array_Reserve)(struct upb_Array* array, UPB_API_INLINE bool upb_Array_Reserve(struct upb_Array* array, size_t size,
size_t size, upb_Arena* arena) { upb_Arena* arena) {
UPB_ASSERT(!upb_Array_IsFrozen(array)); UPB_ASSERT(!upb_Array_IsFrozen(array));
if (array->UPB_PRIVATE(capacity) < size) if (array->UPB_PRIVATE(capacity) < size)
return UPB_PRIVATE(_upb_Array_Realloc)(array, size, arena); return UPB_PRIVATE(_upb_Array_Realloc)(array, size, arena);
@ -108,7 +108,7 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Array_ResizeUninitialized)(
UPB_ASSERT(!upb_Array_IsFrozen(array)); UPB_ASSERT(!upb_Array_IsFrozen(array));
UPB_ASSERT(size <= array->UPB_ONLYBITS(size) || UPB_ASSERT(size <= array->UPB_ONLYBITS(size) ||
arena); // Allow NULL arena when shrinking. arena); // Allow NULL arena when shrinking.
if (!UPB_PRIVATE(_upb_Array_Reserve)(array, size, arena)) return false; if (!upb_Array_Reserve(array, size, arena)) return false;
array->UPB_ONLYBITS(size) = size; array->UPB_ONLYBITS(size) = size;
return true; return true;
} }

Loading…
Cancel
Save