Merge branch 'main' into mini-table-1

pull/13171/head
Joshua Haberman 3 years ago
commit 4498c88bc0
  1. 306
      cmake/google/protobuf/descriptor.upb.c
  2. 10
      upb/decode.c
  3. 54
      upb/def.c
  4. 16
      upb/encode.c
  5. 52
      upb/msg_internal.h
  6. 26
      upbc/protoc-gen-upb.cc

@ -17,13 +17,13 @@ static const upb_MiniTable_Sub google_protobuf_FileDescriptorSet_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_FileDescriptorSet__fields[1] = { static const upb_MiniTable_Field google_protobuf_FileDescriptorSet__fields[1] = {
{1, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {1, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_FileDescriptorSet_msginit = { const upb_MiniTable google_protobuf_FileDescriptorSet_msginit = {
&google_protobuf_FileDescriptorSet_submsgs[0], &google_protobuf_FileDescriptorSet_submsgs[0],
&google_protobuf_FileDescriptorSet__fields[0], &google_protobuf_FileDescriptorSet__fields[0],
UPB_SIZE(8, 8), 1, upb_ExtMode_NonExtendable, 1, 255, 0, UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_FileDescriptorProto_submsgs[6] = { static const upb_MiniTable_Sub google_protobuf_FileDescriptorProto_submsgs[6] = {
@ -36,24 +36,24 @@ static const upb_MiniTable_Sub google_protobuf_FileDescriptorProto_submsgs[6] =
}; };
static const upb_MiniTable_Field google_protobuf_FileDescriptorProto__fields[12] = { static const upb_MiniTable_Field google_protobuf_FileDescriptorProto__fields[12] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(12, 24), 2, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {2, UPB_SIZE(12, 24), 2, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(36, 72), 0, 0, 12, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {3, UPB_SIZE(36, 72), 0, 0, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(40, 80), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {4, UPB_SIZE(40, 80), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(44, 88), 0, 1, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {5, UPB_SIZE(44, 88), 0, 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(48, 96), 0, 4, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {6, UPB_SIZE(48, 96), 0, 4, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{7, UPB_SIZE(52, 104), 0, 2, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {7, UPB_SIZE(52, 104), 0, 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{8, UPB_SIZE(28, 56), 3, 3, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {8, UPB_SIZE(28, 56), 3, 3, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{9, UPB_SIZE(32, 64), 4, 5, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {9, UPB_SIZE(32, 64), 4, 5, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{10, UPB_SIZE(56, 112), 0, 0, 5, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {10, UPB_SIZE(56, 112), 0, 0, 5, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{11, UPB_SIZE(60, 120), 0, 0, 5, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {11, UPB_SIZE(60, 120), 0, 0, 5, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{12, UPB_SIZE(20, 40), 5, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {12, UPB_SIZE(20, 40), 5, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_FileDescriptorProto_msginit = { const upb_MiniTable google_protobuf_FileDescriptorProto_msginit = {
&google_protobuf_FileDescriptorProto_submsgs[0], &google_protobuf_FileDescriptorProto_submsgs[0],
&google_protobuf_FileDescriptorProto__fields[0], &google_protobuf_FileDescriptorProto__fields[0],
UPB_SIZE(64, 128), 12, upb_ExtMode_NonExtendable, 12, 255, 0, UPB_SIZE(64, 128), 12, kUpb_ExtMode_NonExtendable, 12, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_DescriptorProto_submsgs[7] = { static const upb_MiniTable_Sub google_protobuf_DescriptorProto_submsgs[7] = {
@ -67,22 +67,22 @@ static const upb_MiniTable_Sub google_protobuf_DescriptorProto_submsgs[7] = {
}; };
static const upb_MiniTable_Field google_protobuf_DescriptorProto__fields[10] = { static const upb_MiniTable_Field google_protobuf_DescriptorProto__fields[10] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(16, 32), 0, 4, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, 4, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(20, 40), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(24, 48), 0, 3, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {4, UPB_SIZE(24, 48), 0, 3, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(28, 56), 0, 1, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {5, UPB_SIZE(28, 56), 0, 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(32, 64), 0, 4, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {6, UPB_SIZE(32, 64), 0, 4, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{7, UPB_SIZE(12, 24), 2, 5, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {7, UPB_SIZE(12, 24), 2, 5, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{8, UPB_SIZE(36, 72), 0, 6, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {8, UPB_SIZE(36, 72), 0, 6, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{9, UPB_SIZE(40, 80), 0, 2, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {9, UPB_SIZE(40, 80), 0, 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{10, UPB_SIZE(44, 88), 0, 0, 12, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {10, UPB_SIZE(44, 88), 0, 0, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_DescriptorProto_msginit = { const upb_MiniTable google_protobuf_DescriptorProto_msginit = {
&google_protobuf_DescriptorProto_submsgs[0], &google_protobuf_DescriptorProto_submsgs[0],
&google_protobuf_DescriptorProto__fields[0], &google_protobuf_DescriptorProto__fields[0],
UPB_SIZE(48, 96), 10, upb_ExtMode_NonExtendable, 10, 255, 0, UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
@ -90,26 +90,26 @@ static const upb_MiniTable_Sub google_protobuf_DescriptorProto_ExtensionRange_su
}; };
static const upb_MiniTable_Field google_protobuf_DescriptorProto_ExtensionRange__fields[3] = { static const upb_MiniTable_Field google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
{1, UPB_SIZE(4, 4), 1, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 4), 1, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(8, 8), 2, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(8, 8), 2, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(12, 16), 3, 0, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {3, UPB_SIZE(12, 16), 3, 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msginit = { const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msginit = {
&google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
&google_protobuf_DescriptorProto_ExtensionRange__fields[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
UPB_SIZE(16, 24), 3, upb_ExtMode_NonExtendable, 3, 255, 0, UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
}; };
static const upb_MiniTable_Field google_protobuf_DescriptorProto_ReservedRange__fields[2] = { static const upb_MiniTable_Field google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
{1, UPB_SIZE(4, 4), 1, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 4), 1, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(8, 8), 2, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(8, 8), 2, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msginit = { const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msginit = {
NULL, NULL,
&google_protobuf_DescriptorProto_ReservedRange__fields[0], &google_protobuf_DescriptorProto_ReservedRange__fields[0],
UPB_SIZE(16, 16), 2, upb_ExtMode_NonExtendable, 2, 255, 0, UPB_SIZE(16, 16), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_ExtensionRangeOptions_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_ExtensionRangeOptions_submsgs[1] = {
@ -117,13 +117,13 @@ static const upb_MiniTable_Sub google_protobuf_ExtensionRangeOptions_submsgs[1]
}; };
static const upb_MiniTable_Field google_protobuf_ExtensionRangeOptions__fields[1] = { static const upb_MiniTable_Field google_protobuf_ExtensionRangeOptions__fields[1] = {
{999, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_ExtensionRangeOptions_msginit = { const upb_MiniTable google_protobuf_ExtensionRangeOptions_msginit = {
&google_protobuf_ExtensionRangeOptions_submsgs[0], &google_protobuf_ExtensionRangeOptions_submsgs[0],
&google_protobuf_ExtensionRangeOptions__fields[0], &google_protobuf_ExtensionRangeOptions__fields[0],
UPB_SIZE(8, 8), 1, upb_ExtMode_Extendable, 0, 255, 0, UPB_SIZE(8, 8), 1, kUpb_ExtMode_Extendable, 0, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_FieldDescriptorProto_submsgs[3] = { static const upb_MiniTable_Sub google_protobuf_FieldDescriptorProto_submsgs[3] = {
@ -133,23 +133,23 @@ static const upb_MiniTable_Sub google_protobuf_FieldDescriptorProto_submsgs[3] =
}; };
static const upb_MiniTable_Field google_protobuf_FieldDescriptorProto__fields[11] = { static const upb_MiniTable_Field google_protobuf_FieldDescriptorProto__fields[11] = {
{1, UPB_SIZE(24, 24), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(24, 24), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(32, 40), 2, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {2, UPB_SIZE(32, 40), 2, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(12, 12), 3, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {3, UPB_SIZE(12, 12), 3, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(4, 4), 4, 1, 14, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {4, UPB_SIZE(4, 4), 4, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(8, 8), 5, 2, 14, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {5, UPB_SIZE(8, 8), 5, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(40, 56), 6, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {6, UPB_SIZE(40, 56), 6, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{7, UPB_SIZE(48, 72), 7, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {7, UPB_SIZE(48, 72), 7, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{8, UPB_SIZE(64, 104), 8, 0, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {8, UPB_SIZE(64, 104), 8, 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{9, UPB_SIZE(16, 16), 9, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {9, UPB_SIZE(16, 16), 9, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{10, UPB_SIZE(56, 88), 10, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {10, UPB_SIZE(56, 88), 10, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{17, UPB_SIZE(20, 20), 11, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {17, UPB_SIZE(20, 20), 11, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_FieldDescriptorProto_msginit = { const upb_MiniTable google_protobuf_FieldDescriptorProto_msginit = {
&google_protobuf_FieldDescriptorProto_submsgs[0], &google_protobuf_FieldDescriptorProto_submsgs[0],
&google_protobuf_FieldDescriptorProto__fields[0], &google_protobuf_FieldDescriptorProto__fields[0],
UPB_SIZE(72, 112), 11, upb_ExtMode_NonExtendable, 10, 255, 0, UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_OneofDescriptorProto_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_OneofDescriptorProto_submsgs[1] = {
@ -157,14 +157,14 @@ static const upb_MiniTable_Sub google_protobuf_OneofDescriptorProto_submsgs[1] =
}; };
static const upb_MiniTable_Field google_protobuf_OneofDescriptorProto__fields[2] = { static const upb_MiniTable_Field google_protobuf_OneofDescriptorProto__fields[2] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(12, 24), 2, 0, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {2, UPB_SIZE(12, 24), 2, 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_OneofDescriptorProto_msginit = { const upb_MiniTable google_protobuf_OneofDescriptorProto_msginit = {
&google_protobuf_OneofDescriptorProto_submsgs[0], &google_protobuf_OneofDescriptorProto_submsgs[0],
&google_protobuf_OneofDescriptorProto__fields[0], &google_protobuf_OneofDescriptorProto__fields[0],
UPB_SIZE(16, 32), 2, upb_ExtMode_NonExtendable, 2, 255, 0, UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_EnumDescriptorProto_submsgs[3] = { static const upb_MiniTable_Sub google_protobuf_EnumDescriptorProto_submsgs[3] = {
@ -174,28 +174,28 @@ static const upb_MiniTable_Sub google_protobuf_EnumDescriptorProto_submsgs[3] =
}; };
static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto__fields[5] = { static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto__fields[5] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(16, 32), 0, 2, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(12, 24), 2, 1, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {3, UPB_SIZE(12, 24), 2, 1, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(20, 40), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {4, UPB_SIZE(20, 40), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(24, 48), 0, 0, 12, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {5, UPB_SIZE(24, 48), 0, 0, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_EnumDescriptorProto_msginit = { const upb_MiniTable google_protobuf_EnumDescriptorProto_msginit = {
&google_protobuf_EnumDescriptorProto_submsgs[0], &google_protobuf_EnumDescriptorProto_submsgs[0],
&google_protobuf_EnumDescriptorProto__fields[0], &google_protobuf_EnumDescriptorProto__fields[0],
UPB_SIZE(32, 64), 5, upb_ExtMode_NonExtendable, 5, 255, 0, UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 5, 255, 0,
}; };
static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = { static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
{1, UPB_SIZE(4, 4), 1, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 4), 1, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(8, 8), 2, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(8, 8), 2, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = { const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = {
NULL, NULL,
&google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0], &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
UPB_SIZE(16, 16), 2, upb_ExtMode_NonExtendable, 2, 255, 0, UPB_SIZE(16, 16), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_EnumValueDescriptorProto_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
@ -203,15 +203,15 @@ static const upb_MiniTable_Sub google_protobuf_EnumValueDescriptorProto_submsgs[
}; };
static const upb_MiniTable_Field google_protobuf_EnumValueDescriptorProto__fields[3] = { static const upb_MiniTable_Field google_protobuf_EnumValueDescriptorProto__fields[3] = {
{1, UPB_SIZE(8, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(8, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(4, 4), 2, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(4, 4), 2, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(16, 24), 3, 0, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {3, UPB_SIZE(16, 24), 3, 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msginit = { const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msginit = {
&google_protobuf_EnumValueDescriptorProto_submsgs[0], &google_protobuf_EnumValueDescriptorProto_submsgs[0],
&google_protobuf_EnumValueDescriptorProto__fields[0], &google_protobuf_EnumValueDescriptorProto__fields[0],
UPB_SIZE(24, 32), 3, upb_ExtMode_NonExtendable, 3, 255, 0, UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_ServiceDescriptorProto_submsgs[2] = { static const upb_MiniTable_Sub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
@ -220,15 +220,15 @@ static const upb_MiniTable_Sub google_protobuf_ServiceDescriptorProto_submsgs[2]
}; };
static const upb_MiniTable_Field google_protobuf_ServiceDescriptorProto__fields[3] = { static const upb_MiniTable_Field google_protobuf_ServiceDescriptorProto__fields[3] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(16, 32), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {2, UPB_SIZE(16, 32), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(12, 24), 2, 1, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {3, UPB_SIZE(12, 24), 2, 1, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_ServiceDescriptorProto_msginit = { const upb_MiniTable google_protobuf_ServiceDescriptorProto_msginit = {
&google_protobuf_ServiceDescriptorProto_submsgs[0], &google_protobuf_ServiceDescriptorProto_submsgs[0],
&google_protobuf_ServiceDescriptorProto__fields[0], &google_protobuf_ServiceDescriptorProto__fields[0],
UPB_SIZE(24, 48), 3, upb_ExtMode_NonExtendable, 3, 255, 0, UPB_SIZE(24, 48), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_MethodDescriptorProto_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_MethodDescriptorProto_submsgs[1] = {
@ -236,18 +236,18 @@ static const upb_MiniTable_Sub google_protobuf_MethodDescriptorProto_submsgs[1]
}; };
static const upb_MiniTable_Field google_protobuf_MethodDescriptorProto__fields[6] = { static const upb_MiniTable_Field google_protobuf_MethodDescriptorProto__fields[6] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(12, 24), 2, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {2, UPB_SIZE(12, 24), 2, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(20, 40), 3, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {3, UPB_SIZE(20, 40), 3, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(28, 56), 4, 0, 11, kUpb_FieldMode_Scalar | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {4, UPB_SIZE(28, 56), 4, 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(1, 1), 5, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {5, UPB_SIZE(1, 1), 5, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(2, 2), 6, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {6, UPB_SIZE(2, 2), 6, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_MethodDescriptorProto_msginit = { const upb_MiniTable google_protobuf_MethodDescriptorProto_msginit = {
&google_protobuf_MethodDescriptorProto_submsgs[0], &google_protobuf_MethodDescriptorProto_submsgs[0],
&google_protobuf_MethodDescriptorProto__fields[0], &google_protobuf_MethodDescriptorProto__fields[0],
UPB_SIZE(32, 64), 6, upb_ExtMode_NonExtendable, 6, 255, 0, UPB_SIZE(32, 64), 6, kUpb_ExtMode_NonExtendable, 6, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_FileOptions_submsgs[2] = { static const upb_MiniTable_Sub google_protobuf_FileOptions_submsgs[2] = {
@ -256,33 +256,33 @@ static const upb_MiniTable_Sub google_protobuf_FileOptions_submsgs[2] = {
}; };
static const upb_MiniTable_Field google_protobuf_FileOptions__fields[21] = { static const upb_MiniTable_Field google_protobuf_FileOptions__fields[21] = {
{1, UPB_SIZE(20, 24), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(20, 24), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{8, UPB_SIZE(28, 40), 2, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {8, UPB_SIZE(28, 40), 2, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{9, UPB_SIZE(4, 4), 3, 1, 14, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {9, UPB_SIZE(4, 4), 3, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{10, UPB_SIZE(8, 8), 4, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {10, UPB_SIZE(8, 8), 4, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{11, UPB_SIZE(36, 56), 5, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {11, UPB_SIZE(36, 56), 5, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{16, UPB_SIZE(9, 9), 6, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {16, UPB_SIZE(9, 9), 6, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{17, UPB_SIZE(10, 10), 7, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {17, UPB_SIZE(10, 10), 7, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{18, UPB_SIZE(11, 11), 8, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {18, UPB_SIZE(11, 11), 8, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{20, UPB_SIZE(12, 12), 9, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {20, UPB_SIZE(12, 12), 9, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{23, UPB_SIZE(13, 13), 10, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {23, UPB_SIZE(13, 13), 10, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{27, UPB_SIZE(14, 14), 11, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {27, UPB_SIZE(14, 14), 11, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{31, UPB_SIZE(15, 15), 12, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {31, UPB_SIZE(15, 15), 12, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{36, UPB_SIZE(44, 72), 13, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {36, UPB_SIZE(44, 72), 13, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{37, UPB_SIZE(52, 88), 14, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {37, UPB_SIZE(52, 88), 14, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{39, UPB_SIZE(60, 104), 15, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {39, UPB_SIZE(60, 104), 15, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{40, UPB_SIZE(68, 120), 16, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {40, UPB_SIZE(68, 120), 16, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{41, UPB_SIZE(76, 136), 17, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {41, UPB_SIZE(76, 136), 17, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{42, UPB_SIZE(16, 16), 18, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {42, UPB_SIZE(16, 16), 18, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{44, UPB_SIZE(84, 152), 19, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {44, UPB_SIZE(84, 152), 19, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{45, UPB_SIZE(92, 168), 20, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {45, UPB_SIZE(92, 168), 20, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(100, 184), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(100, 184), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_FileOptions_msginit = { const upb_MiniTable google_protobuf_FileOptions_msginit = {
&google_protobuf_FileOptions_submsgs[0], &google_protobuf_FileOptions_submsgs[0],
&google_protobuf_FileOptions__fields[0], &google_protobuf_FileOptions__fields[0],
UPB_SIZE(104, 192), 21, upb_ExtMode_Extendable, 1, 255, 0, UPB_SIZE(104, 192), 21, kUpb_ExtMode_Extendable, 1, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_MessageOptions_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_MessageOptions_submsgs[1] = {
@ -290,17 +290,17 @@ static const upb_MiniTable_Sub google_protobuf_MessageOptions_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_MessageOptions__fields[5] = { static const upb_MiniTable_Field google_protobuf_MessageOptions__fields[5] = {
{1, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {1, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(2, 2), 2, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(2, 2), 2, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(3, 3), 3, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {3, UPB_SIZE(3, 3), 3, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{7, UPB_SIZE(4, 4), 4, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {7, UPB_SIZE(4, 4), 4, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(8, 8), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(8, 8), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_MessageOptions_msginit = { const upb_MiniTable google_protobuf_MessageOptions_msginit = {
&google_protobuf_MessageOptions_submsgs[0], &google_protobuf_MessageOptions_submsgs[0],
&google_protobuf_MessageOptions__fields[0], &google_protobuf_MessageOptions__fields[0],
UPB_SIZE(16, 16), 5, upb_ExtMode_Extendable, 3, 255, 0, UPB_SIZE(16, 16), 5, kUpb_ExtMode_Extendable, 3, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_FieldOptions_submsgs[3] = { static const upb_MiniTable_Sub google_protobuf_FieldOptions_submsgs[3] = {
@ -310,20 +310,20 @@ static const upb_MiniTable_Sub google_protobuf_FieldOptions_submsgs[3] = {
}; };
static const upb_MiniTable_Field google_protobuf_FieldOptions__fields[8] = { static const upb_MiniTable_Field google_protobuf_FieldOptions__fields[8] = {
{1, UPB_SIZE(4, 4), 1, 1, 14, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 4), 1, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(12, 12), 2, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(12, 12), 2, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(13, 13), 3, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {3, UPB_SIZE(13, 13), 3, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(14, 14), 4, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {5, UPB_SIZE(14, 14), 4, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(8, 8), 5, 2, 14, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {6, UPB_SIZE(8, 8), 5, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{10, UPB_SIZE(15, 15), 6, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {10, UPB_SIZE(15, 15), 6, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{15, UPB_SIZE(16, 16), 7, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {15, UPB_SIZE(16, 16), 7, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(20, 24), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(20, 24), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_FieldOptions_msginit = { const upb_MiniTable google_protobuf_FieldOptions_msginit = {
&google_protobuf_FieldOptions_submsgs[0], &google_protobuf_FieldOptions_submsgs[0],
&google_protobuf_FieldOptions__fields[0], &google_protobuf_FieldOptions__fields[0],
UPB_SIZE(24, 32), 8, upb_ExtMode_Extendable, 3, 255, 0, UPB_SIZE(24, 32), 8, kUpb_ExtMode_Extendable, 3, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_OneofOptions_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_OneofOptions_submsgs[1] = {
@ -331,13 +331,13 @@ static const upb_MiniTable_Sub google_protobuf_OneofOptions_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_OneofOptions__fields[1] = { static const upb_MiniTable_Field google_protobuf_OneofOptions__fields[1] = {
{999, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_OneofOptions_msginit = { const upb_MiniTable google_protobuf_OneofOptions_msginit = {
&google_protobuf_OneofOptions_submsgs[0], &google_protobuf_OneofOptions_submsgs[0],
&google_protobuf_OneofOptions__fields[0], &google_protobuf_OneofOptions__fields[0],
UPB_SIZE(8, 8), 1, upb_ExtMode_Extendable, 0, 255, 0, UPB_SIZE(8, 8), 1, kUpb_ExtMode_Extendable, 0, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_EnumOptions_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_EnumOptions_submsgs[1] = {
@ -345,15 +345,15 @@ static const upb_MiniTable_Sub google_protobuf_EnumOptions_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_EnumOptions__fields[3] = { static const upb_MiniTable_Field google_protobuf_EnumOptions__fields[3] = {
{2, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(2, 2), 2, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {3, UPB_SIZE(2, 2), 2, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_EnumOptions_msginit = { const upb_MiniTable google_protobuf_EnumOptions_msginit = {
&google_protobuf_EnumOptions_submsgs[0], &google_protobuf_EnumOptions_submsgs[0],
&google_protobuf_EnumOptions__fields[0], &google_protobuf_EnumOptions__fields[0],
UPB_SIZE(8, 16), 3, upb_ExtMode_Extendable, 0, 255, 0, UPB_SIZE(8, 16), 3, kUpb_ExtMode_Extendable, 0, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_EnumValueOptions_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_EnumValueOptions_submsgs[1] = {
@ -361,14 +361,14 @@ static const upb_MiniTable_Sub google_protobuf_EnumValueOptions_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_EnumValueOptions__fields[2] = { static const upb_MiniTable_Field google_protobuf_EnumValueOptions__fields[2] = {
{1, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {1, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_EnumValueOptions_msginit = { const upb_MiniTable google_protobuf_EnumValueOptions_msginit = {
&google_protobuf_EnumValueOptions_submsgs[0], &google_protobuf_EnumValueOptions_submsgs[0],
&google_protobuf_EnumValueOptions__fields[0], &google_protobuf_EnumValueOptions__fields[0],
UPB_SIZE(8, 16), 2, upb_ExtMode_Extendable, 1, 255, 0, UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 1, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_ServiceOptions_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_ServiceOptions_submsgs[1] = {
@ -376,14 +376,14 @@ static const upb_MiniTable_Sub google_protobuf_ServiceOptions_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_ServiceOptions__fields[2] = { static const upb_MiniTable_Field google_protobuf_ServiceOptions__fields[2] = {
{33, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {33, UPB_SIZE(1, 1), 1, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_ServiceOptions_msginit = { const upb_MiniTable google_protobuf_ServiceOptions_msginit = {
&google_protobuf_ServiceOptions_submsgs[0], &google_protobuf_ServiceOptions_submsgs[0],
&google_protobuf_ServiceOptions__fields[0], &google_protobuf_ServiceOptions__fields[0],
UPB_SIZE(8, 16), 2, upb_ExtMode_Extendable, 0, 255, 0, UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 0, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_MethodOptions_submsgs[2] = { static const upb_MiniTable_Sub google_protobuf_MethodOptions_submsgs[2] = {
@ -392,15 +392,15 @@ static const upb_MiniTable_Sub google_protobuf_MethodOptions_submsgs[2] = {
}; };
static const upb_MiniTable_Field google_protobuf_MethodOptions__fields[3] = { static const upb_MiniTable_Field google_protobuf_MethodOptions__fields[3] = {
{33, UPB_SIZE(8, 8), 1, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {33, UPB_SIZE(8, 8), 1, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
{34, UPB_SIZE(4, 4), 2, 1, 14, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {34, UPB_SIZE(4, 4), 2, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{999, UPB_SIZE(12, 16), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {999, UPB_SIZE(12, 16), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_MethodOptions_msginit = { const upb_MiniTable google_protobuf_MethodOptions_msginit = {
&google_protobuf_MethodOptions_submsgs[0], &google_protobuf_MethodOptions_submsgs[0],
&google_protobuf_MethodOptions__fields[0], &google_protobuf_MethodOptions__fields[0],
UPB_SIZE(16, 24), 3, upb_ExtMode_Extendable, 0, 255, 0, UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_UninterpretedOption_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_UninterpretedOption_submsgs[1] = {
@ -408,30 +408,30 @@ static const upb_MiniTable_Sub google_protobuf_UninterpretedOption_submsgs[1] =
}; };
static const upb_MiniTable_Field google_protobuf_UninterpretedOption__fields[7] = { static const upb_MiniTable_Field google_protobuf_UninterpretedOption__fields[7] = {
{2, UPB_SIZE(56, 80), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {2, UPB_SIZE(56, 80), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(32, 32), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {3, UPB_SIZE(32, 32), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(8, 8), 2, 0, 4, kUpb_FieldMode_Scalar | (upb_FieldRep_8Byte << upb_FieldRep_Shift)}, {4, UPB_SIZE(8, 8), 2, 0, 4, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
{5, UPB_SIZE(16, 16), 3, 0, 3, kUpb_FieldMode_Scalar | (upb_FieldRep_8Byte << upb_FieldRep_Shift)}, {5, UPB_SIZE(16, 16), 3, 0, 3, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(24, 24), 4, 0, 1, kUpb_FieldMode_Scalar | (upb_FieldRep_8Byte << upb_FieldRep_Shift)}, {6, UPB_SIZE(24, 24), 4, 0, 1, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
{7, UPB_SIZE(40, 48), 5, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {7, UPB_SIZE(40, 48), 5, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{8, UPB_SIZE(48, 64), 6, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {8, UPB_SIZE(48, 64), 6, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_UninterpretedOption_msginit = { const upb_MiniTable google_protobuf_UninterpretedOption_msginit = {
&google_protobuf_UninterpretedOption_submsgs[0], &google_protobuf_UninterpretedOption_submsgs[0],
&google_protobuf_UninterpretedOption__fields[0], &google_protobuf_UninterpretedOption__fields[0],
UPB_SIZE(64, 96), 7, upb_ExtMode_NonExtendable, 0, 255, 0, UPB_SIZE(64, 96), 7, kUpb_ExtMode_NonExtendable, 0, 255, 0,
}; };
static const upb_MiniTable_Field google_protobuf_UninterpretedOption_NamePart__fields[2] = { static const upb_MiniTable_Field google_protobuf_UninterpretedOption_NamePart__fields[2] = {
{1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {1, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(1, 1), 2, 0, 8, kUpb_FieldMode_Scalar | (upb_FieldRep_1Byte << upb_FieldRep_Shift)}, {2, UPB_SIZE(1, 1), 2, 0, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msginit = { const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msginit = {
NULL, NULL,
&google_protobuf_UninterpretedOption_NamePart__fields[0], &google_protobuf_UninterpretedOption_NamePart__fields[0],
UPB_SIZE(16, 32), 2, upb_ExtMode_NonExtendable, 2, 255, 2, UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, 255, 2,
}; };
static const upb_MiniTable_Sub google_protobuf_SourceCodeInfo_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_SourceCodeInfo_submsgs[1] = {
@ -439,27 +439,27 @@ static const upb_MiniTable_Sub google_protobuf_SourceCodeInfo_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_SourceCodeInfo__fields[1] = { static const upb_MiniTable_Field google_protobuf_SourceCodeInfo__fields[1] = {
{1, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {1, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_SourceCodeInfo_msginit = { const upb_MiniTable google_protobuf_SourceCodeInfo_msginit = {
&google_protobuf_SourceCodeInfo_submsgs[0], &google_protobuf_SourceCodeInfo_submsgs[0],
&google_protobuf_SourceCodeInfo__fields[0], &google_protobuf_SourceCodeInfo__fields[0],
UPB_SIZE(8, 8), 1, upb_ExtMode_NonExtendable, 1, 255, 0, UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
}; };
static const upb_MiniTable_Field google_protobuf_SourceCodeInfo_Location__fields[5] = { static const upb_MiniTable_Field google_protobuf_SourceCodeInfo_Location__fields[5] = {
{1, UPB_SIZE(20, 40), 0, 0, 5, kUpb_FieldMode_Array | upb_LabelFlags_IsPacked | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {1, UPB_SIZE(20, 40), 0, 0, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(24, 48), 0, 0, 5, kUpb_FieldMode_Array | upb_LabelFlags_IsPacked | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {2, UPB_SIZE(24, 48), 0, 0, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {3, UPB_SIZE(4, 8), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(12, 24), 2, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {4, UPB_SIZE(12, 24), 2, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{6, UPB_SIZE(28, 56), 0, 0, 12, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {6, UPB_SIZE(28, 56), 0, 0, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msginit = { const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msginit = {
NULL, NULL,
&google_protobuf_SourceCodeInfo_Location__fields[0], &google_protobuf_SourceCodeInfo_Location__fields[0],
UPB_SIZE(32, 64), 5, upb_ExtMode_NonExtendable, 4, 255, 0, UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, 255, 0,
}; };
static const upb_MiniTable_Sub google_protobuf_GeneratedCodeInfo_submsgs[1] = { static const upb_MiniTable_Sub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
@ -467,26 +467,26 @@ static const upb_MiniTable_Sub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
}; };
static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo__fields[1] = { static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo__fields[1] = {
{1, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {1, UPB_SIZE(0, 0), 0, 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_GeneratedCodeInfo_msginit = { const upb_MiniTable google_protobuf_GeneratedCodeInfo_msginit = {
&google_protobuf_GeneratedCodeInfo_submsgs[0], &google_protobuf_GeneratedCodeInfo_submsgs[0],
&google_protobuf_GeneratedCodeInfo__fields[0], &google_protobuf_GeneratedCodeInfo__fields[0],
UPB_SIZE(8, 8), 1, upb_ExtMode_NonExtendable, 1, 255, 0, UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
}; };
static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo_Annotation__fields[4] = { static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo_Annotation__fields[4] = {
{1, UPB_SIZE(20, 32), 0, 0, 5, kUpb_FieldMode_Array | upb_LabelFlags_IsPacked | (upb_FieldRep_Pointer << upb_FieldRep_Shift)}, {1, UPB_SIZE(20, 32), 0, 0, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(12, 16), 1, 0, 12, kUpb_FieldMode_Scalar | (upb_FieldRep_StringView << upb_FieldRep_Shift)}, {2, UPB_SIZE(12, 16), 1, 0, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(4, 4), 2, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {3, UPB_SIZE(4, 4), 2, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(8, 8), 3, 0, 5, kUpb_FieldMode_Scalar | (upb_FieldRep_4Byte << upb_FieldRep_Shift)}, {4, UPB_SIZE(8, 8), 3, 0, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
}; };
const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msginit = { const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msginit = {
NULL, NULL,
&google_protobuf_GeneratedCodeInfo_Annotation__fields[0], &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
UPB_SIZE(24, 48), 4, upb_ExtMode_NonExtendable, 4, 255, 0, UPB_SIZE(24, 48), 4, kUpb_ExtMode_NonExtendable, 4, 255, 0,
}; };
static const upb_MiniTable *messages_layout[27] = { static const upb_MiniTable *messages_layout[27] = {

@ -742,7 +742,7 @@ static const char* decode_msgset(upb_Decoder* d, const char* ptr,
.fields = NULL, .fields = NULL,
.size = 0, .size = 0,
.field_count = 0, .field_count = 0,
.ext = upb_ExtMode_IsMessageSet_ITEM, .ext = kUpb_ExtMode_IsMessageSet_ITEM,
.dense_below = 0, .dense_below = 0,
.table_mask = -1}; .table_mask = -1};
return decode_group(d, ptr, msg, &item_layout, 1); return decode_group(d, ptr, msg, &item_layout, 1);
@ -780,19 +780,19 @@ static const upb_MiniTable_Field* decode_findfield(upb_Decoder* d,
if (d->extreg) { if (d->extreg) {
switch (l->ext) { switch (l->ext) {
case upb_ExtMode_Extendable: { case kUpb_ExtMode_Extendable: {
const upb_MiniTable_Extension* ext = const upb_MiniTable_Extension* ext =
_upb_extreg_get(d->extreg, l, field_number); _upb_extreg_get(d->extreg, l, field_number);
if (ext) return &ext->field; if (ext) return &ext->field;
break; break;
} }
case upb_ExtMode_IsMessageSet: case kUpb_ExtMode_IsMessageSet:
if (field_number == _UPB_MSGSET_ITEM) { if (field_number == _UPB_MSGSET_ITEM) {
static upb_MiniTable_Field item = {0, 0, 0, 0, TYPE_MSGSET_ITEM, 0}; static upb_MiniTable_Field item = {0, 0, 0, 0, TYPE_MSGSET_ITEM, 0};
return &item; return &item;
} }
break; break;
case upb_ExtMode_IsMessageSet_ITEM: case kUpb_ExtMode_IsMessageSet_ITEM:
switch (field_number) { switch (field_number) {
case _UPB_MSGSET_TYPEID: { case _UPB_MSGSET_TYPEID: {
static upb_MiniTable_Field type_id = { static upb_MiniTable_Field type_id = {
@ -885,7 +885,7 @@ static const char* decode_known(upb_Decoder* d, const char* ptr,
const upb_MiniTable_Sub* subs = layout->subs; const upb_MiniTable_Sub* subs = layout->subs;
uint8_t mode = field->mode; uint8_t mode = field->mode;
if (UPB_UNLIKELY(mode & upb_LabelFlags_IsExtension)) { if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) {
const upb_MiniTable_Extension* ext_layout = const upb_MiniTable_Extension* ext_layout =
(const upb_MiniTable_Extension*)field; (const upb_MiniTable_Extension*)field;
upb_Message_Extension* ext = upb_Message_Extension* ext =

@ -1426,43 +1426,43 @@ static void fill_fieldlayout(upb_MiniTable_Field* field,
if (upb_FieldDef_IsMap(f)) { if (upb_FieldDef_IsMap(f)) {
field->mode = field->mode =
kUpb_FieldMode_Map | (upb_FieldRep_Pointer << upb_FieldRep_Shift); kUpb_FieldMode_Map | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift);
} else if (upb_FieldDef_IsRepeated(f)) { } else if (upb_FieldDef_IsRepeated(f)) {
field->mode = field->mode =
kUpb_FieldMode_Array | (upb_FieldRep_Pointer << upb_FieldRep_Shift); kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift);
} else { } else {
/* Maps descriptor type -> elem_size_lg2. */ /* Maps descriptor type -> elem_size_lg2. */
static const uint8_t sizes[] = { static const uint8_t sizes[] = {
-1, /* invalid descriptor type */ -1, /* invalid descriptor type */
upb_FieldRep_8Byte, /* DOUBLE */ kUpb_FieldRep_8Byte, /* DOUBLE */
upb_FieldRep_4Byte, /* FLOAT */ kUpb_FieldRep_4Byte, /* FLOAT */
upb_FieldRep_8Byte, /* INT64 */ kUpb_FieldRep_8Byte, /* INT64 */
upb_FieldRep_8Byte, /* UINT64 */ kUpb_FieldRep_8Byte, /* UINT64 */
upb_FieldRep_4Byte, /* INT32 */ kUpb_FieldRep_4Byte, /* INT32 */
upb_FieldRep_8Byte, /* FIXED64 */ kUpb_FieldRep_8Byte, /* FIXED64 */
upb_FieldRep_4Byte, /* FIXED32 */ kUpb_FieldRep_4Byte, /* FIXED32 */
upb_FieldRep_1Byte, /* BOOL */ kUpb_FieldRep_1Byte, /* BOOL */
upb_FieldRep_StringView, /* STRING */ kUpb_FieldRep_StringView, /* STRING */
upb_FieldRep_Pointer, /* GROUP */ kUpb_FieldRep_Pointer, /* GROUP */
upb_FieldRep_Pointer, /* MESSAGE */ kUpb_FieldRep_Pointer, /* MESSAGE */
upb_FieldRep_StringView, /* BYTES */ kUpb_FieldRep_StringView, /* BYTES */
upb_FieldRep_4Byte, /* UINT32 */ kUpb_FieldRep_4Byte, /* UINT32 */
upb_FieldRep_4Byte, /* ENUM */ kUpb_FieldRep_4Byte, /* ENUM */
upb_FieldRep_4Byte, /* SFIXED32 */ kUpb_FieldRep_4Byte, /* SFIXED32 */
upb_FieldRep_8Byte, /* SFIXED64 */ kUpb_FieldRep_8Byte, /* SFIXED64 */
upb_FieldRep_4Byte, /* SINT32 */ kUpb_FieldRep_4Byte, /* SINT32 */
upb_FieldRep_8Byte, /* SINT64 */ kUpb_FieldRep_8Byte, /* SINT64 */
}; };
field->mode = kUpb_FieldMode_Scalar | field->mode = kUpb_FieldMode_Scalar |
(sizes[field->descriptortype] << upb_FieldRep_Shift); (sizes[field->descriptortype] << kUpb_FieldRep_Shift);
} }
if (upb_FieldDef_IsPacked(f)) { if (upb_FieldDef_IsPacked(f)) {
field->mode |= upb_LabelFlags_IsPacked; field->mode |= kUpb_LabelFlags_IsPacked;
} }
if (upb_FieldDef_IsExtension(f)) { if (upb_FieldDef_IsExtension(f)) {
field->mode |= upb_LabelFlags_IsExtension; field->mode |= kUpb_LabelFlags_IsExtension;
} }
} }
@ -1500,12 +1500,12 @@ static void make_layout(symtab_addctx* ctx, const upb_MessageDef* m) {
if (upb_MessageDef_ExtensionRangeCount(m) > 0) { if (upb_MessageDef_ExtensionRangeCount(m) > 0) {
if (google_protobuf_MessageOptions_message_set_wire_format(m->opts)) { if (google_protobuf_MessageOptions_message_set_wire_format(m->opts)) {
l->ext = upb_ExtMode_IsMessageSet; l->ext = kUpb_ExtMode_IsMessageSet;
} else { } else {
l->ext = upb_ExtMode_Extendable; l->ext = kUpb_ExtMode_Extendable;
} }
} else { } else {
l->ext = upb_ExtMode_NonExtendable; l->ext = kUpb_ExtMode_NonExtendable;
} }
/* TODO(haberman): initialize fast tables so that reflection-based parsing /* TODO(haberman): initialize fast tables so that reflection-based parsing

@ -288,7 +288,7 @@ static void encode_array(upb_encstate* e, const upb_Message* msg,
const upb_MiniTable_Sub* subs, const upb_MiniTable_Sub* subs,
const upb_MiniTable_Field* f) { const upb_MiniTable_Field* f) {
const upb_Array* arr = *UPB_PTR_AT(msg, f->offset, upb_Array*); const upb_Array* arr = *UPB_PTR_AT(msg, f->offset, upb_Array*);
bool packed = f->mode & upb_LabelFlags_IsPacked; bool packed = f->mode & kUpb_LabelFlags_IsPacked;
size_t pre_len = e->limit - e->ptr; size_t pre_len = e->limit - e->ptr;
if (arr == NULL || arr->len == 0) { if (arr == NULL || arr->len == 0) {
@ -442,23 +442,23 @@ static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg,
if (f->presence == 0) { if (f->presence == 0) {
/* Proto3 presence or map/array. */ /* Proto3 presence or map/array. */
const void* mem = UPB_PTR_AT(msg, f->offset, void); const void* mem = UPB_PTR_AT(msg, f->offset, void);
switch (f->mode >> upb_FieldRep_Shift) { switch (f->mode >> kUpb_FieldRep_Shift) {
case upb_FieldRep_1Byte: { case kUpb_FieldRep_1Byte: {
char ch; char ch;
memcpy(&ch, mem, 1); memcpy(&ch, mem, 1);
return ch != 0; return ch != 0;
} }
case upb_FieldRep_4Byte: { case kUpb_FieldRep_4Byte: {
uint32_t u32; uint32_t u32;
memcpy(&u32, mem, 4); memcpy(&u32, mem, 4);
return u32 != 0; return u32 != 0;
} }
case upb_FieldRep_8Byte: { case kUpb_FieldRep_8Byte: {
uint64_t u64; uint64_t u64;
memcpy(&u64, mem, 8); memcpy(&u64, mem, 8);
return u64 != 0; return u64 != 0;
} }
case upb_FieldRep_StringView: { case kUpb_FieldRep_StringView: {
const upb_StringView* str = (const upb_StringView*)mem; const upb_StringView* str = (const upb_StringView*)mem;
return str->size != 0; return str->size != 0;
} }
@ -532,7 +532,7 @@ static void encode_message(upb_encstate* e, const upb_Message* msg,
} }
} }
if (m->ext != upb_ExtMode_NonExtendable) { if (m->ext != kUpb_ExtMode_NonExtendable) {
/* Encode all extensions together. Unlike C++, we do not attempt to keep /* Encode all extensions together. Unlike C++, we do not attempt to keep
* these in field number order relative to normal fields or even to each * these in field number order relative to normal fields or even to each
* other. */ * other. */
@ -541,7 +541,7 @@ static void encode_message(upb_encstate* e, const upb_Message* msg,
if (ext_count) { if (ext_count) {
const upb_Message_Extension* end = ext + ext_count; const upb_Message_Extension* end = ext + ext_count;
for (; ext != end; ext++) { for (; ext != end; ext++) {
if (UPB_UNLIKELY(m->ext == upb_ExtMode_IsMessageSet)) { if (UPB_UNLIKELY(m->ext == kUpb_ExtMode_IsMessageSet)) {
encode_msgset_item(e, ext); encode_msgset_item(e, ext);
} else { } else {
encode_field(e, &ext->data, &ext->ext->sub, &ext->ext->field); encode_field(e, &ext->data, &ext->ext->sub, &ext->ext->field);

@ -75,7 +75,7 @@ typedef struct {
uint16_t submsg_index; // undefined if descriptortype != MESSAGE/GROUP/ENUM uint16_t submsg_index; // undefined if descriptortype != MESSAGE/GROUP/ENUM
uint8_t descriptortype; uint8_t descriptortype;
uint8_t mode; /* upb_FieldMode | upb_LabelFlags | uint8_t mode; /* upb_FieldMode | upb_LabelFlags |
(upb_FieldRep << upb_FieldRep_Shift) */ (upb_FieldRep << kUpb_FieldRep_Shift) */
} upb_MiniTable_Field; } upb_MiniTable_Field;
typedef enum { typedef enum {
@ -87,28 +87,28 @@ typedef enum {
} upb_FieldMode; } upb_FieldMode;
/* Extra flags on the mode field. */ /* Extra flags on the mode field. */
enum upb_LabelFlags { typedef enum {
upb_LabelFlags_IsPacked = 4, kUpb_LabelFlags_IsPacked = 4,
upb_LabelFlags_IsExtension = 8, kUpb_LabelFlags_IsExtension = 8,
}; } upb_LabelFlags;
/* Representation in the message. Derivable from descriptortype and mode, but /* Representation in the message. Derivable from descriptortype and mode, but
* fast access helps the serializer. */ * fast access helps the serializer. */
enum upb_FieldRep { typedef enum {
upb_FieldRep_1Byte = 0, kUpb_FieldRep_1Byte = 0,
upb_FieldRep_4Byte = 1, kUpb_FieldRep_4Byte = 1,
upb_FieldRep_8Byte = 2, kUpb_FieldRep_8Byte = 2,
upb_FieldRep_StringView = 3, kUpb_FieldRep_StringView = 3,
#if UINTPTR_MAX == 0xffffffff #if UINTPTR_MAX == 0xffffffff
upb_FieldRep_Pointer = upb_FieldRep_4Byte, kUpb_FieldRep_Pointer = kUpb_FieldRep_4Byte,
#else #else
upb_FieldRep_Pointer = upb_FieldRep_8Byte, kUpb_FieldRep_Pointer = kUpb_FieldRep_8Byte,
#endif #endif
upb_FieldRep_Shift = kUpb_FieldRep_Shift =
6, /* Bit offset of the rep in upb_MiniTable_Field.mode */ 6, /* Bit offset of the rep in upb_MiniTable_Field.mode */
}; } upb_FieldRep;
UPB_INLINE upb_FieldMode upb_FieldMode_Get(const upb_MiniTable_Field* field) { UPB_INLINE upb_FieldMode upb_FieldMode_Get(const upb_MiniTable_Field* field) {
return (upb_FieldMode)(field->mode & 3); return (upb_FieldMode)(field->mode & 3);
@ -160,11 +160,15 @@ typedef union {
} upb_MiniTable_Sub; } upb_MiniTable_Sub;
typedef enum { typedef enum {
upb_ExtMode_NonExtendable = 0, // Non-extendable message. kUpb_ExtMode_NonExtendable = 0, // Non-extendable message.
upb_ExtMode_Extendable = 1, // Normal extendable message. kUpb_ExtMode_Extendable = 1, // Normal extendable message.
upb_ExtMode_IsMessageSet = 2, // MessageSet message. kUpb_ExtMode_IsMessageSet = 2, // MessageSet message.
upb_ExtMode_IsMessageSet_ITEM = kUpb_ExtMode_IsMessageSet_ITEM =
3, // MessageSet item (temporary only, see decode.c) 3, // MessageSet item (temporary only, see decode.c)
// During table building we steal a bit to indicate that the message is a map
// entry. *Only* used during table building!
kUpb_ExtMode_IsMapEntry = 4,
} upb_ExtMode; } upb_ExtMode;
/* MessageSet wire format is: /* MessageSet wire format is:
@ -225,8 +229,7 @@ UPB_INLINE uint64_t upb_MiniTable_requiredmask(const upb_MiniTable* l) {
return ((1ULL << n) - 1) << 1; return ((1ULL << n) - 1) << 1;
} }
/** upb_ExtensionRegistry /** upb_ExtensionRegistry *****************************************************/
* ****************************************************************/
/* Adds the given extension info for message type |l| and field number |num| /* Adds the given extension info for message type |l| and field number |num|
* into the registry. Returns false if this message type and field number were * into the registry. Returns false if this message type and field number were
@ -241,8 +244,7 @@ const upb_MiniTable_Extension* _upb_extreg_get(const upb_ExtensionRegistry* r,
const upb_MiniTable* l, const upb_MiniTable* l,
uint32_t num); uint32_t num);
/** upb_Message /** upb_Message ***************************************************************/
* *******************************************************************/
/* Internal members of a upb_Message that track unknown fields and/or /* Internal members of a upb_Message that track unknown fields and/or
* extensions. We can change this without breaking binary compatibility. We put * extensions. We can change this without breaking binary compatibility. We put
@ -315,8 +317,7 @@ void _upb_Message_DiscardUnknown_shallow(upb_Message* msg);
bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len, bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
upb_Arena* arena); upb_Arena* arena);
/** upb_Message_Extension /** upb_Message_Extension *****************************************************/
* ***************************************************************/
/* The internal representation of an extension is self-describing: it contains /* The internal representation of an extension is self-describing: it contains
* enough information that we can serialize it to binary format without needing * enough information that we can serialize it to binary format without needing
@ -773,8 +774,7 @@ UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val,
} }
} }
/** _upb_mapsorter /** _upb_mapsorter ************************************************************/
* *************************************************************/
/* _upb_mapsorter sorts maps and provides ordered iteration over the entries. /* _upb_mapsorter sorts maps and provides ordered iteration over the entries.
* Since maps can be recursive (map values can be messages which contain other * Since maps can be recursive (map values can be messages which contain other

@ -278,20 +278,20 @@ std::string SizeLg2(const protobuf::FieldDescriptor* field) {
std::string SizeRep(const protobuf::FieldDescriptor* field) { std::string SizeRep(const protobuf::FieldDescriptor* field) {
switch (field->cpp_type()) { switch (field->cpp_type()) {
case protobuf::FieldDescriptor::CPPTYPE_MESSAGE: case protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
return "upb_FieldRep_Pointer"; return "kUpb_FieldRep_Pointer";
case protobuf::FieldDescriptor::CPPTYPE_ENUM: case protobuf::FieldDescriptor::CPPTYPE_ENUM:
case protobuf::FieldDescriptor::CPPTYPE_FLOAT: case protobuf::FieldDescriptor::CPPTYPE_FLOAT:
case protobuf::FieldDescriptor::CPPTYPE_INT32: case protobuf::FieldDescriptor::CPPTYPE_INT32:
case protobuf::FieldDescriptor::CPPTYPE_UINT32: case protobuf::FieldDescriptor::CPPTYPE_UINT32:
return "upb_FieldRep_4Byte"; return "kUpb_FieldRep_4Byte";
case protobuf::FieldDescriptor::CPPTYPE_BOOL: case protobuf::FieldDescriptor::CPPTYPE_BOOL:
return "upb_FieldRep_1Byte"; return "kUpb_FieldRep_1Byte";
case protobuf::FieldDescriptor::CPPTYPE_DOUBLE: case protobuf::FieldDescriptor::CPPTYPE_DOUBLE:
case protobuf::FieldDescriptor::CPPTYPE_INT64: case protobuf::FieldDescriptor::CPPTYPE_INT64:
case protobuf::FieldDescriptor::CPPTYPE_UINT64: case protobuf::FieldDescriptor::CPPTYPE_UINT64:
return "upb_FieldRep_8Byte"; return "kUpb_FieldRep_8Byte";
case protobuf::FieldDescriptor::CPPTYPE_STRING: case protobuf::FieldDescriptor::CPPTYPE_STRING:
return "upb_FieldRep_StringView"; return "kUpb_FieldRep_StringView";
default: default:
fprintf(stderr, "Unexpected type"); fprintf(stderr, "Unexpected type");
abort(); abort();
@ -1154,24 +1154,24 @@ void WriteField(const protobuf::FieldDescriptor* field,
std::string rep; std::string rep;
if (field->is_map()) { if (field->is_map()) {
mode = "kUpb_FieldMode_Map"; mode = "kUpb_FieldMode_Map";
rep = "upb_FieldRep_Pointer"; rep = "kUpb_FieldRep_Pointer";
} else if (field->is_repeated()) { } else if (field->is_repeated()) {
mode = "kUpb_FieldMode_Array"; mode = "kUpb_FieldMode_Array";
rep = "upb_FieldRep_Pointer"; rep = "kUpb_FieldRep_Pointer";
} else { } else {
mode = "kUpb_FieldMode_Scalar"; mode = "kUpb_FieldMode_Scalar";
rep = SizeRep(field); rep = SizeRep(field);
} }
if (field->is_packed()) { if (field->is_packed()) {
absl::StrAppend(&mode, " | upb_LabelFlags_IsPacked"); absl::StrAppend(&mode, " | kUpb_LabelFlags_IsPacked");
} }
if (field->is_extension()) { if (field->is_extension()) {
absl::StrAppend(&mode, " | upb_LabelFlags_IsExtension"); absl::StrAppend(&mode, " | kUpb_LabelFlags_IsExtension");
} }
output("{$0, $1, $2, $3, $4, $5 | ($6 << upb_FieldRep_Shift)}", output("{$0, $1, $2, $3, $4, $5 | ($6 << kUpb_FieldRep_Shift)}",
field->number(), offset, presence, submsg_index, field->number(), offset, presence, submsg_index,
TableDescriptorType(field), mode, rep); TableDescriptorType(field), mode, rep);
} }
@ -1275,13 +1275,13 @@ void WriteMessage(const protobuf::Descriptor* message, Output& output,
table_mask = (table.size() - 1) << 3; table_mask = (table.size() - 1) << 3;
} }
std::string msgext = "upb_ExtMode_NonExtendable"; std::string msgext = "kUpb_ExtMode_NonExtendable";
if (message->extension_range_count()) { if (message->extension_range_count()) {
if (message->options().message_set_wire_format()) { if (message->options().message_set_wire_format()) {
msgext = "upb_ExtMode_IsMessageSet"; msgext = "kUpb_ExtMode_IsMessageSet";
} else { } else {
msgext = "upb_ExtMode_Extendable"; msgext = "kUpb_ExtMode_Extendable";
} }
} }

Loading…
Cancel
Save