Auto-generate files after cl/592081461
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c
index 9c4c893..73b1af4 100644
--- a/ruby/ext/google/protobuf_c/ruby-upb.c
+++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -6613,10 +6613,10 @@
type -= kUpb_EncodedType_RepeatedBase;
field->UPB_PRIVATE(mode) = kUpb_FieldMode_Array;
field->UPB_PRIVATE(mode) |= pointer_rep << kUpb_FieldRep_Shift;
- field->offset = kNoPresence;
+ field->UPB_PRIVATE(offset) = kNoPresence;
} else {
field->UPB_PRIVATE(mode) = kUpb_FieldMode_Scalar;
- field->offset = kHasbitPresence;
+ field->UPB_PRIVATE(offset) = kHasbitPresence;
if (type == kUpb_EncodedType_Group || type == kUpb_EncodedType_Message) {
field->UPB_PRIVATE(mode) |= pointer_rep << kUpb_FieldRep_Shift;
} else if ((unsigned long)type >= sizeof(kUpb_EncodedToFieldRep)) {
@@ -6664,7 +6664,7 @@
bool required = field_modifiers & kUpb_EncodedFieldModifier_IsRequired;
// Validate.
- if ((singular || required) && field->offset != kHasbitPresence) {
+ if ((singular || required) && field->UPB_PRIVATE(offset) != kHasbitPresence) {
upb_MdDecoder_ErrorJmp(&d->base,
"Invalid modifier(s) for repeated field %" PRIu32,
upb_MiniTableField_Number(field));
@@ -6675,9 +6675,9 @@
upb_MiniTableField_Number(field));
}
- if (singular) field->offset = kNoPresence;
+ if (singular) field->UPB_PRIVATE(offset) = kNoPresence;
if (required) {
- field->offset = kRequiredPresence;
+ field->UPB_PRIVATE(offset) = kRequiredPresence;
}
}
@@ -6764,7 +6764,7 @@
" to oneof, no such field number.",
field_num);
}
- if (f->offset != kHasbitPresence) {
+ if (f->UPB_PRIVATE(offset) != kHasbitPresence) {
upb_MdDecoder_ErrorJmp(
&d->base,
"Cannot add repeated, required, or singular field %" PRIu32
@@ -6779,7 +6779,7 @@
item->rep = rep;
}
// Prepend this field to the linked list.
- f->offset = item->field_index;
+ f->UPB_PRIVATE(offset) = item->field_index;
item->field_index = (f - d->fields) + kOneofBase;
return ptr;
}
@@ -6956,7 +6956,7 @@
int n = d->table->UPB_PRIVATE(field_count);
for (int i = 0; i < n; i++) {
upb_MiniTableField* f = &d->fields[i];
- if (f->offset >= kOneofBase) continue;
+ if (f->UPB_PRIVATE(offset) >= kOneofBase) continue;
upb_LayoutItem item = {.field_index = i,
.rep = f->UPB_PRIVATE(mode) >> kUpb_FieldRep_Shift,
.type = kUpb_LayoutItemType_Field};
@@ -6984,9 +6984,9 @@
for (int i = 0; i < n; i++) {
upb_MiniTableField* field =
(upb_MiniTableField*)&ret->UPB_PRIVATE(fields)[i];
- if (field->offset == kRequiredPresence) {
+ if (field->UPB_PRIVATE(offset) == kRequiredPresence) {
field->presence = ++last_hasbit;
- } else if (field->offset == kNoPresence) {
+ } else if (field->UPB_PRIVATE(offset) == kNoPresence) {
field->presence = 0;
}
}
@@ -7000,7 +7000,7 @@
for (int i = 0; i < n; i++) {
upb_MiniTableField* field =
(upb_MiniTableField*)&ret->UPB_PRIVATE(fields)[i];
- if (field->offset == kHasbitPresence) {
+ if (field->UPB_PRIVATE(offset) == kHasbitPresence) {
field->presence = ++last_hasbit;
}
}
@@ -7038,9 +7038,10 @@
upb_MiniTableField* f = &d->fields[item->field_index];
while (true) {
f->presence = ~item->offset;
- if (f->offset == kUpb_LayoutItem_IndexSentinel) break;
- UPB_ASSERT(f->offset - kOneofBase < d->table->UPB_PRIVATE(field_count));
- f = &d->fields[f->offset - kOneofBase];
+ if (f->UPB_PRIVATE(offset) == kUpb_LayoutItem_IndexSentinel) break;
+ UPB_ASSERT(f->UPB_PRIVATE(offset) - kOneofBase <
+ d->table->UPB_PRIVATE(field_count));
+ f = &d->fields[f->UPB_PRIVATE(offset) - kOneofBase];
}
}
@@ -7050,14 +7051,14 @@
switch (item->type) {
case kUpb_LayoutItemType_OneofField:
while (true) {
- uint16_t next_offset = f->offset;
- f->offset = item->offset;
+ uint16_t next_offset = f->UPB_PRIVATE(offset);
+ f->UPB_PRIVATE(offset) = item->offset;
if (next_offset == kUpb_LayoutItem_IndexSentinel) break;
f = &d->fields[next_offset - kOneofBase];
}
break;
case kUpb_LayoutItemType_Field:
- f->offset = item->offset;
+ f->UPB_PRIVATE(offset) = item->offset;
break;
default:
break;
@@ -7128,8 +7129,8 @@
// NOTE: sync with mini_table/message_internal.h.
const size_t kv_size = d->platform == kUpb_MiniTablePlatform_32Bit ? 8 : 16;
const size_t hasbit_size = 8;
- d->fields[0].offset = hasbit_size;
- d->fields[1].offset = hasbit_size + kv_size;
+ d->fields[0].UPB_PRIVATE(offset) = hasbit_size;
+ d->fields[1].UPB_PRIVATE(offset) = hasbit_size + kv_size;
d->table->UPB_PRIVATE(size) =
UPB_ALIGN_UP(hasbit_size + kv_size + kv_size, 8);
@@ -7254,7 +7255,7 @@
upb_MiniTableField* f = &ext->UPB_PRIVATE(field);
f->UPB_PRIVATE(mode) |= kUpb_LabelFlags_IsExtension;
- f->offset = 0;
+ f->UPB_PRIVATE(offset) = 0;
f->presence = 0;
if (extendee->UPB_PRIVATE(ext) & kUpb_ExtMode_IsMessageSet) {
@@ -12700,7 +12701,7 @@
const upb_MiniTableSub* subs,
const upb_MiniTableField* field,
wireval* val, int op) {
- upb_Array** arrp = UPB_PTR_AT(msg, field->offset, void);
+ upb_Array** arrp = UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), void);
upb_Array* arr = *arrp;
void* mem;
@@ -12791,8 +12792,8 @@
const upb_MiniTableField* val_field = &entry->UPB_PRIVATE(fields)[1];
char key_size = kSizeInMap[key_field->UPB_PRIVATE(descriptortype)];
char val_size = kSizeInMap[val_field->UPB_PRIVATE(descriptortype)];
- UPB_ASSERT(key_field->offset == offsetof(upb_MapEntryData, k));
- UPB_ASSERT(val_field->offset == offsetof(upb_MapEntryData, v));
+ UPB_ASSERT(key_field->UPB_PRIVATE(offset) == offsetof(upb_MapEntryData, k));
+ UPB_ASSERT(val_field->UPB_PRIVATE(offset) == offsetof(upb_MapEntryData, v));
upb_Map* ret = _upb_Map_New(&d->arena, key_size, val_size);
if (!ret) _upb_Decoder_ErrorJmp(d, kUpb_DecodeStatus_OutOfMemory);
return ret;
@@ -12803,7 +12804,7 @@
const upb_MiniTableSub* subs,
const upb_MiniTableField* field,
wireval* val) {
- upb_Map** map_p = UPB_PTR_AT(msg, field->offset, upb_Map*);
+ upb_Map** map_p = UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), upb_Map*);
upb_Map* map = *map_p;
upb_MapEntry ent;
UPB_ASSERT(upb_MiniTableField_Type(field) == kUpb_FieldType_Message);
@@ -12866,7 +12867,7 @@
upb_Decoder* d, const char* ptr, upb_Message* msg,
const upb_MiniTableSub* subs, const upb_MiniTableField* field, wireval* val,
int op) {
- void* mem = UPB_PTR_AT(msg, field->offset, void);
+ void* mem = UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), void);
int type = field->UPB_PRIVATE(descriptortype);
if (UPB_UNLIKELY(op == kUpb_DecodeOp_Enum) &&
@@ -14839,7 +14840,7 @@
static void encode_array(upb_encstate* e, const upb_Message* msg,
const upb_MiniTableSub* subs,
const upb_MiniTableField* f) {
- const upb_Array* arr = *UPB_PTR_AT(msg, f->offset, upb_Array*);
+ const upb_Array* arr = *UPB_PTR_AT(msg, f->UPB_PRIVATE(offset), upb_Array*);
bool packed = upb_MiniTableField_IsPacked(f);
size_t pre_len = e->limit - e->ptr;
@@ -14962,7 +14963,7 @@
static void encode_map(upb_encstate* e, const upb_Message* msg,
const upb_MiniTableSub* subs,
const upb_MiniTableField* f) {
- const upb_Map* map = *UPB_PTR_AT(msg, f->offset, const upb_Map*);
+ const upb_Map* map = *UPB_PTR_AT(msg, f->UPB_PRIVATE(offset), const upb_Map*);
const upb_MiniTable* layout =
upb_MiniTableSub_Message(subs[f->UPB_PRIVATE(submsg_index)]);
UPB_ASSERT(layout->UPB_PRIVATE(field_count) == 2);
@@ -14997,7 +14998,7 @@
const upb_MiniTableField* f) {
if (f->presence == 0) {
// Proto3 presence or map/array.
- const void* mem = UPB_PTR_AT(msg, f->offset, void);
+ const void* mem = UPB_PTR_AT(msg, f->UPB_PRIVATE(offset), void);
switch (UPB_PRIVATE(_upb_MiniTableField_GetRep)(f)) {
case kUpb_FieldRep_1Byte: {
char ch;
@@ -15042,7 +15043,8 @@
encode_map(e, msg, subs, field);
break;
case kUpb_FieldMode_Scalar:
- encode_scalar(e, UPB_PTR_AT(msg, field->offset, void), subs, field);
+ encode_scalar(e, UPB_PTR_AT(msg, field->UPB_PRIVATE(offset), void), subs,
+ field);
break;
default:
UPB_UNREACHABLE();
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index a73d895..3f6da09 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -1097,7 +1097,7 @@
// LINT.IfChange(struct_definition)
struct upb_MiniTableField {
uint32_t UPB_ONLYBITS(number);
- uint16_t offset;
+ uint16_t UPB_ONLYBITS(offset);
int16_t presence; // If >0, hasbit_index. If <0, ~oneof_index
// Indexes into `upb_MiniTable.subs`
@@ -1251,6 +1251,11 @@
return f->UPB_ONLYBITS(number);
}
+UPB_INLINE uint16_t
+UPB_PRIVATE(_upb_MiniTableField_Offset)(const struct upb_MiniTableField* f) {
+ return f->UPB_ONLYBITS(offset);
+}
+
UPB_INLINE size_t
_upb_MiniTableField_OneofOffset(const struct upb_MiniTableField* f) {
UPB_ASSERT(UPB_PRIVATE(_upb_MiniTableField_IsInOneof)(f));
@@ -2517,12 +2522,12 @@
UPB_INLINE void* _upb_MiniTableField_GetPtr(upb_Message* msg,
const upb_MiniTableField* field) {
- return (char*)msg + field->offset;
+ return (char*)msg + field->UPB_ONLYBITS(offset);
}
UPB_INLINE const void* _upb_MiniTableField_GetConstPtr(
const upb_Message* msg, const upb_MiniTableField* field) {
- return (char*)msg + field->offset;
+ return (char*)msg + field->UPB_ONLYBITS(offset);
}
UPB_INLINE void UPB_PRIVATE(_upb_Message_SetPresence)(
@@ -3264,13 +3269,14 @@
const upb_MiniTableField* field, upb_Arena* arena) {
UPB_ASSERT(arena);
UPB_ASSUME(upb_MiniTableField_CType(field) == kUpb_CType_Message);
- upb_Message* sub_message = *UPB_PTR_AT(msg, field->offset, upb_Message*);
+ upb_Message* sub_message =
+ *UPB_PTR_AT(msg, field->UPB_ONLYBITS(offset), upb_Message*);
if (!sub_message) {
const upb_MiniTable* sub_mini_table = upb_MiniTableSub_Message(
mini_table->UPB_PRIVATE(subs)[field->UPB_PRIVATE(submsg_index)]);
UPB_ASSERT(sub_mini_table);
sub_message = _upb_Message_New(sub_mini_table, arena);
- *UPB_PTR_AT(msg, field->offset, upb_Message*) = sub_message;
+ *UPB_PTR_AT(msg, field->UPB_ONLYBITS(offset), upb_Message*) = sub_message;
UPB_PRIVATE(_upb_Message_SetPresence)(msg, field);
}
return sub_message;
