upb: tag _upb_Message_GetOrCreateExtension() as UPB_PRIVATE()

PiperOrigin-RevId: 600653849
pull/15500/head
Eric Salo 1 year ago committed by Copybara-Service
parent 23c618aa7d
commit 07f784a2f3
  1. 5
      protos/protos.cc
  2. 4
      upb/message/copy.c
  3. 3
      upb/message/internal/accessors.h
  4. 2
      upb/message/internal/extension.c
  5. 2
      upb/message/internal/extension.h
  6. 3
      upb/message/promote.c
  7. 6
      upb/wire/decode.c

@ -180,11 +180,6 @@ absl::Status MoveExtension(upb_Message* message, upb_Arena* message_arena,
absl::Status SetExtension(upb_Message* message, upb_Arena* message_arena,
const upb_MiniTableExtension* ext,
const upb_Message* extension) {
upb_Extension* msg_ext =
_upb_Message_GetOrCreateExtension(message, ext, message_arena);
if (!msg_ext) {
return MessageAllocationError();
}
// Clone extension into target message arena.
extension = DeepClone(extension, upb_MiniTableExtension_GetSubMessage(ext),
message_arena);

@ -259,8 +259,8 @@ upb_Message* _upb_Message_Copy(upb_Message* dst, const upb_Message* src,
for (size_t i = 0; i < ext_count; ++i) {
const upb_Extension* msg_ext = &ext[i];
const upb_MiniTableField* field = &msg_ext->ext->UPB_PRIVATE(field);
upb_Extension* dst_ext =
_upb_Message_GetOrCreateExtension(dst, msg_ext->ext, arena);
upb_Extension* dst_ext = UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(
dst, msg_ext->ext, arena);
if (!dst_ext) return NULL;
if (upb_MiniTableField_IsScalar(field)) {
if (!upb_Clone_ExtensionValue(msg_ext->ext, msg_ext, dst_ext, arena)) {

@ -284,7 +284,8 @@ UPB_INLINE bool _upb_Message_SetExtensionField(
struct upb_Message* msg, const upb_MiniTableExtension* mt_ext,
const void* val, upb_Arena* a) {
UPB_ASSERT(a);
struct upb_Extension* ext = _upb_Message_GetOrCreateExtension(msg, mt_ext, a);
struct upb_Extension* ext =
UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(msg, mt_ext, a);
if (!ext) return false;
UPB_PRIVATE(_upb_MiniTableField_DataCopy)
(&mt_ext->UPB_PRIVATE(field), &ext->data, val);

@ -47,7 +47,7 @@ const struct upb_Extension* UPB_PRIVATE(_upb_Message_Getexts)(
}
}
struct upb_Extension* _upb_Message_GetOrCreateExtension(
struct upb_Extension* UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(
struct upb_Message* msg, const upb_MiniTableExtension* e, upb_Arena* a) {
struct upb_Extension* ext =
(struct upb_Extension*)UPB_PRIVATE(_upb_Message_Getext)(msg, e);

@ -40,7 +40,7 @@ extern "C" {
// Adds the given extension data to the given message.
// |ext| is copied into the message instance.
// This logically replaces any previously-added extension with this number.
struct upb_Extension* _upb_Message_GetOrCreateExtension(
struct upb_Extension* UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(
struct upb_Message* msg, const upb_MiniTableExtension* ext,
upb_Arena* arena);

@ -99,7 +99,8 @@ upb_GetExtension_Status upb_MiniTable_GetOrPromoteExtension(
}
upb_Message* extension_msg = parse_result.message;
// Add to extensions.
upb_Extension* ext = _upb_Message_GetOrCreateExtension(msg, ext_table, arena);
upb_Extension* ext =
UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(msg, ext_table, arena);
if (!ext) {
return kUpb_GetExtension_OutOfMemory;
}

@ -815,7 +815,7 @@ static void upb_Decoder_AddKnownMessageSetItem(
upb_Decoder* d, upb_Message* msg, const upb_MiniTableExtension* item_mt,
const char* data, uint32_t size) {
upb_Extension* ext =
_upb_Message_GetOrCreateExtension(msg, item_mt, &d->arena);
UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(msg, item_mt, &d->arena);
if (UPB_UNLIKELY(!ext)) {
_upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory);
}
@ -1169,8 +1169,8 @@ static const char* _upb_Decoder_DecodeKnownField(
if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) {
const upb_MiniTableExtension* ext_layout =
(const upb_MiniTableExtension*)field;
upb_Extension* ext =
_upb_Message_GetOrCreateExtension(msg, ext_layout, &d->arena);
upb_Extension* ext = UPB_PRIVATE(_upb_Message_GetOrCreateExtension)(
msg, ext_layout, &d->arena);
if (UPB_UNLIKELY(!ext)) {
_upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory);
}

Loading…
Cancel
Save