Auto-generate files after cl/587127664
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c
index cf2069e..872f80b 100644
--- a/ruby/ext/google/protobuf_c/ruby-upb.c
+++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -6541,7 +6541,7 @@
if (!upb_MtDecoder_FieldIsPackable(field)) {
upb_MdDecoder_ErrorJmp(&d->base,
"Cannot flip packed on unpackable field %" PRIu32,
- field->number);
+ upb_MiniTableField_Number(field));
}
field->UPB_PRIVATE(mode) ^= kUpb_LabelFlags_IsPacked;
}
@@ -6549,11 +6549,12 @@
if (field_modifiers & kUpb_EncodedFieldModifier_FlipValidateUtf8) {
if (field->UPB_PRIVATE(descriptortype) != kUpb_FieldType_Bytes ||
!(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->UPB_PRIVATE(mode));
+ upb_MdDecoder_ErrorJmp(&d->base,
+ "Cannot flip ValidateUtf8 on field %" PRIu32
+ ", type=%d, mode=%d",
+ upb_MiniTableField_Number(field),
+ (int)field->UPB_PRIVATE(descriptortype),
+ (int)field->UPB_PRIVATE(mode));
}
field->UPB_PRIVATE(descriptortype) = kUpb_FieldType_String;
field->UPB_PRIVATE(mode) &= ~kUpb_LabelFlags_IsAlternate;
@@ -6566,12 +6567,12 @@
if ((singular || required) && field->offset != kHasbitPresence) {
upb_MdDecoder_ErrorJmp(&d->base,
"Invalid modifier(s) for repeated field %" PRIu32,
- field->number);
+ upb_MiniTableField_Number(field));
}
if (singular && required) {
upb_MdDecoder_ErrorJmp(
&d->base, "Field %" PRIu32 " cannot be both singular and required",
- field->number);
+ upb_MiniTableField_Number(field));
}
if (singular) field->offset = kNoPresence;
@@ -6772,7 +6773,7 @@
upb_MiniTableField* field = fields;
*field_count += 1;
fields = (char*)fields + field_size;
- field->number = ++last_field_number;
+ field->UPB_PRIVATE(number) = ++last_field_number;
last_field = field;
upb_MiniTable_SetField(d, ch, field, msg_modifiers, sub_counts);
} else if (kUpb_EncodedValue_MinModifier <= ch &&
@@ -6974,10 +6975,11 @@
const upb_MiniTableField* f,
uint32_t expected_num) {
const char* name = expected_num == 1 ? "key" : "val";
- if (f->number != expected_num) {
+ const uint32_t f_number = upb_MiniTableField_Number(f);
+ if (f_number != expected_num) {
upb_MdDecoder_ErrorJmp(&d->base,
"map %s did not have expected number (%d vs %d)",
- name, expected_num, (int)f->number);
+ name, expected_num, f_number);
}
if (!upb_MiniTableField_IsScalar(f)) {
@@ -7755,7 +7757,7 @@
// Ideal case: index into dense fields
if (i < m->UPB_PRIVATE(dense_below)) {
- UPB_ASSERT(m->UPB_PRIVATE(fields)[i].number == number);
+ UPB_ASSERT(m->UPB_PRIVATE(fields)[i].UPB_PRIVATE(number) == number);
return &m->UPB_PRIVATE(fields)[i];
}
@@ -7764,7 +7766,7 @@
int hi = m->UPB_PRIVATE(field_count) - 1;
while (lo <= hi) {
int mid = (lo + hi) / 2;
- uint32_t num = m->UPB_PRIVATE(fields)[mid].number;
+ uint32_t num = m->UPB_PRIVATE(fields)[mid].UPB_PRIVATE(number);
if (num < number) {
lo = mid + 1;
continue;
@@ -12431,7 +12433,8 @@
const upb_MiniTableSub* subs, const upb_MiniTableField* field) {
const upb_MiniTable* subl = _upb_MiniTableSubs_MessageByField(subs, field);
UPB_ASSERT(subl);
- return _upb_Decoder_DecodeGroup(d, ptr, submsg, subl, field->number);
+ return _upb_Decoder_DecodeGroup(d, ptr, submsg, subl,
+ field->UPB_PRIVATE(number));
}
static char* upb_Decoder_EncodeVarint32(uint32_t val, char* ptr) {
@@ -12468,7 +12471,8 @@
// Unrecognized enum goes into unknown fields.
// For packed fields the tag could be arbitrarily far in the past,
// so we just re-encode the tag and value here.
- const uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Varint;
+ const uint32_t tag =
+ ((uint32_t)field->UPB_PRIVATE(number) << 3) | kUpb_WireType_Varint;
upb_Message* unknown_msg =
field->UPB_PRIVATE(mode) & kUpb_LabelFlags_IsExtension ? d->unknown_msg
: msg;
@@ -12728,7 +12732,8 @@
if (size != 0) {
char* buf;
size_t size;
- uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Delimited;
+ uint32_t tag =
+ ((uint32_t)field->UPB_PRIVATE(number) << 3) | kUpb_WireType_Delimited;
upb_EncodeStatus status =
upb_Encode(&ent.data, entry, 0, &d->arena, &buf, &size);
if (status != kUpb_EncodeStatus_Ok) {
@@ -12768,10 +12773,11 @@
} else if (field->presence < 0) {
/* Oneof case */
uint32_t* oneof_case = _upb_Message_OneofCasePtr(msg, field);
- if (op == kUpb_DecodeOp_SubMessage && *oneof_case != field->number) {
+ if (op == kUpb_DecodeOp_SubMessage &&
+ *oneof_case != field->UPB_PRIVATE(number)) {
memset(mem, 0, sizeof(void*));
}
- *oneof_case = field->number;
+ *oneof_case = field->UPB_PRIVATE(number);
}
/* Store into message. */
@@ -13004,13 +13010,13 @@
* since fields are usually in order. */
size_t last = *last_field_index;
for (idx = last; idx < t->UPB_PRIVATE(field_count); idx++) {
- if (t->UPB_PRIVATE(fields)[idx].number == field_number) {
+ if (t->UPB_PRIVATE(fields)[idx].UPB_PRIVATE(number) == field_number) {
goto found;
}
}
for (idx = t->UPB_PRIVATE(dense_below); idx < last; idx++) {
- if (t->UPB_PRIVATE(fields)[idx].number == field_number) {
+ if (t->UPB_PRIVATE(fields)[idx].UPB_PRIVATE(number) == field_number) {
goto found;
}
}
@@ -13037,7 +13043,7 @@
return &none; /* Unknown field. */
found:
- UPB_ASSERT(t->UPB_PRIVATE(fields)[idx].number == field_number);
+ UPB_ASSERT(t->UPB_PRIVATE(fields)[idx].UPB_PRIVATE(number) == field_number);
*last_field_index = idx;
return &t->UPB_PRIVATE(fields)[idx];
}
@@ -13195,7 +13201,7 @@
*op = _upb_Decoder_GetDelimitedOp(d, mt, field);
return ptr;
case kUpb_WireType_StartGroup:
- val->uint32_val = field->number;
+ val->uint32_val = field->UPB_PRIVATE(number);
if (field->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Group) {
*op = kUpb_DecodeOp_SubMessage;
_upb_Decoder_CheckUnlinked(d, mt, field, op);
@@ -14689,7 +14695,7 @@
return;
}
if (--e->depth == 0) encode_err(e, kUpb_EncodeStatus_MaxDepthExceeded);
- encode_tag(e, f->number, kUpb_WireType_EndGroup);
+ encode_tag(e, f->UPB_PRIVATE(number), kUpb_WireType_EndGroup);
encode_TaggedMessagePtr(e, submsg, subm, &size);
wire_type = kUpb_WireType_StartGroup;
e->depth++;
@@ -14715,7 +14721,7 @@
}
#undef CASE
- encode_tag(e, f->number, wire_type);
+ encode_tag(e, f->UPB_PRIVATE(number), wire_type);
}
static void encode_array(upb_encstate* e, const upb_Message* msg,
@@ -14729,20 +14735,21 @@
return;
}
-#define VARINT_CASE(ctype, encode) \
- { \
- const ctype* start = _upb_array_constptr(arr); \
- const ctype* ptr = start + arr->size; \
- uint32_t tag = packed ? 0 : (f->number << 3) | kUpb_WireType_Varint; \
- do { \
- ptr--; \
- encode_varint(e, encode); \
- if (tag) encode_varint(e, tag); \
- } while (ptr != start); \
- } \
+#define VARINT_CASE(ctype, encode) \
+ { \
+ const ctype* start = _upb_array_constptr(arr); \
+ const ctype* ptr = start + arr->size; \
+ uint32_t tag = \
+ packed ? 0 : (f->UPB_PRIVATE(number) << 3) | kUpb_WireType_Varint; \
+ do { \
+ ptr--; \
+ encode_varint(e, encode); \
+ if (tag) encode_varint(e, tag); \
+ } while (ptr != start); \
+ } \
break;
-#define TAG(wire_type) (packed ? 0 : (f->number << 3 | wire_type))
+#define TAG(wire_type) (packed ? 0 : (f->UPB_PRIVATE(number) << 3 | wire_type))
switch (f->UPB_PRIVATE(descriptortype)) {
case kUpb_FieldType_Double:
@@ -14781,7 +14788,7 @@
ptr--;
encode_bytes(e, ptr->data, ptr->size);
encode_varint(e, ptr->size);
- encode_tag(e, f->number, kUpb_WireType_Delimited);
+ encode_tag(e, f->UPB_PRIVATE(number), kUpb_WireType_Delimited);
} while (ptr != start);
return;
}
@@ -14794,9 +14801,9 @@
do {
size_t size;
ptr--;
- encode_tag(e, f->number, kUpb_WireType_EndGroup);
+ encode_tag(e, f->UPB_PRIVATE(number), kUpb_WireType_EndGroup);
encode_TaggedMessagePtr(e, *ptr, subm, &size);
- encode_tag(e, f->number, kUpb_WireType_StartGroup);
+ encode_tag(e, f->UPB_PRIVATE(number), kUpb_WireType_StartGroup);
} while (ptr != start);
e->depth++;
return;
@@ -14812,7 +14819,7 @@
ptr--;
encode_TaggedMessagePtr(e, *ptr, subm, &size);
encode_varint(e, size);
- encode_tag(e, f->number, kUpb_WireType_Delimited);
+ encode_tag(e, f->UPB_PRIVATE(number), kUpb_WireType_Delimited);
} while (ptr != start);
e->depth++;
return;
@@ -14822,7 +14829,7 @@
if (packed) {
encode_varint(e, e->limit - e->ptr - pre_len);
- encode_tag(e, f->number, kUpb_WireType_Delimited);
+ encode_tag(e, f->UPB_PRIVATE(number), kUpb_WireType_Delimited);
}
}
@@ -14857,7 +14864,7 @@
map, &sorted);
upb_MapEntry ent;
while (_upb_sortedmap_next(&e->sorter, map, &sorted, &ent)) {
- encode_mapentry(e, f->number, layout, &ent);
+ encode_mapentry(e, f->UPB_PRIVATE(number), layout, &ent);
}
_upb_mapsorter_popmap(&e->sorter, &sorted);
} else {
@@ -14868,7 +14875,7 @@
upb_MapEntry ent;
_upb_map_fromkey(key, &ent.data.k, map->key_size);
_upb_map_fromvalue(val, &ent.data.v, map->val_size);
- encode_mapentry(e, f->number, layout, &ent);
+ encode_mapentry(e, f->UPB_PRIVATE(number), layout, &ent);
}
}
}
@@ -14907,7 +14914,7 @@
return _upb_Message_GetHasbitByField(msg, f);
} else {
// Field is in a oneof.
- return _upb_Message_GetOneofCase(msg, f) == f->number;
+ return _upb_Message_GetOneofCase(msg, f) == f->UPB_PRIVATE(number);
}
}
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index 455352d..27f49ec 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -1011,6 +1011,8 @@
#ifndef UPB_MINI_TABLE_FIELD_H_
#define UPB_MINI_TABLE_FIELD_H_
+#include <stdint.h>
+
#ifndef UPB_MINI_TABLE_INTERNAL_FIELD_H_
#define UPB_MINI_TABLE_INTERNAL_FIELD_H_
@@ -1090,7 +1092,7 @@
// LINT.IfChange(struct_definition)
struct upb_MiniTableField {
- uint32_t number;
+ uint32_t UPB_ONLYBITS(number);
uint16_t offset;
int16_t presence; // If >0, hasbit_index. If <0, ~oneof_index
@@ -1226,6 +1228,11 @@
}
}
+UPB_INLINE uint32_t
+UPB_PRIVATE(_upb_MiniTableField_Number)(const struct upb_MiniTableField* f) {
+ return f->UPB_ONLYBITS(number);
+}
+
UPB_INLINE void UPB_PRIVATE(_upb_MiniTableField_CheckIsArray)(
const struct upb_MiniTableField* f) {
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
@@ -1308,6 +1315,10 @@
return UPB_PRIVATE(_upb_MiniTableField_IsSubMessage)(f);
}
+UPB_API_INLINE uint32_t upb_MiniTableField_Number(const upb_MiniTableField* f) {
+ return UPB_PRIVATE(_upb_MiniTableField_Number)(f);
+}
+
UPB_API_INLINE upb_FieldType
upb_MiniTableField_Type(const upb_MiniTableField* f) {
return UPB_PRIVATE(_upb_MiniTableField_Type)(f);
@@ -1631,7 +1642,7 @@
UPB_INLINE uint32_t UPB_PRIVATE(_upb_MiniTableExtension_Number)(
const struct upb_MiniTableExtension* e) {
- return e->UPB_PRIVATE(field).number;
+ return e->UPB_PRIVATE(field).UPB_ONLYBITS(number);
}
UPB_INLINE const struct upb_MiniTable* UPB_PRIVATE(
@@ -2556,7 +2567,7 @@
UPB_INLINE void _upb_Message_SetOneofCase(upb_Message* msg,
const upb_MiniTableField* f) {
- *_upb_Message_OneofCasePtr(msg, f) = f->number;
+ *_upb_Message_OneofCasePtr(msg, f) = upb_MiniTableField_Number(f);
}
// TODO: implement _upb_Message_ClearOneofCase()
@@ -2664,7 +2675,8 @@
UPB_ASSERT(upb_MiniTableField_HasPresence(field));
UPB_ASSUME(!upb_MiniTableField_IsExtension(field));
if (upb_MiniTableField_IsInOneof(field)) {
- return _upb_Message_GetOneofCase(msg, field) == field->number;
+ return _upb_Message_GetOneofCase(msg, field) ==
+ upb_MiniTableField_Number(field);
} else {
return _upb_Message_GetHasbitByField(msg, field);
}
@@ -2762,7 +2774,7 @@
_upb_Message_ClearHasbitByField(msg, field);
} else if (upb_MiniTableField_IsInOneof(field)) {
uint32_t* ptr = _upb_Message_OneofCasePtr(msg, field);
- if (*ptr != field->number) return;
+ if (*ptr != upb_MiniTableField_Number(field)) return;
*ptr = 0;
}
const char zeros[16] = {0};
