Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto-generate files after cl/588147628

Browse Source
pull/14940/head
Protobuf Team Bot 1 year ago
parent 347486dd85
commit 7713df55ab
4 changed files with 62 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      php/ext/google/protobuf/php-upb.c
  2. 68
      php/ext/google/protobuf/php-upb.h
  3. 4
      ruby/ext/google/protobuf_c/ruby-upb.c
  4. 68
      ruby/ext/google/protobuf_c/ruby-upb.h

4
php/ext/google/protobuf/php-upb.c
Unescape View File

@ -13285,7 +13285,7 @@ static const char* _upb_Decoder_DecodeToSubMessage(
/* Set presence if necessary. */
if (field->presence > 0) {
_upb_Message_SetHasbitByField(msg, field);
UPB_PRIVATE(_upb_Message_SetHasbit)(msg, field);
} else if (field->presence < 0) {
/* Oneof case */
uint32_t* oneof_case = _upb_Message_OneofCasePtr(msg, field);
@ -15427,7 +15427,7 @@ static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg,
}
} else if (f->presence > 0) {
// Proto2 presence: hasbit.
return _upb_Message_GetHasbitByField(msg, f);
return UPB_PRIVATE(_upb_Message_GetHasbit)(msg, f);
} else {
// Field is in a oneof.
return _upb_Message_GetOneofCase(msg, f) == f->UPB_PRIVATE(number);

68
php/ext/google/protobuf/php-upb.h
Unescape View File

@ -1201,6 +1201,20 @@ UPB_PRIVATE(_upb_MiniTableField_CType)(const struct upb_MiniTableField* f) {
return upb_FieldType_CType(UPB_PRIVATE(_upb_MiniTableField_Type)(f));
}
UPB_INLINE char _upb_MiniTableField_HasbitMask(
const struct upb_MiniTableField* f) {
UPB_ASSERT(f->presence > 0);
const size_t index = f->presence;
return 1 << (index % 8);
}
UPB_INLINE size_t
_upb_MiniTableField_HasbitOffset(const struct upb_MiniTableField* f) {
UPB_ASSERT(f->presence > 0);
const size_t index = f->presence;
return index / 8;
}
UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsClosedEnum)(
const struct upb_MiniTableField* f) {
return f->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Enum;
@ -2422,51 +2436,27 @@ extern "C" {
// Hasbit access ///////////////////////////////////////////////////////////////
UPB_INLINE size_t _upb_Hasbit_Offset(size_t index) { return index / 8; }
UPB_INLINE char _upb_Hasbit_Mask(size_t index) { return 1 << (index % 8); }
UPB_INLINE size_t _upb_Hasbit_Index(const upb_MiniTableField* f) {
UPB_ASSERT(f->presence > 0);
return f->presence;
}
UPB_INLINE bool _upb_Message_GetHasbitByIndex(const upb_Message* msg,
size_t index) {
const size_t offset = _upb_Hasbit_Offset(index);
const char mask = _upb_Hasbit_Mask(index);
UPB_INLINE bool UPB_PRIVATE(_upb_Message_GetHasbit)(
const upb_Message* msg, const upb_MiniTableField* f) {
const size_t offset = _upb_MiniTableField_HasbitOffset(f);
const char mask = _upb_MiniTableField_HasbitMask(f);
return (*UPB_PTR_AT(msg, offset, const char) & mask) != 0;
}
UPB_INLINE void _upb_Message_SetHasbitByIndex(const upb_Message* msg,
size_t index) {
const size_t offset = _upb_Hasbit_Offset(index);
const char mask = _upb_Hasbit_Mask(index);
UPB_INLINE void UPB_PRIVATE(_upb_Message_SetHasbit)(
const upb_Message* msg, const upb_MiniTableField* f) {
const size_t offset = _upb_MiniTableField_HasbitOffset(f);
const char mask = _upb_MiniTableField_HasbitMask(f);
(*UPB_PTR_AT(msg, offset, char)) |= mask;
}
UPB_INLINE void _upb_Message_ClearHasbitByIndex(const upb_Message* msg,
size_t index) {
const size_t offset = _upb_Hasbit_Offset(index);
const char mask = _upb_Hasbit_Mask(index);
UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearHasbit)(
const upb_Message* msg, const upb_MiniTableField* f) {
const size_t offset = _upb_MiniTableField_HasbitOffset(f);
const char mask = _upb_MiniTableField_HasbitMask(f);
(*UPB_PTR_AT(msg, offset, char)) &= ~mask;
}
UPB_INLINE bool _upb_Message_GetHasbitByField(const upb_Message* msg,
const upb_MiniTableField* f) {
return _upb_Message_GetHasbitByIndex(msg, _upb_Hasbit_Index(f));
}
UPB_INLINE void _upb_Message_SetHasbitByField(const upb_Message* msg,
const upb_MiniTableField* f) {
_upb_Message_SetHasbitByIndex(msg, _upb_Hasbit_Index(f));
}
UPB_INLINE void _upb_Message_ClearHasbitByField(const upb_Message* msg,
const upb_MiniTableField* f) {
_upb_Message_ClearHasbitByIndex(msg, _upb_Hasbit_Index(f));
}
// Oneof case access ///////////////////////////////////////////////////////////
UPB_INLINE size_t _upb_MiniTableField_OneofOffset(const upb_MiniTableField* f) {
@ -2506,7 +2496,7 @@ UPB_INLINE const void* _upb_MiniTableField_GetConstPtr(
UPB_INLINE void _upb_Message_SetPresence(upb_Message* msg,
const upb_MiniTableField* field) {
if (field->presence > 0) {
_upb_Message_SetHasbitByField(msg, field);
UPB_PRIVATE(_upb_Message_SetHasbit)(msg, field);
} else if (upb_MiniTableField_IsInOneof(field)) {
_upb_Message_SetOneofCase(msg, field);
}
@ -2597,7 +2587,7 @@ UPB_INLINE bool _upb_Message_HasNonExtensionField(
return _upb_Message_GetOneofCase(msg, field) ==
upb_MiniTableField_Number(field);
} else {
return _upb_Message_GetHasbitByField(msg, field);
return UPB_PRIVATE(_upb_Message_GetHasbit)(msg, field);
}
}
@ -2690,7 +2680,7 @@ UPB_INLINE void _upb_Message_ClearExtensionField(
UPB_INLINE void _upb_Message_ClearNonExtensionField(
upb_Message* msg, const upb_MiniTableField* field) {
if (field->presence > 0) {
_upb_Message_ClearHasbitByField(msg, field);
UPB_PRIVATE(_upb_Message_ClearHasbit)(msg, field);
} else if (upb_MiniTableField_IsInOneof(field)) {
uint32_t* ptr = _upb_Message_OneofCasePtr(msg, field);
if (*ptr != upb_MiniTableField_Number(field)) return;

4
ruby/ext/google/protobuf_c/ruby-upb.c
Unescape View File

@ -12799,7 +12799,7 @@ static const char* _upb_Decoder_DecodeToSubMessage(
/* Set presence if necessary. */
if (field->presence > 0) {
_upb_Message_SetHasbitByField(msg, field);
UPB_PRIVATE(_upb_Message_SetHasbit)(msg, field);
} else if (field->presence < 0) {
/* Oneof case */
uint32_t* oneof_case = _upb_Message_OneofCasePtr(msg, field);
@ -14941,7 +14941,7 @@ static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg,
}
} else if (f->presence > 0) {
// Proto2 presence: hasbit.
return _upb_Message_GetHasbitByField(msg, f);
return UPB_PRIVATE(_upb_Message_GetHasbit)(msg, f);
} else {
// Field is in a oneof.
return _upb_Message_GetOneofCase(msg, f) == f->UPB_PRIVATE(number);

68
ruby/ext/google/protobuf_c/ruby-upb.h
Unescape View File

@ -1203,6 +1203,20 @@ UPB_PRIVATE(_upb_MiniTableField_CType)(const struct upb_MiniTableField* f) {
return upb_FieldType_CType(UPB_PRIVATE(_upb_MiniTableField_Type)(f));
}
UPB_INLINE char _upb_MiniTableField_HasbitMask(
const struct upb_MiniTableField* f) {
UPB_ASSERT(f->presence > 0);
const size_t index = f->presence;
return 1 << (index % 8);
}
UPB_INLINE size_t
_upb_MiniTableField_HasbitOffset(const struct upb_MiniTableField* f) {
UPB_ASSERT(f->presence > 0);
const size_t index = f->presence;
return index / 8;
}
UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsClosedEnum)(
const struct upb_MiniTableField* f) {
return f->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Enum;
@ -2424,51 +2438,27 @@ extern "C" {
// Hasbit access ///////////////////////////////////////////////////////////////
UPB_INLINE size_t _upb_Hasbit_Offset(size_t index) { return index / 8; }
UPB_INLINE char _upb_Hasbit_Mask(size_t index) { return 1 << (index % 8); }
UPB_INLINE size_t _upb_Hasbit_Index(const upb_MiniTableField* f) {
UPB_ASSERT(f->presence > 0);
return f->presence;
}
UPB_INLINE bool _upb_Message_GetHasbitByIndex(const upb_Message* msg,
size_t index) {
const size_t offset = _upb_Hasbit_Offset(index);
const char mask = _upb_Hasbit_Mask(index);
UPB_INLINE bool UPB_PRIVATE(_upb_Message_GetHasbit)(
const upb_Message* msg, const upb_MiniTableField* f) {
const size_t offset = _upb_MiniTableField_HasbitOffset(f);
const char mask = _upb_MiniTableField_HasbitMask(f);
return (*UPB_PTR_AT(msg, offset, const char) & mask) != 0;
}
UPB_INLINE void _upb_Message_SetHasbitByIndex(const upb_Message* msg,
size_t index) {
const size_t offset = _upb_Hasbit_Offset(index);
const char mask = _upb_Hasbit_Mask(index);
UPB_INLINE void UPB_PRIVATE(_upb_Message_SetHasbit)(
const upb_Message* msg, const upb_MiniTableField* f) {
const size_t offset = _upb_MiniTableField_HasbitOffset(f);
const char mask = _upb_MiniTableField_HasbitMask(f);
(*UPB_PTR_AT(msg, offset, char)) |= mask;
}
UPB_INLINE void _upb_Message_ClearHasbitByIndex(const upb_Message* msg,
size_t index) {
const size_t offset = _upb_Hasbit_Offset(index);
const char mask = _upb_Hasbit_Mask(index);
UPB_INLINE void UPB_PRIVATE(_upb_Message_ClearHasbit)(
const upb_Message* msg, const upb_MiniTableField* f) {
const size_t offset = _upb_MiniTableField_HasbitOffset(f);
const char mask = _upb_MiniTableField_HasbitMask(f);
(*UPB_PTR_AT(msg, offset, char)) &= ~mask;
}
UPB_INLINE bool _upb_Message_GetHasbitByField(const upb_Message* msg,
const upb_MiniTableField* f) {
return _upb_Message_GetHasbitByIndex(msg, _upb_Hasbit_Index(f));
}
UPB_INLINE void _upb_Message_SetHasbitByField(const upb_Message* msg,
const upb_MiniTableField* f) {
_upb_Message_SetHasbitByIndex(msg, _upb_Hasbit_Index(f));
}
UPB_INLINE void _upb_Message_ClearHasbitByField(const upb_Message* msg,
const upb_MiniTableField* f) {
_upb_Message_ClearHasbitByIndex(msg, _upb_Hasbit_Index(f));
}
// Oneof case access ///////////////////////////////////////////////////////////
UPB_INLINE size_t _upb_MiniTableField_OneofOffset(const upb_MiniTableField* f) {
@ -2508,7 +2498,7 @@ UPB_INLINE const void* _upb_MiniTableField_GetConstPtr(
UPB_INLINE void _upb_Message_SetPresence(upb_Message* msg,
const upb_MiniTableField* field) {
if (field->presence > 0) {
_upb_Message_SetHasbitByField(msg, field);
UPB_PRIVATE(_upb_Message_SetHasbit)(msg, field);
} else if (upb_MiniTableField_IsInOneof(field)) {
_upb_Message_SetOneofCase(msg, field);
}
@ -2599,7 +2589,7 @@ UPB_INLINE bool _upb_Message_HasNonExtensionField(
return _upb_Message_GetOneofCase(msg, field) ==
upb_MiniTableField_Number(field);
} else {
return _upb_Message_GetHasbitByField(msg, field);
return UPB_PRIVATE(_upb_Message_GetHasbit)(msg, field);
}
}
@ -2692,7 +2682,7 @@ UPB_INLINE void _upb_Message_ClearExtensionField(
UPB_INLINE void _upb_Message_ClearNonExtensionField(
upb_Message* msg, const upb_MiniTableField* field) {
if (field->presence > 0) {
_upb_Message_ClearHasbitByField(msg, field);
UPB_PRIVATE(_upb_Message_ClearHasbit)(msg, field);
} else if (upb_MiniTableField_IsInOneof(field)) {
uint32_t* ptr = _upb_Message_OneofCasePtr(msg, field);
if (*ptr != upb_MiniTableField_Number(field)) return;

Write Preview
Loading…
Cancel
Save