Skip to content

Commit 0702b26

Browse files
Auto-generate files after cl/841908347
1 parent defa273 commit 0702b26

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

php/ext/google/protobuf/php-upb.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16759,7 +16759,7 @@ static upb_MiniTableField upb_Decoder_FieldNotFoundField = {
1675916759

1676016760
UPB_NOINLINE const upb_MiniTableField* _upb_Decoder_FindExtensionField(
1676116761
upb_Decoder* d, const upb_MiniTable* t, uint32_t field_number, int ext_mode,
16762-
int wire_type) {
16762+
uint32_t wire_type) {
1676316763
// Treat a message set as an extendable message if it is a delimited field.
1676416764
// This provides compatibility with encoders that are unaware of message
1676516765
// sets and serialize them as normal extensions.
@@ -16782,7 +16782,7 @@ UPB_NOINLINE const upb_MiniTableField* _upb_Decoder_FindExtensionField(
1678216782
static const upb_MiniTableField* _upb_Decoder_FindField(upb_Decoder* d,
1678316783
const upb_MiniTable* t,
1678416784
uint32_t field_number,
16785-
int wire_type) {
16785+
uint32_t wire_type) {
1678616786
UPB_ASSERT(t);
1678716787
const upb_MiniTableField* field =
1678816788
upb_MiniTable_FindFieldByNumber(t, field_number);
@@ -16921,7 +16921,8 @@ UPB_FORCEINLINE
1692116921
const char* _upb_Decoder_DecodeWireValue(upb_Decoder* d, const char* ptr,
1692216922
const upb_MiniTable* mt,
1692316923
const upb_MiniTableField* field,
16924-
int wire_type, wireval* val, int* op) {
16924+
uint32_t wire_type, wireval* val,
16925+
int* op) {
1692516926
static const unsigned kFixed32OkMask = (1 << kUpb_FieldType_Float) |
1692616927
(1 << kUpb_FieldType_Fixed32) |
1692716928
(1 << kUpb_FieldType_SFixed32);
@@ -17011,8 +17012,8 @@ const char* _upb_Decoder_DecodeKnownField(upb_Decoder* d, const char* ptr,
1701117012
}
1701217013

1701317014
static const char* _upb_Decoder_FindFieldStart(upb_Decoder* d, const char* ptr,
17014-
int field_number,
17015-
int wire_type) {
17015+
uint32_t field_number,
17016+
uint32_t wire_type) {
1701617017
// Since unknown fields are the uncommon case, we do a little extra work here
1701717018
// to walk backwards through the buffer to find the field start. This frees
1701817019
// up a register in the fast paths (when the field is known), which leads to
@@ -17061,11 +17062,9 @@ static const char* _upb_Decoder_FindFieldStart(upb_Decoder* d, const char* ptr,
1706117062
return start;
1706217063
}
1706317064

17064-
static const char* _upb_Decoder_DecodeUnknownField(upb_Decoder* d,
17065-
const char* ptr,
17066-
upb_Message* msg,
17067-
int field_number,
17068-
int wire_type, wireval val) {
17065+
static const char* _upb_Decoder_DecodeUnknownField(
17066+
upb_Decoder* d, const char* ptr, upb_Message* msg, uint32_t field_number,
17067+
uint32_t wire_type, wireval val) {
1706917068
if (field_number == 0) _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_Malformed);
1707017069

1707117070
const char* start =
@@ -17111,7 +17110,8 @@ static const char* _upb_Decoder_DecodeUnknownField(upb_Decoder* d,
1711117110

1711217111
UPB_FORCEINLINE
1711317112
const char* _upb_Decoder_DecodeFieldTag(upb_Decoder* d, const char* ptr,
17114-
int* field_number, int* wire_type) {
17113+
uint32_t* field_number,
17114+
uint32_t* wire_type) {
1711517115
#ifndef NDEBUG
1711617116
d->debug_tagstart = ptr;
1711717117
#endif
@@ -17128,7 +17128,8 @@ UPB_FORCEINLINE
1712817128
const char* _upb_Decoder_DecodeFieldData(upb_Decoder* d, const char* ptr,
1712917129
upb_Message* msg,
1713017130
const upb_MiniTable* mt,
17131-
int field_number, int wire_type) {
17131+
uint32_t field_number,
17132+
uint32_t wire_type) {
1713217133
#ifndef NDEBUG
1713317134
d->debug_valstart = ptr;
1713417135
#endif
@@ -17164,8 +17165,8 @@ UPB_FORCEINLINE
1716417165
const char* _upb_Decoder_DecodeFieldNoFast(upb_Decoder* d, const char* ptr,
1716517166
upb_Message* msg,
1716617167
const upb_MiniTable* mt) {
17167-
int field_number;
17168-
int wire_type;
17168+
uint32_t field_number;
17169+
uint32_t wire_type;
1716917170

1717017171
ptr = _upb_Decoder_DecodeFieldTag(d, ptr, &field_number, &wire_type);
1717117172

ruby/ext/google/protobuf_c/ruby-upb.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16307,7 +16307,7 @@ static upb_MiniTableField upb_Decoder_FieldNotFoundField = {
1630716307

1630816308
UPB_NOINLINE const upb_MiniTableField* _upb_Decoder_FindExtensionField(
1630916309
upb_Decoder* d, const upb_MiniTable* t, uint32_t field_number, int ext_mode,
16310-
int wire_type) {
16310+
uint32_t wire_type) {
1631116311
// Treat a message set as an extendable message if it is a delimited field.
1631216312
// This provides compatibility with encoders that are unaware of message
1631316313
// sets and serialize them as normal extensions.
@@ -16330,7 +16330,7 @@ UPB_NOINLINE const upb_MiniTableField* _upb_Decoder_FindExtensionField(
1633016330
static const upb_MiniTableField* _upb_Decoder_FindField(upb_Decoder* d,
1633116331
const upb_MiniTable* t,
1633216332
uint32_t field_number,
16333-
int wire_type) {
16333+
uint32_t wire_type) {
1633416334
UPB_ASSERT(t);
1633516335
const upb_MiniTableField* field =
1633616336
upb_MiniTable_FindFieldByNumber(t, field_number);
@@ -16469,7 +16469,8 @@ UPB_FORCEINLINE
1646916469
const char* _upb_Decoder_DecodeWireValue(upb_Decoder* d, const char* ptr,
1647016470
const upb_MiniTable* mt,
1647116471
const upb_MiniTableField* field,
16472-
int wire_type, wireval* val, int* op) {
16472+
uint32_t wire_type, wireval* val,
16473+
int* op) {
1647316474
static const unsigned kFixed32OkMask = (1 << kUpb_FieldType_Float) |
1647416475
(1 << kUpb_FieldType_Fixed32) |
1647516476
(1 << kUpb_FieldType_SFixed32);
@@ -16559,8 +16560,8 @@ const char* _upb_Decoder_DecodeKnownField(upb_Decoder* d, const char* ptr,
1655916560
}
1656016561

1656116562
static const char* _upb_Decoder_FindFieldStart(upb_Decoder* d, const char* ptr,
16562-
int field_number,
16563-
int wire_type) {
16563+
uint32_t field_number,
16564+
uint32_t wire_type) {
1656416565
// Since unknown fields are the uncommon case, we do a little extra work here
1656516566
// to walk backwards through the buffer to find the field start. This frees
1656616567
// up a register in the fast paths (when the field is known), which leads to
@@ -16609,11 +16610,9 @@ static const char* _upb_Decoder_FindFieldStart(upb_Decoder* d, const char* ptr,
1660916610
return start;
1661016611
}
1661116612

16612-
static const char* _upb_Decoder_DecodeUnknownField(upb_Decoder* d,
16613-
const char* ptr,
16614-
upb_Message* msg,
16615-
int field_number,
16616-
int wire_type, wireval val) {
16613+
static const char* _upb_Decoder_DecodeUnknownField(
16614+
upb_Decoder* d, const char* ptr, upb_Message* msg, uint32_t field_number,
16615+
uint32_t wire_type, wireval val) {
1661716616
if (field_number == 0) _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_Malformed);
1661816617

1661916618
const char* start =
@@ -16659,7 +16658,8 @@ static const char* _upb_Decoder_DecodeUnknownField(upb_Decoder* d,
1665916658

1666016659
UPB_FORCEINLINE
1666116660
const char* _upb_Decoder_DecodeFieldTag(upb_Decoder* d, const char* ptr,
16662-
int* field_number, int* wire_type) {
16661+
uint32_t* field_number,
16662+
uint32_t* wire_type) {
1666316663
#ifndef NDEBUG
1666416664
d->debug_tagstart = ptr;
1666516665
#endif
@@ -16676,7 +16676,8 @@ UPB_FORCEINLINE
1667616676
const char* _upb_Decoder_DecodeFieldData(upb_Decoder* d, const char* ptr,
1667716677
upb_Message* msg,
1667816678
const upb_MiniTable* mt,
16679-
int field_number, int wire_type) {
16679+
uint32_t field_number,
16680+
uint32_t wire_type) {
1668016681
#ifndef NDEBUG
1668116682
d->debug_valstart = ptr;
1668216683
#endif
@@ -16712,8 +16713,8 @@ UPB_FORCEINLINE
1671216713
const char* _upb_Decoder_DecodeFieldNoFast(upb_Decoder* d, const char* ptr,
1671316714
upb_Message* msg,
1671416715
const upb_MiniTable* mt) {
16715-
int field_number;
16716-
int wire_type;
16716+
uint32_t field_number;
16717+
uint32_t wire_type;
1671716718

1671816719
ptr = _upb_Decoder_DecodeFieldTag(d, ptr, &field_number, &wire_type);
1671916720

0 commit comments

Comments
 (0)