Skip to content

Commit ac5ce6e

Browse files
Rename _upb_Message_Realloc to _EnsureAvailable
PiperOrigin-RevId: 699248319
1 parent 15e7d71 commit ac5ce6e

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

upb/message/internal/extension.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ upb_Extension* UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(
5252
UPB_ASSERT(!upb_Message_IsFrozen(msg));
5353
upb_Extension* ext = (upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e);
5454
if (ext) return ext;
55-
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, sizeof(upb_Extension), a))
55+
if (!UPB_PRIVATE(_upb_Message_EnsureAvailable)(msg, sizeof(upb_Extension), a))
5656
return NULL;
5757
upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg);
5858
in->ext_begin -= sizeof(upb_Extension);

upb/message/internal/message.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ const double kUpb_Infinity = INFINITY;
4141

4242
const double kUpb_NaN = UPB_NAN;
4343

44-
bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need,
45-
upb_Arena* a) {
44+
bool UPB_PRIVATE(_upb_Message_EnsureAvailable)(struct upb_Message* msg,
45+
size_t need, upb_Arena* a) {
4646
UPB_ASSERT(!upb_Message_IsFrozen(msg));
4747
const size_t overhead = sizeof(upb_Message_Internal);
4848

upb/message/internal/message.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,11 @@ bool UPB_PRIVATE(_upb_Message_AddUnknownV)(struct upb_Message* msg,
102102
upb_Arena* arena,
103103
upb_StringView data[], size_t count);
104104

105-
bool UPB_PRIVATE(_upb_Message_Realloc)(struct upb_Message* msg, size_t need,
106-
upb_Arena* arena);
105+
// Ensure at least `need` unused bytes are available for unknown fields or
106+
// extensions. Returns false if a reallocation is needed to satisfy the request,
107+
// and fails.
108+
bool UPB_PRIVATE(_upb_Message_EnsureAvailable)(struct upb_Message* msg,
109+
size_t need, upb_Arena* arena);
107110

108111
#define kUpb_Message_UnknownBegin 0
109112
#define kUpb_Message_ExtensionBegin 0

upb/message/message.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ bool UPB_PRIVATE(_upb_Message_AddUnknown)(upb_Message* msg, const char* data,
4040
UPB_ASSERT(!upb_Message_IsFrozen(msg));
4141
// TODO: b/376969853 - Add debug check that the unknown field is an overall
4242
// valid proto field
43-
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, len, arena)) return false;
43+
if (!UPB_PRIVATE(_upb_Message_EnsureAvailable)(msg, len, arena)) return false;
4444
upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg);
4545
memcpy(UPB_PTR_AT(in, in->unknown_end, char), data, len);
4646
in->unknown_end += len;
@@ -57,7 +57,8 @@ bool UPB_PRIVATE(_upb_Message_AddUnknownV)(struct upb_Message* msg,
5757
for (size_t i = 0; i < count; i++) {
5858
total_len += data[i].size;
5959
}
60-
if (!UPB_PRIVATE(_upb_Message_Realloc)(msg, total_len, arena)) return false;
60+
if (!UPB_PRIVATE(_upb_Message_EnsureAvailable)(msg, total_len, arena))
61+
return false;
6162

6263
upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg);
6364
for (size_t i = 0; i < count; i++) {

0 commit comments

Comments
 (0)