From 7b091ee68eb1b9482197b4b0b79fe6e72d4315fb Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 26 Aug 2026 03:24:01 +0000 Subject: [PATCH] Auto-generate files after cl/970967137 --- php/ext/google/protobuf/php-upb.h | 45 ++++++++++++++++----------- ruby/ext/google/protobuf_c/ruby-upb.h | 45 ++++++++++++++++----------- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 15c8557b92..54188b29f3 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -1360,27 +1360,30 @@ void UPB_PRIVATE(_upb_Arena_SwapIn)(struct upb_Arena* des, void UPB_PRIVATE(_upb_Arena_SwapOut)(struct upb_Arena* des, const struct upb_Arena* src); -UPB_INLINE size_t UPB_PRIVATE(_upb_ArenaHas)(const struct upb_Arena* a) { +UPB_NODISCARD UPB_INLINE size_t +UPB_PRIVATE(_upb_ArenaHas)(const struct upb_Arena* a) { return (size_t)(a->UPB_ONLYBITS(end) - a->UPB_ONLYBITS(ptr)); } -UPB_INLINE size_t UPB_PRIVATE(_upb_Arena_AllocSpan)(size_t size) { +UPB_NODISCARD UPB_INLINE size_t UPB_PRIVATE(_upb_Arena_AllocSpan)(size_t size) { return UPB_ALIGN_MALLOC(size) + UPB_PRIVATE(kUpb_Asan_GuardSize); } -UPB_INLINE bool UPB_PRIVATE(_upb_Arena_WasLastAllocFromCurrentBlock)( - const struct upb_Arena* a, void* ptr, size_t size) { +UPB_NODISCARD UPB_INLINE bool UPB_PRIVATE( + _upb_Arena_WasLastAllocFromCurrentBlock)(const struct upb_Arena* a, + void* ptr, size_t size) { return UPB_PRIVATE(upb_Xsan_PtrEq)( (char*)ptr + UPB_PRIVATE(_upb_Arena_AllocSpan)(size), a->UPB_ONLYBITS(ptr)); } -UPB_INLINE bool UPB_PRIVATE(_upb_Arena_IsAligned)(const void* ptr) { +UPB_NODISCARD UPB_INLINE bool UPB_PRIVATE(_upb_Arena_IsAligned)( + const void* ptr) { return (uintptr_t)ptr % UPB_MALLOC_ALIGN == 0; } -UPB_API_INLINE void* _upb_Arena_Malloc_Unchecked(struct upb_Arena* a, - size_t size) { +UPB_NODISCARD UPB_API_INLINE void* _upb_Arena_Malloc_Unchecked( + struct upb_Arena* a, size_t size) { UPB_PRIVATE(upb_Xsan_AccessReadWrite)(UPB_XSAN(a)); size_t span = UPB_PRIVATE(_upb_Arena_AllocSpan)(size); @@ -1399,7 +1402,8 @@ UPB_API_INLINE void* _upb_Arena_Malloc_Unchecked(struct upb_Arena* a, return UPB_PRIVATE(upb_Xsan_NewUnpoisonedRegion)(UPB_XSAN(a), ret, size); } -UPB_API_INLINE void* upb_Arena_Malloc(struct upb_Arena* a, size_t size) { +UPB_NODISCARD UPB_API_INLINE void* upb_Arena_Malloc(struct upb_Arena* a, + size_t size) { if (!upb_AllocationCount_IncrementAndCheck()) { return NULL; } @@ -1428,8 +1432,9 @@ UPB_API_INLINE void upb_Arena_ShrinkLast(struct upb_Arena* a, void* ptr, } } -UPB_API_INLINE bool upb_Arena_TryExtend(struct upb_Arena* a, void* ptr, - size_t oldsize, size_t size) { +UPB_NODISCARD UPB_API_INLINE bool upb_Arena_TryExtend(struct upb_Arena* a, + void* ptr, size_t oldsize, + size_t size) { UPB_ASSERT(ptr); UPB_ASSERT(size > oldsize); @@ -1446,8 +1451,9 @@ UPB_API_INLINE bool upb_Arena_TryExtend(struct upb_Arena* a, void* ptr, return false; } -UPB_API_INLINE void* upb_Arena_Realloc(struct upb_Arena* a, void* ptr, - size_t oldsize, size_t size) { +UPB_NODISCARD UPB_API_INLINE void* upb_Arena_Realloc(struct upb_Arena* a, + void* ptr, size_t oldsize, + size_t size) { UPB_PRIVATE(upb_Xsan_AccessReadWrite)(UPB_XSAN(a)); void* ret; @@ -4841,9 +4847,9 @@ UPB_API_INLINE void upb_Message_SetBaseField(struct upb_Message* msg, (f, UPB_PRIVATE(_upb_Message_MutableDataPtr)(msg, f), val); } -UPB_API_INLINE bool upb_Message_SetExtension(struct upb_Message* msg, - const upb_MiniTableExtension* e, - const void* val, upb_Arena* a) { +UPB_NODISCARD UPB_API_INLINE bool upb_Message_SetExtension( + struct upb_Message* msg, const upb_MiniTableExtension* e, const void* val, + upb_Arena* a) { UPB_ASSERT(!upb_Message_IsFrozen(msg)); UPB_ASSERT(a); upb_Extension* ext = @@ -4854,9 +4860,10 @@ UPB_API_INLINE bool upb_Message_SetExtension(struct upb_Message* msg, return true; } -UPB_API_INLINE bool UPB_PRIVATE(_upb_Message_SetNonCanonicalExtension)( - struct upb_Message* msg, const upb_MiniTableExtension* e, const void* val, - upb_Arena* a) { +UPB_NODISCARD UPB_API_INLINE bool UPB_PRIVATE( + _upb_Message_SetNonCanonicalExtension)(struct upb_Message* msg, + const upb_MiniTableExtension* e, + const void* val, upb_Arena* a) { UPB_ASSERT(!upb_Message_IsFrozen(msg)); UPB_ASSERT(a); upb_Extension* ext = @@ -4883,7 +4890,7 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_SetField)(struct upb_Message* msg, } } -UPB_API_INLINE const upb_Array* upb_Message_GetArray( +UPB_NODISCARD UPB_API_INLINE const upb_Array* upb_Message_GetArray( const struct upb_Message* msg, const upb_MiniTableField* f) { UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); upb_Array* ret; diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index e7d8c946aa..415a5af1d6 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -1360,27 +1360,30 @@ void UPB_PRIVATE(_upb_Arena_SwapIn)(struct upb_Arena* des, void UPB_PRIVATE(_upb_Arena_SwapOut)(struct upb_Arena* des, const struct upb_Arena* src); -UPB_INLINE size_t UPB_PRIVATE(_upb_ArenaHas)(const struct upb_Arena* a) { +UPB_NODISCARD UPB_INLINE size_t +UPB_PRIVATE(_upb_ArenaHas)(const struct upb_Arena* a) { return (size_t)(a->UPB_ONLYBITS(end) - a->UPB_ONLYBITS(ptr)); } -UPB_INLINE size_t UPB_PRIVATE(_upb_Arena_AllocSpan)(size_t size) { +UPB_NODISCARD UPB_INLINE size_t UPB_PRIVATE(_upb_Arena_AllocSpan)(size_t size) { return UPB_ALIGN_MALLOC(size) + UPB_PRIVATE(kUpb_Asan_GuardSize); } -UPB_INLINE bool UPB_PRIVATE(_upb_Arena_WasLastAllocFromCurrentBlock)( - const struct upb_Arena* a, void* ptr, size_t size) { +UPB_NODISCARD UPB_INLINE bool UPB_PRIVATE( + _upb_Arena_WasLastAllocFromCurrentBlock)(const struct upb_Arena* a, + void* ptr, size_t size) { return UPB_PRIVATE(upb_Xsan_PtrEq)( (char*)ptr + UPB_PRIVATE(_upb_Arena_AllocSpan)(size), a->UPB_ONLYBITS(ptr)); } -UPB_INLINE bool UPB_PRIVATE(_upb_Arena_IsAligned)(const void* ptr) { +UPB_NODISCARD UPB_INLINE bool UPB_PRIVATE(_upb_Arena_IsAligned)( + const void* ptr) { return (uintptr_t)ptr % UPB_MALLOC_ALIGN == 0; } -UPB_API_INLINE void* _upb_Arena_Malloc_Unchecked(struct upb_Arena* a, - size_t size) { +UPB_NODISCARD UPB_API_INLINE void* _upb_Arena_Malloc_Unchecked( + struct upb_Arena* a, size_t size) { UPB_PRIVATE(upb_Xsan_AccessReadWrite)(UPB_XSAN(a)); size_t span = UPB_PRIVATE(_upb_Arena_AllocSpan)(size); @@ -1399,7 +1402,8 @@ UPB_API_INLINE void* _upb_Arena_Malloc_Unchecked(struct upb_Arena* a, return UPB_PRIVATE(upb_Xsan_NewUnpoisonedRegion)(UPB_XSAN(a), ret, size); } -UPB_API_INLINE void* upb_Arena_Malloc(struct upb_Arena* a, size_t size) { +UPB_NODISCARD UPB_API_INLINE void* upb_Arena_Malloc(struct upb_Arena* a, + size_t size) { if (!upb_AllocationCount_IncrementAndCheck()) { return NULL; } @@ -1428,8 +1432,9 @@ UPB_API_INLINE void upb_Arena_ShrinkLast(struct upb_Arena* a, void* ptr, } } -UPB_API_INLINE bool upb_Arena_TryExtend(struct upb_Arena* a, void* ptr, - size_t oldsize, size_t size) { +UPB_NODISCARD UPB_API_INLINE bool upb_Arena_TryExtend(struct upb_Arena* a, + void* ptr, size_t oldsize, + size_t size) { UPB_ASSERT(ptr); UPB_ASSERT(size > oldsize); @@ -1446,8 +1451,9 @@ UPB_API_INLINE bool upb_Arena_TryExtend(struct upb_Arena* a, void* ptr, return false; } -UPB_API_INLINE void* upb_Arena_Realloc(struct upb_Arena* a, void* ptr, - size_t oldsize, size_t size) { +UPB_NODISCARD UPB_API_INLINE void* upb_Arena_Realloc(struct upb_Arena* a, + void* ptr, size_t oldsize, + size_t size) { UPB_PRIVATE(upb_Xsan_AccessReadWrite)(UPB_XSAN(a)); void* ret; @@ -4841,9 +4847,9 @@ UPB_API_INLINE void upb_Message_SetBaseField(struct upb_Message* msg, (f, UPB_PRIVATE(_upb_Message_MutableDataPtr)(msg, f), val); } -UPB_API_INLINE bool upb_Message_SetExtension(struct upb_Message* msg, - const upb_MiniTableExtension* e, - const void* val, upb_Arena* a) { +UPB_NODISCARD UPB_API_INLINE bool upb_Message_SetExtension( + struct upb_Message* msg, const upb_MiniTableExtension* e, const void* val, + upb_Arena* a) { UPB_ASSERT(!upb_Message_IsFrozen(msg)); UPB_ASSERT(a); upb_Extension* ext = @@ -4854,9 +4860,10 @@ UPB_API_INLINE bool upb_Message_SetExtension(struct upb_Message* msg, return true; } -UPB_API_INLINE bool UPB_PRIVATE(_upb_Message_SetNonCanonicalExtension)( - struct upb_Message* msg, const upb_MiniTableExtension* e, const void* val, - upb_Arena* a) { +UPB_NODISCARD UPB_API_INLINE bool UPB_PRIVATE( + _upb_Message_SetNonCanonicalExtension)(struct upb_Message* msg, + const upb_MiniTableExtension* e, + const void* val, upb_Arena* a) { UPB_ASSERT(!upb_Message_IsFrozen(msg)); UPB_ASSERT(a); upb_Extension* ext = @@ -4883,7 +4890,7 @@ UPB_INLINE bool UPB_PRIVATE(_upb_Message_SetField)(struct upb_Message* msg, } } -UPB_API_INLINE const upb_Array* upb_Message_GetArray( +UPB_NODISCARD UPB_API_INLINE const upb_Array* upb_Message_GetArray( const struct upb_Message* msg, const upb_MiniTableField* f) { UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(f); upb_Array* ret;