Auto-generate files after cl/587022805
diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 45a125c..e911420 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c
@@ -6902,7 +6902,7 @@ }; static bool upb_MtDecoder_FieldIsPackable(upb_MiniTableField* field) { - return (field->mode & kUpb_FieldMode_Array) && + return (field->UPB_PRIVATE(mode) & kUpb_FieldMode_Array) && upb_FieldType_IsPackable(field->UPB_PRIVATE(descriptortype)); } @@ -6919,18 +6919,18 @@ if (is_proto3_enum) { UPB_ASSERT(type == kUpb_FieldType_Enum); type = kUpb_FieldType_Int32; - field->mode |= kUpb_LabelFlags_IsAlternate; + field->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsAlternate; } else if (type == kUpb_FieldType_String && !(msg_modifiers & kUpb_MessageModifier_ValidateUtf8)) { type = kUpb_FieldType_Bytes; - field->mode |= kUpb_LabelFlags_IsAlternate; + field->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsAlternate; } field->UPB_PRIVATE(descriptortype) = type; if (upb_MtDecoder_FieldIsPackable(field) && (msg_modifiers & kUpb_MessageModifier_DefaultIsPacked)) { - field->mode |= kUpb_LabelFlags_IsPacked; + field->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsPacked; } if (type == kUpb_FieldType_Message || type == kUpb_FieldType_Group) { @@ -6997,18 +6997,19 @@ int8_t type = _upb_FromBase92(ch); if (ch >= _upb_ToBase92(kUpb_EncodedType_RepeatedBase)) { type -= kUpb_EncodedType_RepeatedBase; - field->mode = kUpb_FieldMode_Array; - field->mode |= pointer_rep << kUpb_FieldRep_Shift; + field->UPB_PRIVATE(mode) = kUpb_FieldMode_Array; + field->UPB_PRIVATE(mode) |= pointer_rep << kUpb_FieldRep_Shift; field->offset = kNoPresence; } else { - field->mode = kUpb_FieldMode_Scalar; + field->UPB_PRIVATE(mode) = kUpb_FieldMode_Scalar; field->offset = kHasbitPresence; if (type == kUpb_EncodedType_Group || type == kUpb_EncodedType_Message) { - field->mode |= pointer_rep << kUpb_FieldRep_Shift; + field->UPB_PRIVATE(mode) |= pointer_rep << kUpb_FieldRep_Shift; } else if ((unsigned long)type >= sizeof(kUpb_EncodedToFieldRep)) { upb_MdDecoder_ErrorJmp(&d->base, "Invalid field type: %d", (int)type); } else { - field->mode |= kUpb_EncodedToFieldRep[type] << kUpb_FieldRep_Shift; + field->UPB_PRIVATE(mode) |= kUpb_EncodedToFieldRep[type] + << kUpb_FieldRep_Shift; } } if ((unsigned long)type >= sizeof(kUpb_EncodedToType)) { @@ -7028,20 +7029,20 @@ "Cannot flip packed on unpackable field %" PRIu32, field->number); } - field->mode ^= kUpb_LabelFlags_IsPacked; + field->UPB_PRIVATE(mode) ^= kUpb_LabelFlags_IsPacked; } if (field_modifiers & kUpb_EncodedFieldModifier_FlipValidateUtf8) { if (field->UPB_PRIVATE(descriptortype) != kUpb_FieldType_Bytes || - !(field->mode & kUpb_LabelFlags_IsAlternate)) { + !(field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsAlternate)) { upb_MdDecoder_ErrorJmp( &d->base, "Cannot flip ValidateUtf8 on field %" PRIu32 ", type=%d, mode=%d", field->number, (int)field->UPB_PRIVATE(descriptortype), - (int)field->mode); + (int)field->UPB_PRIVATE(mode)); } field->UPB_PRIVATE(descriptortype) = kUpb_FieldType_String; - field->mode &= ~kUpb_LabelFlags_IsAlternate; + field->UPB_PRIVATE(mode) &= ~kUpb_LabelFlags_IsAlternate; } bool singular = field_modifiers & kUpb_EncodedFieldModifier_IsProto3Singular; @@ -7157,7 +7158,7 @@ } // Oneof storage must be large enough to accommodate the largest member. - int rep = f->mode >> kUpb_FieldRep_Shift; + int rep = f->UPB_PRIVATE(mode) >> kUpb_FieldRep_Shift; if (upb_MtDecoder_SizeOfRep(rep, d->platform) > upb_MtDecoder_SizeOfRep(item->rep, d->platform)) { item->rep = rep; @@ -7342,7 +7343,7 @@ upb_MiniTableField* f = &d->fields[i]; if (f->offset >= kOneofBase) continue; upb_LayoutItem item = {.field_index = i, - .rep = f->mode >> kUpb_FieldRep_Shift, + .rep = f->UPB_PRIVATE(mode) >> kUpb_FieldRep_Shift, .type = kUpb_LayoutItemType_Field}; upb_MtDecoder_PushItem(d, item); } @@ -7634,7 +7635,7 @@ upb_MiniTableField* f = &ext->UPB_PRIVATE(field); - f->mode |= kUpb_LabelFlags_IsExtension; + f->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsExtension; f->offset = 0; f->presence = 0; @@ -7728,7 +7729,9 @@ table->UPB_PRIVATE(ext) & kUpb_ExtMode_IsMapEntry; if (UPB_UNLIKELY(table_is_map)) return false; - field->mode = (field->mode & ~kUpb_FieldMode_Mask) | kUpb_FieldMode_Map; + field->UPB_PRIVATE(mode) = + (field->UPB_PRIVATE(mode) & ~kUpb_FieldMode_Mask) | + kUpb_FieldMode_Map; } break; @@ -12813,7 +12816,7 @@ // Extensions should not be unlinked. A message extension should not be // registered until its sub-message type is available to be linked. bool is_empty = UPB_PRIVATE(_upb_MiniTable_IsEmpty)(subl); - bool is_extension = field->mode & kUpb_LabelFlags_IsExtension; + bool is_extension = field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension; UPB_ASSERT(!(is_empty && is_extension)); if (is_empty && !(d->options & kUpb_DecodeOption_ExperimentalAllowUnlinked)) { @@ -12953,7 +12956,8 @@ // so we just re-encode the tag and value here. const uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Varint; upb_Message* unknown_msg = - field->mode & kUpb_LabelFlags_IsExtension ? d->unknown_msg : msg; + field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension ? d->unknown_msg + : msg; _upb_Decoder_AddUnknownVarints(d, unknown_msg, tag, v); return false; } @@ -13556,7 +13560,7 @@ const upb_MiniTableField* field, int* op) { // If sub-message is not linked, treat as unknown. - if (field->mode & kUpb_LabelFlags_IsExtension) return; + if (field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension) return; const upb_MiniTable* mt_sub = _upb_MiniTableSubs_MessageByField(mt->UPB_PRIVATE(subs), field); if ((d->options & kUpb_DecodeOption_ExperimentalAllowUnlinked) || @@ -13700,7 +13704,7 @@ const upb_MiniTable* layout, const upb_MiniTableField* field, int op, wireval* val) { const upb_MiniTableSub* subs = layout->UPB_PRIVATE(subs); - uint8_t mode = field->mode; + uint8_t mode = field->UPB_PRIVATE(mode); if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) { const upb_MiniTableExtension* ext_layout =
diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 7ebe9f9..8cdb1ac 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h
@@ -1094,7 +1094,7 @@ uint8_t UPB_PRIVATE(descriptortype); // upb_FieldMode | upb_LabelFlags | (upb_FieldRep << kUpb_FieldRep_Shift) - uint8_t mode; + uint8_t UPB_ONLYBITS(mode); }; #define kUpb_NoSub ((uint16_t)-1) @@ -1140,42 +1140,42 @@ UPB_INLINE upb_FieldMode UPB_PRIVATE(_upb_MiniTableField_Mode)(const struct upb_MiniTableField* f) { - return (upb_FieldMode)(f->mode & kUpb_FieldMode_Mask); + return (upb_FieldMode)(f->UPB_ONLYBITS(mode) & kUpb_FieldMode_Mask); } UPB_INLINE upb_FieldRep UPB_PRIVATE(_upb_MiniTableField_GetRep)(const struct upb_MiniTableField* f) { - return (upb_FieldRep)(f->mode >> kUpb_FieldRep_Shift); + return (upb_FieldRep)(f->UPB_ONLYBITS(mode) >> kUpb_FieldRep_Shift); } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsArray)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_FieldMode_Mask) == kUpb_FieldMode_Array; + return UPB_PRIVATE(_upb_MiniTableField_Mode)(f) == kUpb_FieldMode_Array; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsMap)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_FieldMode_Mask) == kUpb_FieldMode_Map; + return UPB_PRIVATE(_upb_MiniTableField_Mode)(f) == kUpb_FieldMode_Map; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsScalar)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_FieldMode_Mask) == kUpb_FieldMode_Scalar; + return UPB_PRIVATE(_upb_MiniTableField_Mode)(f) == kUpb_FieldMode_Scalar; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsAlternate)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_LabelFlags_IsAlternate) != 0; + return (f->UPB_ONLYBITS(mode) & kUpb_LabelFlags_IsAlternate) != 0; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsExtension)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_LabelFlags_IsExtension) != 0; + return (f->UPB_ONLYBITS(mode) & kUpb_LabelFlags_IsExtension) != 0; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsPacked)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_LabelFlags_IsPacked) != 0; + return (f->UPB_ONLYBITS(mode) & kUpb_LabelFlags_IsPacked) != 0; } UPB_INLINE upb_FieldType
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index 6e5bbcb..cf2069e 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -6416,7 +6416,7 @@ }; static bool upb_MtDecoder_FieldIsPackable(upb_MiniTableField* field) { - return (field->mode & kUpb_FieldMode_Array) && + return (field->UPB_PRIVATE(mode) & kUpb_FieldMode_Array) && upb_FieldType_IsPackable(field->UPB_PRIVATE(descriptortype)); } @@ -6433,18 +6433,18 @@ if (is_proto3_enum) { UPB_ASSERT(type == kUpb_FieldType_Enum); type = kUpb_FieldType_Int32; - field->mode |= kUpb_LabelFlags_IsAlternate; + field->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsAlternate; } else if (type == kUpb_FieldType_String && !(msg_modifiers & kUpb_MessageModifier_ValidateUtf8)) { type = kUpb_FieldType_Bytes; - field->mode |= kUpb_LabelFlags_IsAlternate; + field->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsAlternate; } field->UPB_PRIVATE(descriptortype) = type; if (upb_MtDecoder_FieldIsPackable(field) && (msg_modifiers & kUpb_MessageModifier_DefaultIsPacked)) { - field->mode |= kUpb_LabelFlags_IsPacked; + field->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsPacked; } if (type == kUpb_FieldType_Message || type == kUpb_FieldType_Group) { @@ -6511,18 +6511,19 @@ int8_t type = _upb_FromBase92(ch); if (ch >= _upb_ToBase92(kUpb_EncodedType_RepeatedBase)) { type -= kUpb_EncodedType_RepeatedBase; - field->mode = kUpb_FieldMode_Array; - field->mode |= pointer_rep << kUpb_FieldRep_Shift; + field->UPB_PRIVATE(mode) = kUpb_FieldMode_Array; + field->UPB_PRIVATE(mode) |= pointer_rep << kUpb_FieldRep_Shift; field->offset = kNoPresence; } else { - field->mode = kUpb_FieldMode_Scalar; + field->UPB_PRIVATE(mode) = kUpb_FieldMode_Scalar; field->offset = kHasbitPresence; if (type == kUpb_EncodedType_Group || type == kUpb_EncodedType_Message) { - field->mode |= pointer_rep << kUpb_FieldRep_Shift; + field->UPB_PRIVATE(mode) |= pointer_rep << kUpb_FieldRep_Shift; } else if ((unsigned long)type >= sizeof(kUpb_EncodedToFieldRep)) { upb_MdDecoder_ErrorJmp(&d->base, "Invalid field type: %d", (int)type); } else { - field->mode |= kUpb_EncodedToFieldRep[type] << kUpb_FieldRep_Shift; + field->UPB_PRIVATE(mode) |= kUpb_EncodedToFieldRep[type] + << kUpb_FieldRep_Shift; } } if ((unsigned long)type >= sizeof(kUpb_EncodedToType)) { @@ -6542,20 +6543,20 @@ "Cannot flip packed on unpackable field %" PRIu32, field->number); } - field->mode ^= kUpb_LabelFlags_IsPacked; + field->UPB_PRIVATE(mode) ^= kUpb_LabelFlags_IsPacked; } if (field_modifiers & kUpb_EncodedFieldModifier_FlipValidateUtf8) { if (field->UPB_PRIVATE(descriptortype) != kUpb_FieldType_Bytes || - !(field->mode & kUpb_LabelFlags_IsAlternate)) { + !(field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsAlternate)) { upb_MdDecoder_ErrorJmp( &d->base, "Cannot flip ValidateUtf8 on field %" PRIu32 ", type=%d, mode=%d", field->number, (int)field->UPB_PRIVATE(descriptortype), - (int)field->mode); + (int)field->UPB_PRIVATE(mode)); } field->UPB_PRIVATE(descriptortype) = kUpb_FieldType_String; - field->mode &= ~kUpb_LabelFlags_IsAlternate; + field->UPB_PRIVATE(mode) &= ~kUpb_LabelFlags_IsAlternate; } bool singular = field_modifiers & kUpb_EncodedFieldModifier_IsProto3Singular; @@ -6671,7 +6672,7 @@ } // Oneof storage must be large enough to accommodate the largest member. - int rep = f->mode >> kUpb_FieldRep_Shift; + int rep = f->UPB_PRIVATE(mode) >> kUpb_FieldRep_Shift; if (upb_MtDecoder_SizeOfRep(rep, d->platform) > upb_MtDecoder_SizeOfRep(item->rep, d->platform)) { item->rep = rep; @@ -6856,7 +6857,7 @@ upb_MiniTableField* f = &d->fields[i]; if (f->offset >= kOneofBase) continue; upb_LayoutItem item = {.field_index = i, - .rep = f->mode >> kUpb_FieldRep_Shift, + .rep = f->UPB_PRIVATE(mode) >> kUpb_FieldRep_Shift, .type = kUpb_LayoutItemType_Field}; upb_MtDecoder_PushItem(d, item); } @@ -7148,7 +7149,7 @@ upb_MiniTableField* f = &ext->UPB_PRIVATE(field); - f->mode |= kUpb_LabelFlags_IsExtension; + f->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsExtension; f->offset = 0; f->presence = 0; @@ -7242,7 +7243,9 @@ table->UPB_PRIVATE(ext) & kUpb_ExtMode_IsMapEntry; if (UPB_UNLIKELY(table_is_map)) return false; - field->mode = (field->mode & ~kUpb_FieldMode_Mask) | kUpb_FieldMode_Map; + field->UPB_PRIVATE(mode) = + (field->UPB_PRIVATE(mode) & ~kUpb_FieldMode_Mask) | + kUpb_FieldMode_Map; } break; @@ -12327,7 +12330,7 @@ // Extensions should not be unlinked. A message extension should not be // registered until its sub-message type is available to be linked. bool is_empty = UPB_PRIVATE(_upb_MiniTable_IsEmpty)(subl); - bool is_extension = field->mode & kUpb_LabelFlags_IsExtension; + bool is_extension = field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension; UPB_ASSERT(!(is_empty && is_extension)); if (is_empty && !(d->options & kUpb_DecodeOption_ExperimentalAllowUnlinked)) { @@ -12467,7 +12470,8 @@ // so we just re-encode the tag and value here. const uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Varint; upb_Message* unknown_msg = - field->mode & kUpb_LabelFlags_IsExtension ? d->unknown_msg : msg; + field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension ? d->unknown_msg + : msg; _upb_Decoder_AddUnknownVarints(d, unknown_msg, tag, v); return false; } @@ -13070,7 +13074,7 @@ const upb_MiniTableField* field, int* op) { // If sub-message is not linked, treat as unknown. - if (field->mode & kUpb_LabelFlags_IsExtension) return; + if (field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension) return; const upb_MiniTable* mt_sub = _upb_MiniTableSubs_MessageByField(mt->UPB_PRIVATE(subs), field); if ((d->options & kUpb_DecodeOption_ExperimentalAllowUnlinked) || @@ -13214,7 +13218,7 @@ const upb_MiniTable* layout, const upb_MiniTableField* field, int op, wireval* val) { const upb_MiniTableSub* subs = layout->UPB_PRIVATE(subs); - uint8_t mode = field->mode; + uint8_t mode = field->UPB_PRIVATE(mode); if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) { const upb_MiniTableExtension* ext_layout =
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index e3ee01f..cb0cbdf 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -1096,7 +1096,7 @@ uint8_t UPB_PRIVATE(descriptortype); // upb_FieldMode | upb_LabelFlags | (upb_FieldRep << kUpb_FieldRep_Shift) - uint8_t mode; + uint8_t UPB_ONLYBITS(mode); }; #define kUpb_NoSub ((uint16_t)-1) @@ -1142,42 +1142,42 @@ UPB_INLINE upb_FieldMode UPB_PRIVATE(_upb_MiniTableField_Mode)(const struct upb_MiniTableField* f) { - return (upb_FieldMode)(f->mode & kUpb_FieldMode_Mask); + return (upb_FieldMode)(f->UPB_ONLYBITS(mode) & kUpb_FieldMode_Mask); } UPB_INLINE upb_FieldRep UPB_PRIVATE(_upb_MiniTableField_GetRep)(const struct upb_MiniTableField* f) { - return (upb_FieldRep)(f->mode >> kUpb_FieldRep_Shift); + return (upb_FieldRep)(f->UPB_ONLYBITS(mode) >> kUpb_FieldRep_Shift); } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsArray)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_FieldMode_Mask) == kUpb_FieldMode_Array; + return UPB_PRIVATE(_upb_MiniTableField_Mode)(f) == kUpb_FieldMode_Array; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsMap)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_FieldMode_Mask) == kUpb_FieldMode_Map; + return UPB_PRIVATE(_upb_MiniTableField_Mode)(f) == kUpb_FieldMode_Map; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsScalar)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_FieldMode_Mask) == kUpb_FieldMode_Scalar; + return UPB_PRIVATE(_upb_MiniTableField_Mode)(f) == kUpb_FieldMode_Scalar; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsAlternate)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_LabelFlags_IsAlternate) != 0; + return (f->UPB_ONLYBITS(mode) & kUpb_LabelFlags_IsAlternate) != 0; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsExtension)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_LabelFlags_IsExtension) != 0; + return (f->UPB_ONLYBITS(mode) & kUpb_LabelFlags_IsExtension) != 0; } UPB_INLINE bool UPB_PRIVATE(_upb_MiniTableField_IsPacked)( const struct upb_MiniTableField* f) { - return (f->mode & kUpb_LabelFlags_IsPacked) != 0; + return (f->UPB_ONLYBITS(mode) & kUpb_LabelFlags_IsPacked) != 0; } UPB_INLINE upb_FieldType