mmo-ref/dep-protobuf
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf synced 2026-08-26 02:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract EPS macro and use it in fast decoder

Browse source 
This allows eliding null checks on the hot path

PiperOrigin-RevId: 919794585
This commit is contained in:
Protobuf Team Bot 2026-05-22 12:08:03 -07:00 • committed by Copybara-Service
parent 37b24978f3
commit 26bb70c223
11 changed files with 33 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
upb/wire/decode.c
View file

@ -89,12 +89,6 @@ enum {
#define OP_FIXPCK_LG2(n) (n + 5) /* n in [2, 3] => op in [7, 8] */
#define OP_VARPCK_LG2(n) (n + 9) /* n in [0, 2, 3] => op in [9, 11, 12] */
static void _upb_Decoder_AssumeEpsHasErrorHandler(upb_Decoder* d) {
UPB_ASSUME(upb_EpsCopyInputStream_HasErrorHandler(&d->input));
}
#define EPS(d) (_upb_Decoder_AssumeEpsHasErrorHandler(d), &(d)->input)
static bool _upb_Decoder_Reserve(upb_Decoder* d, upb_Array* arr, size_t elem) {
bool need_realloc =
arr->UPB_PRIVATE(capacity) - arr->UPB_PRIVATE(size) < elem;

4
upb/wire/decode_fast/cardinality.c
View file

@ -1,8 +1,8 @@
#include "upb/wire/decode_fast/cardinality.h"
#include "upb/wire/eps_copy_input_stream.h"
#include "upb/wire/internal/decoder.h"
#include "upb/wire/internal/eps_copy_input_stream.h"
UPB_PRESERVE_MOST
const char* upb_DecodeFast_IsDoneFallback(upb_Decoder* d, const char* ptr) {
@ -10,6 +10,6 @@ const char* upb_DecodeFast_IsDoneFallback(upb_Decoder* d, const char* ptr) {
upb_IsDoneStatus status = UPB_PRIVATE(upb_EpsCopyInputStream_IsDoneStatus)(
&d->input, ptr, &overrun);
UPB_ASSERT(status == kUpb_IsDoneStatus_NeedFallback);
return UPB_PRIVATE(upb_EpsCopyInputStream_IsDoneFallback)(&d->input, ptr,
return UPB_PRIVATE(upb_EpsCopyInputStream_IsDoneFallback)(EPS(d), ptr,
overrun);
}

7
upb/wire/decode_fast/cardinality.h
View file

@ -470,12 +470,7 @@ bool upb_DecodeFast_Delimited(upb_Decoder* d, const char** ptr,
ctx)) {
if (UPB_UNLIKELY(p == NULL)) goto fail;
} else {
ptrdiff_t delta = upb_EpsCopyInputStream_PushLimit(&d->input, p, size);
if (UPB_UNLIKELY(delta < 0)) {
// Corrupt wire format: invalid limit.
*ptr = NULL;
return UPB_DECODEFAST_ERROR(d, kUpb_DecodeStatus_Malformed, ret);
}
ptrdiff_t delta = upb_EpsCopyInputStream_PushLimit(EPS(d), p, size);
p = func(&d->input, p, size, ctx);
if (UPB_UNLIKELY(p == NULL)) goto fail;
upb_EpsCopyInputStream_PopLimit(&d->input, p, delta);

2
upb/wire/decode_fast/dispatch.c
View file

@ -34,7 +34,7 @@ upb_DecodeFast_MessageIsDoneFallback(UPB_PARSE_PARAMS) {
}
case kUpb_IsDoneStatus_NeedFallback:
// We've reached end-of-buffer. Refresh the buffer.
ptr = UPB_PRIVATE(upb_EpsCopyInputStream_IsDoneFallback)(&d->input, ptr,
ptr = UPB_PRIVATE(upb_EpsCopyInputStream_IsDoneFallback)(EPS(d), ptr,
overrun);
// We successfully refreshed the buffer (otherwise the function above

4
upb/wire/decode_fast/field_mismatch.c
View file

@ -98,7 +98,7 @@ UPB_PRESERVE_NONE upb_FastDecoder_Return _upb_FastDecoder_DecodeCheckMiniTable(
uint32_t field_num = data;
#ifndef NDEBUG
uint32_t check;
const char* read = upb_WireReader_ReadTag(ptr, &check, &d->input);
const char* read = upb_WireReader_ReadTag(ptr, &check, EPS(d));
UPB_PRIVATE(upb_EpsCopyInputStream_BoundsChecked)(&d->input);
UPB_ASSERT(upb_WireReader_GetFieldNumber(check) == field_num);
UPB_ASSERT(ptr + upb_DecodeFastData2_GetTagLen(data2) == read);
@ -127,7 +127,7 @@ _upb_FastDecoder_DecodeCheckExtRegMiniTable(struct upb_Decoder* d,
#ifndef NDEBUG
UPB_PRIVATE(upb_EpsCopyInputStream_BoundsChecked)(&d->input);
uint32_t check;
const char* read = upb_WireReader_ReadTag(ptr, &check, &d->input);
const char* read = upb_WireReader_ReadTag(ptr, &check, EPS(d));
UPB_ASSERT(upb_WireReader_GetFieldNumber(check) == field_num);
UPB_ASSERT(ptr + upb_DecodeFastData2_GetTagLen(data2) == read);

6
upb/wire/decode_fast/field_string.c
View file

@ -32,16 +32,12 @@ bool upb_DecodeFast_SingleStringAlias(upb_Decoder* d, const char** ptr,
if (!upb_DecodeFast_DecodeSize(d, ptr, &size, next)) return false;
const char* p = *ptr;
if (!upb_EpsCopyInputStream_ReadStringAlwaysAlias(&d->input, p, size, sv)) {
return UPB_DECODEFAST_EXIT(kUpb_DecodeFastNext_FallbackToMiniTable, next);
}
*ptr = upb_EpsCopyInputStream_ReadStringAlwaysAlias(EPS(d), *ptr, size, sv);
if (validate_utf8 && !utf8_range_IsValid(sv->data, sv->size)) {
return UPB_DECODEFAST_ERROR(d, kUpb_DecodeStatus_BadUtf8, next);
}
*ptr = p + size;
return true;
}

14
upb/wire/decode_fast/field_unknown.c
View file

@ -125,10 +125,7 @@ UPB_FORCEINLINE bool _upb_FastDecoder_DoDecodeUnknown(
while (true) {
switch (wire_type) {
case kUpb_WireType_Varint:
*ptr = upb_WireReader_SkipVarint(*ptr, &d->input);
if (UPB_UNLIKELY(!*ptr)) {
return UPB_DECODEFAST_ERROR(d, kUpb_DecodeStatus_Malformed, ret);
}
*ptr = upb_WireReader_SkipVarint(*ptr, EPS(d));
break;
case kUpb_WireType_32Bit:
UPB_PRIVATE(upb_EpsCopyInputStream_ConsumeBytes)(&d->input, 4);
@ -140,9 +137,8 @@ UPB_FORCEINLINE bool _upb_FastDecoder_DoDecodeUnknown(
break;
case kUpb_WireType_Delimited: {
int size;
const char* p = upb_WireReader_ReadSize(*ptr, &size, &d->input);
if (UPB_UNLIKELY(
!p || !upb_EpsCopyInputStream_CheckSize(&d->input, p, size))) {
const char* p = upb_WireReader_ReadSize(*ptr, &size, EPS(d));
if (UPB_UNLIKELY(!upb_EpsCopyInputStream_CheckSize(EPS(d), p, size))) {
return UPB_DECODEFAST_ERROR(d, kUpb_DecodeStatus_Malformed, ret);
}
*ptr = p + size;
@ -205,9 +201,7 @@ UPB_FORCEINLINE bool _upb_FastDecoder_DoDecodeUnknown(
}
upb_StringView sv;
if (UPB_UNLIKELY(!upb_EpsCopyCapture_End(&capture, &d->input, *ptr, &sv))) {
return UPB_DECODEFAST_ERROR(d, kUpb_DecodeStatus_Malformed, ret);
}
upb_EpsCopyCapture_End(&capture, EPS(d), *ptr, &sv);
bool handled_fast =
// Check AddUnknown mode is AliasAllowMerge.

5
upb/wire/decode_fast/field_varint.c
View file

@ -52,10 +52,7 @@ static bool upb_DecodeFast_SingleVarint(upb_Decoder* d, const char** ptr,
const char* p = *ptr;
uint64_t val;
p = upb_WireReader_ReadVarint(p, &val, &d->input);
if (!p) {
return UPB_DECODEFAST_ERROR(d, kUpb_DecodeStatus_Malformed, next);
}
p = upb_WireReader_ReadVarint(p, &val, EPS(d));
switch (type) {
case kUpb_DecodeFast_Bool:

7
upb/wire/eps_copy_input_stream.c
View file

@ -16,11 +16,10 @@
// Must be last.
#include "upb/port/def.inc"
const char* UPB_PRIVATE(upb_EpsCopyInputStream_ReturnError)(
upb_EpsCopyInputStream* e) {
UPB_NORETURN UPB_NOINLINE void UPB_PRIVATE(
upb_EpsCopyInputStream_ThrowMalformed)(upb_EpsCopyInputStream* e) {
e->error = true;
if (e->err) upb_ErrorHandler_ThrowError(e->err, kUpb_ErrorCode_Malformed);
return NULL;
upb_ErrorHandler_ThrowError(e->err, kUpb_ErrorCode_Malformed);
}
const char* UPB_PRIVATE(upb_EpsCopyInputStream_IsDoneFallback)(

6
upb/wire/internal/decoder.h
View file

@ -69,6 +69,12 @@ typedef struct upb_Decoder {
#endif
} upb_Decoder;
UPB_INLINE void _upb_Decoder_AssumeEpsHasErrorHandler(upb_Decoder* d) {
UPB_ASSUME(upb_EpsCopyInputStream_HasErrorHandler(&d->input));
}
#define EPS(d) (_upb_Decoder_AssumeEpsHasErrorHandler(d), &(d)->input)
UPB_INLINE const char* upb_Decoder_Init(upb_Decoder* d, const char* buf,
size_t size,
const upb_ExtensionRegistry* extreg,

14
upb/wire/internal/eps_copy_input_stream.h
View file

@ -94,11 +94,21 @@ UPB_INLINE bool upb_EpsCopyInputStream_HasErrorHandler(
return e && e->err != NULL;
}
UPB_NORETURN UPB_NOINLINE void UPB_PRIVATE(
upb_EpsCopyInputStream_ThrowMalformed)(struct upb_EpsCopyInputStream* e);
// Call this function to signal an error. If an error handler is set, it will be
// called and the function will never return. Otherwise, returns NULL to
// indicate an error.
const char* UPB_PRIVATE(upb_EpsCopyInputStream_ReturnError)(
struct upb_EpsCopyInputStream* e);
UPB_INLINE const char* UPB_PRIVATE(upb_EpsCopyInputStream_ReturnError)(
struct upb_EpsCopyInputStream* e) {
if (e->err) {
UPB_PRIVATE(upb_EpsCopyInputStream_ThrowMalformed)(e);
} else {
e->error = true;
}
return NULL;
}
UPB_INLINE const char* UPB_PRIVATE(upb_EpsCopyInputStream_AssumeResult)(
struct upb_EpsCopyInputStream* e, const char* ptr) {