From 75edd3e59c397ddbe0f45e59d952a1d8abc26b20 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 13 Oct 2020 11:18:17 -0700 Subject: [PATCH 1/7] Changed to use table pairs, seems to ever-so-slightly regress. --- .../google/protobuf/descriptor.upb.c | 2646 ++++++----------- upb/decode_fast.c | 6 +- upb/def.c | 2 +- upb/msg.h | 8 +- upbc/generator.cc | 7 +- 5 files changed, 875 insertions(+), 1794 deletions(-) diff --git a/generated_for_cmake/google/protobuf/descriptor.upb.c b/generated_for_cmake/google/protobuf/descriptor.upb.c index 4b5c92c6b0..242d1bdf36 100644 --- a/generated_for_cmake/google/protobuf/descriptor.upb.c +++ b/generated_for_cmake/google/protobuf/descriptor.upb.c @@ -22,72 +22,38 @@ static const upb_msglayout_field google_protobuf_FileDescriptorSet__fields[1] = const upb_msglayout google_protobuf_FileDescriptorSet_msginit = { { - &fastdecode_generic, - &upb_prm_1bt_max192b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(10, 10), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_prm_1bt_max192b, UPB_SIZE(10, 10)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_FileDescriptorSet_submsgs[0], &google_protobuf_FileDescriptorSet__fields[0], @@ -120,72 +86,38 @@ static const upb_msglayout_field google_protobuf_FileDescriptorProto__fields[12] const upb_msglayout google_protobuf_FileDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_pss_1bt, - &fastdecode_generic, - &upb_prm_1bt_max128b, - &upb_prm_1bt_max128b, - &upb_prm_1bt_max64b, - &upb_prm_1bt_max192b, - &upb_psm_1bt_max256b, - &upb_psm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &upb_pss_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973706, 2251799813816330), - UPB_SIZE(3377699720790034, 6755399441317906), - UPB_SIZE(0, 0), - UPB_SIZE(11258999068426274, 22517998136852514), - UPB_SIZE(12384898975334442, 24769797950603306), - UPB_SIZE(13510798882373682, 27021597764485170), - UPB_SIZE(14636698789085242, 29273397578039354), - UPB_SIZE(7881385247440962, 15762684595339330), - UPB_SIZE(9007289449381962, 18014488704122954), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(5629499534737506, 11258999068950626), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899906973706, 2251799813816330)}, + {&upb_pss_1bt, UPB_SIZE(3377699720790034, 6755399441317906)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_prm_1bt_max128b, UPB_SIZE(11258999068426274, 22517998136852514)}, + {&upb_prm_1bt_max128b, UPB_SIZE(12384898975334442, 24769797950603306)}, + {&upb_prm_1bt_max64b, UPB_SIZE(13510798882373682, 27021597764485170)}, + {&upb_prm_1bt_max192b, UPB_SIZE(14636698789085242, 29273397578039354)}, + {&upb_psm_1bt_max256b, UPB_SIZE(7881385247440962, 15762684595339330)}, + {&upb_psm_1bt_max64b, UPB_SIZE(9007289449381962, 18014488704122954)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(5629499534737506, 11258999068950626)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_FileDescriptorProto_submsgs[0], &google_protobuf_FileDescriptorProto__fields[0], @@ -217,72 +149,38 @@ static const upb_msglayout_field google_protobuf_DescriptorProto__fields[10] = { const upb_msglayout google_protobuf_DescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_prm_1bt_max192b, - &upb_prm_1bt_max128b, - &upb_prm_1bt_max128b, - &upb_prm_1bt_max64b, - &upb_prm_1bt_max192b, - &upb_psm_1bt_max64b, - &upb_prm_1bt_max64b, - &upb_prm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973706, 2251799813816330), - UPB_SIZE(4503599627632658, 9007199255003154), - UPB_SIZE(5629499534213146, 11258999068426266), - UPB_SIZE(6755399441252386, 13510798882308130), - UPB_SIZE(7881299347963946, 15762598695862314), - UPB_SIZE(9007199255003186, 18014398509744178), - UPB_SIZE(3377777030266938, 6755476750794810), - UPB_SIZE(10133099161976898, 20266198323560514), - UPB_SIZE(11258999068557386, 22517998136983626), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899906973706, 2251799813816330)}, + {&upb_prm_1bt_max192b, UPB_SIZE(4503599627632658, 9007199255003154)}, + {&upb_prm_1bt_max128b, UPB_SIZE(5629499534213146, 11258999068426266)}, + {&upb_prm_1bt_max128b, UPB_SIZE(6755399441252386, 13510798882308130)}, + {&upb_prm_1bt_max64b, UPB_SIZE(7881299347963946, 15762598695862314)}, + {&upb_prm_1bt_max192b, UPB_SIZE(9007199255003186, 18014398509744178)}, + {&upb_psm_1bt_max64b, UPB_SIZE(3377777030266938, 6755476750794810)}, + {&upb_prm_1bt_max64b, UPB_SIZE(10133099161976898, 20266198323560514)}, + {&upb_prm_1bt_max64b, UPB_SIZE(11258999068557386, 22517998136983626)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_DescriptorProto_submsgs[0], &google_protobuf_DescriptorProto__fields[0], @@ -301,72 +199,38 @@ static const upb_msglayout_field google_protobuf_DescriptorProto_ExtensionRange_ const upb_msglayout google_protobuf_DescriptorProto_ExtensionRange_msginit = { { - &fastdecode_generic, - &upb_psv4_1bt, - &upb_psv4_1bt, - &upb_psm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973704, 1125899906973704), - UPB_SIZE(2251799813947408, 2251799813947408), - UPB_SIZE(3377781324906522, 4503681231749146), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psv4_1bt, UPB_SIZE(1125899906973704, 1125899906973704)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813947408, 2251799813947408)}, + {&upb_psm_1bt_max64b, UPB_SIZE(3377781324906522, 4503681231749146)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0], &google_protobuf_DescriptorProto_ExtensionRange__fields[0], @@ -380,72 +244,38 @@ static const upb_msglayout_field google_protobuf_DescriptorProto_ReservedRange__ const upb_msglayout google_protobuf_DescriptorProto_ReservedRange_msginit = { { - &fastdecode_generic, - &upb_psv4_1bt, - &upb_psv4_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973704, 1125899906973704), - UPB_SIZE(2251799813947408, 2251799813947408), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psv4_1bt, UPB_SIZE(1125899906973704, 1125899906973704)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813947408, 2251799813947408)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, NULL, &google_protobuf_DescriptorProto_ReservedRange__fields[0], @@ -462,72 +292,38 @@ static const upb_msglayout_field google_protobuf_ExtensionRangeOptions__fields[1 const upb_msglayout google_protobuf_ExtensionRangeOptions_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_ExtensionRangeOptions_submsgs[0], &google_protobuf_ExtensionRangeOptions__fields[0], @@ -554,72 +350,38 @@ static const upb_msglayout_field google_protobuf_FieldDescriptorProto__fields[11 const upb_msglayout google_protobuf_FieldDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_pss_1bt, - &upb_psv4_1bt, - &upb_psv4_1bt, - &upb_psv4_1bt, - &upb_pss_1bt, - &upb_pss_1bt, - &upb_psm_1bt_max64b, - &upb_psv4_1bt, - &upb_pss_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_2bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(10133099165777930, 11258999072620554), - UPB_SIZE(12384898983657490, 15762598704185362), - UPB_SIZE(6755399441580056, 6755399441580056), - UPB_SIZE(2251799813816352, 2251799813816352), - UPB_SIZE(4503599627632680, 4503599627632680), - UPB_SIZE(14636698805731378, 20266198339944498), - UPB_SIZE(16888498636193850, 24769797984092218), - UPB_SIZE(21392214194126914, 33777113169395778), - UPB_SIZE(7881299348947016, 7881299348947016), - UPB_SIZE(19140298483433554, 29273397645017170), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(9007199256838536, 9007199256838536), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(10133099165777930, 11258999072620554)}, + {&upb_pss_1bt, UPB_SIZE(12384898983657490, 15762598704185362)}, + {&upb_psv4_1bt, UPB_SIZE(6755399441580056, 6755399441580056)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813816352, 2251799813816352)}, + {&upb_psv4_1bt, UPB_SIZE(4503599627632680, 4503599627632680)}, + {&upb_pss_1bt, UPB_SIZE(14636698805731378, 20266198339944498)}, + {&upb_pss_1bt, UPB_SIZE(16888498636193850, 24769797984092218)}, + {&upb_psm_1bt_max64b, UPB_SIZE(21392214194126914, 33777113169395778)}, + {&upb_psv4_1bt, UPB_SIZE(7881299348947016, 7881299348947016)}, + {&upb_pss_1bt, UPB_SIZE(19140298483433554, 29273397645017170)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_2bt, UPB_SIZE(9007199256838536, 9007199256838536)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_FieldDescriptorProto_submsgs[0], &google_protobuf_FieldDescriptorProto__fields[0], @@ -637,72 +399,38 @@ static const upb_msglayout_field google_protobuf_OneofDescriptorProto__fields[2] const upb_msglayout google_protobuf_OneofDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_psm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973706, 2251799813816330), - UPB_SIZE(3377777029939218, 6755476750467090), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899906973706, 2251799813816330)}, + {&upb_psm_1bt_max64b, UPB_SIZE(3377777029939218, 6755476750467090)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_OneofDescriptorProto_submsgs[0], &google_protobuf_OneofDescriptorProto__fields[0], @@ -725,72 +453,38 @@ static const upb_msglayout_field google_protobuf_EnumDescriptorProto__fields[5] const upb_msglayout google_protobuf_EnumDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_prm_1bt_max64b, - &upb_psm_1bt_max64b, - &upb_prm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973706, 2251799813816330), - UPB_SIZE(4503599627501586, 9007199254872082), - UPB_SIZE(3377777030004762, 6755476750532634), - UPB_SIZE(5629499534213154, 11258999068426274), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899906973706, 2251799813816330)}, + {&upb_prm_1bt_max64b, UPB_SIZE(4503599627501586, 9007199254872082)}, + {&upb_psm_1bt_max64b, UPB_SIZE(3377777030004762, 6755476750532634)}, + {&upb_prm_1bt_max64b, UPB_SIZE(5629499534213154, 11258999068426274)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_EnumDescriptorProto_submsgs[0], &google_protobuf_EnumDescriptorProto__fields[0], @@ -804,72 +498,38 @@ static const upb_msglayout_field google_protobuf_EnumDescriptorProto_EnumReserve const upb_msglayout google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = { { - &fastdecode_generic, - &upb_psv4_1bt, - &upb_psv4_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973704, 1125899906973704), - UPB_SIZE(2251799813947408, 2251799813947408), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psv4_1bt, UPB_SIZE(1125899906973704, 1125899906973704)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813947408, 2251799813947408)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, NULL, &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0], @@ -888,72 +548,38 @@ static const upb_msglayout_field google_protobuf_EnumValueDescriptorProto__field const upb_msglayout google_protobuf_EnumValueDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_psv4_1bt, - &upb_psm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(2251799813947402, 2251799813947402), - UPB_SIZE(1125899906973712, 1125899906973712), - UPB_SIZE(4503681231749146, 6755481045434394), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(2251799813947402, 2251799813947402)}, + {&upb_psv4_1bt, UPB_SIZE(1125899906973712, 1125899906973712)}, + {&upb_psm_1bt_max64b, UPB_SIZE(4503681231749146, 6755481045434394)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_EnumValueDescriptorProto_submsgs[0], &google_protobuf_EnumValueDescriptorProto__fields[0], @@ -973,72 +599,38 @@ static const upb_msglayout_field google_protobuf_ServiceDescriptorProto__fields[ const upb_msglayout google_protobuf_ServiceDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_prm_1bt_max128b, - &upb_psm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973706, 2251799813816330), - UPB_SIZE(4503599627370514, 9007199254741010), - UPB_SIZE(3377777030004762, 6755476750532634), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899906973706, 2251799813816330)}, + {&upb_prm_1bt_max128b, UPB_SIZE(4503599627370514, 9007199254741010)}, + {&upb_psm_1bt_max64b, UPB_SIZE(3377777030004762, 6755476750532634)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_ServiceDescriptorProto_submsgs[0], &google_protobuf_ServiceDescriptorProto__fields[0], @@ -1060,72 +652,38 @@ static const upb_msglayout_field google_protobuf_MethodDescriptorProto__fields[6 const upb_msglayout google_protobuf_MethodDescriptorProto_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_pss_1bt, - &upb_pss_1bt, - &upb_psm_1bt_max64b, - &upb_psb1_1bt, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899907366922, 2251799814209546), - UPB_SIZE(3377699721576466, 6755399442104338), - UPB_SIZE(5629499536310298, 11258999070523418), - UPB_SIZE(7881393837178914, 15762693185077282), - UPB_SIZE(281474976841768, 281474976841768), - UPB_SIZE(562949953683504, 562949953683504), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899907366922, 2251799814209546)}, + {&upb_pss_1bt, UPB_SIZE(3377699721576466, 6755399442104338)}, + {&upb_pss_1bt, UPB_SIZE(5629499536310298, 11258999070523418)}, + {&upb_psm_1bt_max64b, UPB_SIZE(7881393837178914, 15762693185077282)}, + {&upb_psb1_1bt, UPB_SIZE(281474976841768, 281474976841768)}, + {&upb_psb1_1bt, UPB_SIZE(562949953683504, 562949953683504)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_MethodDescriptorProto_submsgs[0], &google_protobuf_MethodDescriptorProto__fields[0], @@ -1162,72 +720,38 @@ static const upb_msglayout_field google_protobuf_FileOptions__fields[21] = { const upb_msglayout google_protobuf_FileOptions_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_pss_1bt, - &upb_psv4_1bt, - &upb_psb1_1bt, - &upb_pss_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_2bt, - &upb_psb1_2bt, - &upb_psb1_2bt, - &fastdecode_generic, - &upb_psb1_2bt, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_2bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_2bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_2bt, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(7881299482116106, 9007199388958730), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(10133099430019138, 13510799150547010), - UPB_SIZE(2251799813816392, 2251799813816392), - UPB_SIZE(4503599627632720, 4503599627632720), - UPB_SIZE(12384899512139866, 18014399046352986), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(4785074604605824, 4785074604605824), - UPB_SIZE(5066549581840776, 5066549581840776), - UPB_SIZE(5348024559600016, 5348024559600016), - UPB_SIZE(0, 0), - UPB_SIZE(5629499538407840, 5629499538407840), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(5910974519312824, 5910974519312824), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(6192449504412120, 6192449504412120), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(6473924497900024, 6473924497900024), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(7881299482116106, 9007199388958730)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(10133099430019138, 13510799150547010)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813816392, 2251799813816392)}, + {&upb_psb1_1bt, UPB_SIZE(4503599627632720, 4503599627632720)}, + {&upb_pss_1bt, UPB_SIZE(12384899512139866, 18014399046352986)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_2bt, UPB_SIZE(4785074604605824, 4785074604605824)}, + {&upb_psb1_2bt, UPB_SIZE(5066549581840776, 5066549581840776)}, + {&upb_psb1_2bt, UPB_SIZE(5348024559600016, 5348024559600016)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_2bt, UPB_SIZE(5629499538407840, 5629499538407840)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_2bt, UPB_SIZE(5910974519312824, 5910974519312824)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_2bt, UPB_SIZE(6192449504412120, 6192449504412120)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_2bt, UPB_SIZE(6473924497900024, 6473924497900024)}, }, &google_protobuf_FileOptions_submsgs[0], &google_protobuf_FileOptions__fields[0], @@ -1248,72 +772,38 @@ static const upb_msglayout_field google_protobuf_MessageOptions__fields[5] = { const upb_msglayout google_protobuf_MessageOptions_msginit = { { - &fastdecode_generic, - &upb_psb1_1bt, - &upb_psb1_1bt, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(281474976841736, 281474976841736), - UPB_SIZE(562949953683472, 562949953683472), - UPB_SIZE(844424930656280, 844424930656280), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(1125899907891256, 1125899907891256), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_1bt, UPB_SIZE(281474976841736, 281474976841736)}, + {&upb_psb1_1bt, UPB_SIZE(562949953683472, 562949953683472)}, + {&upb_psb1_1bt, UPB_SIZE(844424930656280, 844424930656280)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_1bt, UPB_SIZE(1125899907891256, 1125899907891256)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_MessageOptions_submsgs[0], &google_protobuf_MessageOptions__fields[0], @@ -1336,72 +826,38 @@ static const upb_msglayout_field google_protobuf_FieldOptions__fields[7] = { const upb_msglayout google_protobuf_FieldOptions_msginit = { { - &fastdecode_generic, - &upb_psv4_1bt, - &upb_psb1_1bt, - &upb_psb1_1bt, - &fastdecode_generic, - &upb_psb1_1bt, - &upb_psv4_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(2251799813816328, 2251799813816328), - UPB_SIZE(6755399441580048, 6755399441580048), - UPB_SIZE(7036874418815000, 7036874418815000), - UPB_SIZE(0, 0), - UPB_SIZE(7318349396574248, 7318349396574248), - UPB_SIZE(4503599627632688, 4503599627632688), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(7599824375382096, 7599824375382096), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813816328, 2251799813816328)}, + {&upb_psb1_1bt, UPB_SIZE(6755399441580048, 6755399441580048)}, + {&upb_psb1_1bt, UPB_SIZE(7036874418815000, 7036874418815000)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_1bt, UPB_SIZE(7318349396574248, 7318349396574248)}, + {&upb_psv4_1bt, UPB_SIZE(4503599627632688, 4503599627632688)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_1bt, UPB_SIZE(7599824375382096, 7599824375382096)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_FieldOptions_submsgs[0], &google_protobuf_FieldOptions__fields[0], @@ -1418,72 +874,38 @@ static const upb_msglayout_field google_protobuf_OneofOptions__fields[1] = { const upb_msglayout google_protobuf_OneofOptions_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_OneofOptions_submsgs[0], &google_protobuf_OneofOptions__fields[0], @@ -1502,72 +924,38 @@ static const upb_msglayout_field google_protobuf_EnumOptions__fields[3] = { const upb_msglayout google_protobuf_EnumOptions_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &upb_psb1_1bt, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(281474976841744, 281474976841744), - UPB_SIZE(562949953683480, 562949953683480), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_1bt, UPB_SIZE(281474976841744, 281474976841744)}, + {&upb_psb1_1bt, UPB_SIZE(562949953683480, 562949953683480)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_EnumOptions_submsgs[0], &google_protobuf_EnumOptions__fields[0], @@ -1585,72 +973,38 @@ static const upb_msglayout_field google_protobuf_EnumValueOptions__fields[2] = { const upb_msglayout google_protobuf_EnumValueOptions_msginit = { { - &fastdecode_generic, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(281474976841736, 281474976841736), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_psb1_1bt, UPB_SIZE(281474976841736, 281474976841736)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_EnumValueOptions_submsgs[0], &google_protobuf_EnumValueOptions__fields[0], @@ -1668,72 +1022,38 @@ static const upb_msglayout_field google_protobuf_ServiceOptions__fields[2] = { const upb_msglayout google_protobuf_ServiceOptions_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_ServiceOptions_submsgs[0], &google_protobuf_ServiceOptions__fields[0], @@ -1752,72 +1072,38 @@ static const upb_msglayout_field google_protobuf_MethodOptions__fields[3] = { const upb_msglayout google_protobuf_MethodOptions_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_MethodOptions_submsgs[0], &google_protobuf_MethodOptions__fields[0], @@ -1840,72 +1126,38 @@ static const upb_msglayout_field google_protobuf_UninterpretedOption__fields[7] const upb_msglayout google_protobuf_UninterpretedOption_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &upb_prm_1bt_max64b, - &upb_pss_1bt, - &upb_psv8_1bt, - &upb_psv8_1bt, - &fastdecode_generic, - &upb_pss_1bt, - &upb_pss_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(15762598695796754, 22517998136852498), - UPB_SIZE(9007199255789594, 9007199255789594), - UPB_SIZE(2251799813816352, 2251799813816352), - UPB_SIZE(4503599627632680, 4503599627632680), - UPB_SIZE(0, 0), - UPB_SIZE(11258999070523450, 13510798884208698), - UPB_SIZE(13510798886305858, 18014398513676354), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_prm_1bt_max64b, UPB_SIZE(15762598695796754, 22517998136852498)}, + {&upb_pss_1bt, UPB_SIZE(9007199255789594, 9007199255789594)}, + {&upb_psv8_1bt, UPB_SIZE(2251799813816352, 2251799813816352)}, + {&upb_psv8_1bt, UPB_SIZE(4503599627632680, 4503599627632680)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(11258999070523450, 13510798884208698)}, + {&upb_pss_1bt, UPB_SIZE(13510798886305858, 18014398513676354)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_UninterpretedOption_submsgs[0], &google_protobuf_UninterpretedOption__fields[0], @@ -1919,72 +1171,38 @@ static const upb_msglayout_field google_protobuf_UninterpretedOption_NamePart__f const upb_msglayout google_protobuf_UninterpretedOption_NamePart_msginit = { { - &fastdecode_generic, - &upb_pss_1bt, - &upb_psb1_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(1125899907104778, 2251799813947402), - UPB_SIZE(281474976841744, 281474976841744), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899907104778, 2251799813947402)}, + {&upb_psb1_1bt, UPB_SIZE(281474976841744, 281474976841744)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, NULL, &google_protobuf_UninterpretedOption_NamePart__fields[0], @@ -2001,72 +1219,38 @@ static const upb_msglayout_field google_protobuf_SourceCodeInfo__fields[1] = { const upb_msglayout google_protobuf_SourceCodeInfo_msginit = { { - &fastdecode_generic, - &upb_prm_1bt_max128b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(10, 10), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_prm_1bt_max128b, UPB_SIZE(10, 10)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_SourceCodeInfo_submsgs[0], &google_protobuf_SourceCodeInfo__fields[0], @@ -2083,72 +1267,38 @@ static const upb_msglayout_field google_protobuf_SourceCodeInfo_Location__fields const upb_msglayout google_protobuf_SourceCodeInfo_Location_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &upb_pss_1bt, - &upb_pss_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(1125899906973722, 2251799813816346), - UPB_SIZE(3377699720790050, 6755399441317922), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(1125899906973722, 2251799813816346)}, + {&upb_pss_1bt, UPB_SIZE(3377699720790050, 6755399441317922)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, NULL, &google_protobuf_SourceCodeInfo_Location__fields[0], @@ -2165,72 +1315,38 @@ static const upb_msglayout_field google_protobuf_GeneratedCodeInfo__fields[1] = const upb_msglayout google_protobuf_GeneratedCodeInfo_msginit = { { - &fastdecode_generic, - &upb_prm_1bt_max64b, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(10, 10), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_prm_1bt_max64b, UPB_SIZE(10, 10)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, &google_protobuf_GeneratedCodeInfo_submsgs[0], &google_protobuf_GeneratedCodeInfo__fields[0], @@ -2246,72 +1362,38 @@ static const upb_msglayout_field google_protobuf_GeneratedCodeInfo_Annotation__f const upb_msglayout google_protobuf_GeneratedCodeInfo_Annotation_msginit = { { - &fastdecode_generic, - &fastdecode_generic, - &upb_pss_1bt, - &upb_psv4_1bt, - &upb_psv4_1bt, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - &fastdecode_generic, - }, - { - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(3377699721052178, 4503599627894802), - UPB_SIZE(1125899906973720, 1125899906973720), - UPB_SIZE(2251799813947424, 2251799813947424), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), - UPB_SIZE(0, 0), + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&upb_pss_1bt, UPB_SIZE(3377699721052178, 4503599627894802)}, + {&upb_psv4_1bt, UPB_SIZE(1125899906973720, 1125899906973720)}, + {&upb_psv4_1bt, UPB_SIZE(2251799813947424, 2251799813947424)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, + {&fastdecode_generic, UPB_SIZE(0, 0)}, }, NULL, &google_protobuf_GeneratedCodeInfo_Annotation__fields[0], diff --git a/upb/decode_fast.c b/upb/decode_fast.c index e12b32a515..1b5aba9bd4 100644 --- a/upb/decode_fast.c +++ b/upb/decode_fast.c @@ -29,8 +29,8 @@ const char *fastdecode_tag_dispatch(upb_decstate *d, const char *ptr, upb_msg *m uint64_t data; size_t idx; idx = (tag & 0xf8) >> 3; - data = table->field_data[idx] ^ tag; - return table->field_parser[idx](UPB_PARSE_ARGS); + data = table->fasttable[idx].field_data ^ tag; + return table->fasttable[idx].field_parser(UPB_PARSE_ARGS); } UPB_FORCEINLINE @@ -40,7 +40,7 @@ uint32_t fastdecode_load_tag(const char* ptr) { return tag; } -UPB_FORCEINLINE +UPB_NOINLINE const char *fastdecode_dispatch(upb_decstate *d, const char *ptr, upb_msg *msg, const upb_msglayout *table, uint64_t hasbits) { if (UPB_UNLIKELY(ptr >= d->fastlimit)) { diff --git a/upb/def.c b/upb/def.c index 65c9e02d1a..9496476546 100644 --- a/upb/def.c +++ b/upb/def.c @@ -958,7 +958,7 @@ static bool make_layout(const upb_symtab *symtab, const upb_msgdef *m) { l->submsgs = submsgs; for (i = 0; i < 32; i++) { - l->field_parser[i] = &fastdecode_generic; + l->fasttable[i].field_parser = &fastdecode_generic; } if (upb_msgdef_mapentry(m)) { diff --git a/upb/msg.h b/upb/msg.h index 1bc934204a..bfc71a2658 100644 --- a/upb/msg.h +++ b/upb/msg.h @@ -54,9 +54,13 @@ typedef const char *_upb_field_parser(struct upb_decstate *d, const char *ptr, const struct upb_msglayout *table, uint64_t hasbits, uint64_t data); +typedef struct _upb_table_pair { + _upb_field_parser *field_parser; + uint64_t field_data; +} _upb_table_pair; + typedef struct upb_msglayout { - _upb_field_parser *field_parser[32]; - uint64_t field_data[32]; + _upb_table_pair fasttable[32]; const struct upb_msglayout *const* submsgs; const upb_msglayout_field *fields; /* Must be aligned to sizeof(void*). Doesn't include internal members like diff --git a/upbc/generator.cc b/upbc/generator.cc index 1409ee3c79..40c770c6b5 100644 --- a/upbc/generator.cc +++ b/upbc/generator.cc @@ -965,12 +965,7 @@ void WriteSource(const protobuf::FileDescriptor* file, Output& output) { output("const upb_msglayout $0 = {\n", MessageInit(message)); output(" {\n"); for (const auto& ent : table) { - output(" &$0,\n", ent.first); - } - output(" },\n"); - output(" {\n"); - for (const auto& ent : table) { - output(" $0,\n", GetSizeInit(ent.second)); + output(" {&$0, $1},\n", ent.first, GetSizeInit(ent.second)); } output(" },\n"); output(" $0,\n", submsgs_array_ref); From 5b0c5c7d4a3027f50d5f47a728a9be9fdd7a0f6e Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 13 Oct 2020 11:34:10 -0700 Subject: [PATCH 2/7] Dispatch inline. --- upb/decode_fast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upb/decode_fast.c b/upb/decode_fast.c index 1b5aba9bd4..a1737f10e0 100644 --- a/upb/decode_fast.c +++ b/upb/decode_fast.c @@ -40,7 +40,7 @@ uint32_t fastdecode_load_tag(const char* ptr) { return tag; } -UPB_NOINLINE +UPB_FORCEINLINE const char *fastdecode_dispatch(upb_decstate *d, const char *ptr, upb_msg *msg, const upb_msglayout *table, uint64_t hasbits) { if (UPB_UNLIKELY(ptr >= d->fastlimit)) { From b9f1b67d0776e91d7c6156b5136a65379a5e416a Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Thu, 15 Oct 2020 11:57:57 -0700 Subject: [PATCH 3/7] Use quoted include. --- upbc/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upbc/main.cc b/upbc/main.cc index a9682a9c1a..3a38937797 100644 --- a/upbc/main.cc +++ b/upbc/main.cc @@ -1,5 +1,5 @@ -#include +#include "google/protobuf/compiler/plugin.h" #include "upbc/generator.h" From 44a713084593061fc109ae085c475e17b5180ae2 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Thu, 15 Oct 2020 16:18:24 -0700 Subject: [PATCH 4/7] Used the correct copy of the protos in the benchmark. --- tests/benchmark.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/benchmark.cc b/tests/benchmark.cc index 3a0c6d76ec..84034768ad 100644 --- a/tests/benchmark.cc +++ b/tests/benchmark.cc @@ -76,9 +76,9 @@ static void BM_ParseDescriptor_Upb(benchmark::State& state) { size_t bytes = 0; for (auto _ : state) { upb_arena* arena = upb_arena_new(); - google_protobuf_FileDescriptorProto* set = - google_protobuf_FileDescriptorProto_parse(descriptor.data, - descriptor.size, arena); + upb_benchmark_FileDescriptorProto* set = + upb_benchmark_FileDescriptorProto_parse(descriptor.data, + descriptor.size, arena); if (!set) { printf("Failed to parse.\n"); exit(1); @@ -94,9 +94,9 @@ static void BM_ParseDescriptor_Upb_LargeInitialBlock(benchmark::State& state) { size_t bytes = 0; for (auto _ : state) { upb_arena* arena = upb_arena_init(buf, sizeof(buf), NULL); - google_protobuf_FileDescriptorProto* set = - google_protobuf_FileDescriptorProto_parse(descriptor.data, - descriptor.size, arena); + upb_benchmark_FileDescriptorProto* set = + upb_benchmark_FileDescriptorProto_parse(descriptor.data, + descriptor.size, arena); if (!set) { printf("Failed to parse.\n"); exit(1); From c2901eeee1bdca434fa96d45d4a431765e6979e6 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Thu, 15 Oct 2020 16:26:00 -0700 Subject: [PATCH 5/7] Added missing #includes (caught by Blaze). --- upb/decode.int.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/upb/decode.int.h b/upb/decode.int.h index 7aa1eea454..ab1982ef56 100644 --- a/upb/decode.int.h +++ b/upb/decode.int.h @@ -2,6 +2,9 @@ #ifndef UPB_DECODE_INT_H_ #define UPB_DECODE_INT_H_ +#include + +#include "upb/msg.h" #include "upb/upb.int.h" /* Must be last. */ From 2a574d3d0153accbf1887196b34bf348f83552c1 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Thu, 15 Oct 2020 19:58:07 -0700 Subject: [PATCH 6/7] Added a bunch of comments for readability. --- upb/decode.h | 6 --- upb/decode.int.h | 24 ++--------- upb/decode_fast.c | 106 ++++++++++++++++++++++++++++++---------------- upb/decode_fast.h | 5 +++ upb/def.c | 2 + 5 files changed, 81 insertions(+), 62 deletions(-) diff --git a/upb/decode.h b/upb/decode.h index a13e39b47c..650418c1ce 100644 --- a/upb/decode.h +++ b/upb/decode.h @@ -5,12 +5,8 @@ #ifndef UPB_DECODE_H_ #define UPB_DECODE_H_ -#include - #include "upb/msg.h" -#include "upb/port_def.inc" - #ifdef __cplusplus extern "C" { #endif @@ -23,6 +19,4 @@ bool upb_decode(const char *buf, size_t size, upb_msg *msg, } /* extern "C" */ #endif -#include "upb/port_undef.inc" - #endif /* UPB_DECODE_H_ */ diff --git a/upb/decode.int.h b/upb/decode.int.h index ab1982ef56..4a7c70385a 100644 --- a/upb/decode.int.h +++ b/upb/decode.int.h @@ -1,3 +1,7 @@ +/* +** Internal implementation details of the decoder that are shared between +** decode.c and decode_fast.c. +*/ #ifndef UPB_DECODE_INT_H_ #define UPB_DECODE_INT_H_ @@ -24,26 +28,6 @@ const char *fastdecode_dispatch(upb_decstate *d, const char *ptr, upb_msg *msg, const upb_msglayout *table, uint64_t hasbits); const char *fastdecode_err(upb_decstate *d); - -UPB_INLINE -upb_msg *decode_newmsg_ceil(upb_decstate *d, const upb_msglayout *l, - int msg_ceil_bytes) { - size_t size = l->size + sizeof(upb_msg_internal); - char *msg_data; - if (UPB_LIKELY(msg_ceil_bytes > 0 && _upb_arenahas(&d->arena, msg_ceil_bytes))) { - UPB_ASSERT(size <= (size_t)msg_ceil_bytes); - msg_data = d->arena.head.ptr; - d->arena.head.ptr += size; - UPB_UNPOISON_MEMORY_REGION(msg_data, msg_ceil_bytes); - memset(msg_data, 0, msg_ceil_bytes); - UPB_POISON_MEMORY_REGION(msg_data + size, msg_ceil_bytes - size); - } else { - msg_data = (char*)upb_arena_malloc(&d->arena, size); - memset(msg_data, 0, size); - } - return msg_data + sizeof(upb_msg_internal); -} - #include "upb/port_undef.inc" #endif /* UPB_DECODE_INT_H_ */ diff --git a/upb/decode_fast.c b/upb/decode_fast.c index a1737f10e0..1ad94684bf 100644 --- a/upb/decode_fast.c +++ b/upb/decode_fast.c @@ -1,3 +1,8 @@ +// Fast decoder: ~3x the speed of decode.c, but x86-64 specific. +// Also the table size grows by 2x. +// +// Could potentially be ported to ARM64 or other 64-bit archs that pass at +// least six arguments in registers. #include "upb/decode_fast.h" @@ -7,6 +12,8 @@ /* Must be last. */ #include "upb/port_def.inc" +// The standard set of arguments passed to each parsing function. +// Thanks to x86-64 calling conventions, these will stay in registers. #define UPB_PARSE_PARAMS \ upb_decstate *d, const char *ptr, upb_msg *msg, const upb_msglayout *table, \ uint64_t hasbits, uint64_t data @@ -23,18 +30,44 @@ typedef enum { CARD_r = 2 /* Repeated */ } upb_card; +UPB_INLINE +upb_msg *decode_newmsg_ceil(upb_decstate *d, const upb_msglayout *l, + int msg_ceil_bytes) { + size_t size = l->size + sizeof(upb_msg_internal); + char *msg_data; + if (UPB_LIKELY(msg_ceil_bytes > 0 && _upb_arenahas(&d->arena, msg_ceil_bytes))) { + UPB_ASSERT(size <= (size_t)msg_ceil_bytes); + msg_data = d->arena.head.ptr; + d->arena.head.ptr += size; + UPB_UNPOISON_MEMORY_REGION(msg_data, msg_ceil_bytes); + memset(msg_data, 0, msg_ceil_bytes); + UPB_POISON_MEMORY_REGION(msg_data + size, msg_ceil_bytes - size); + } else { + msg_data = (char*)upb_arena_malloc(&d->arena, size); + memset(msg_data, 0, size); + } + return msg_data + sizeof(upb_msg_internal); +} + UPB_FORCEINLINE -const char *fastdecode_tag_dispatch(upb_decstate *d, const char *ptr, upb_msg *msg, - const upb_msglayout *table, uint64_t hasbits, uint32_t tag) { - uint64_t data; - size_t idx; - idx = (tag & 0xf8) >> 3; - data = table->fasttable[idx].field_data ^ tag; +static const char *fastdecode_tagdispatch(upb_decstate *d, const char *ptr, + upb_msg *msg, + const upb_msglayout *table, + uint64_t hasbits, uint32_t tag) { + // Get 5 bits of field number (we pretend the continuation bit is a data bit, + // speculating that the second byte, if any, will be 0x01). + size_t idx = (tag & 0xf8) >> 3; + + // Xor the actual tag with the expected tag (in the low bytes of the table) + // so that the field parser can verify the tag by comparing with zero. + uint64_t data = table->fasttable[idx].field_data ^ tag; + + // Jump to the specialized field parser function. return table->fasttable[idx].field_parser(UPB_PARSE_ARGS); } UPB_FORCEINLINE -uint32_t fastdecode_load_tag(const char* ptr) { +static uint32_t fastdecode_loadtag(const char *ptr) { uint16_t tag; memcpy(&tag, ptr, 2); return tag; @@ -45,13 +78,19 @@ const char *fastdecode_dispatch(upb_decstate *d, const char *ptr, upb_msg *msg, const upb_msglayout *table, uint64_t hasbits) { if (UPB_UNLIKELY(ptr >= d->fastlimit)) { if (UPB_LIKELY(ptr == d->limit)) { - *(uint32_t*)msg |= hasbits >> 16; /* Sync hasbits. */ + // Parse is finished. + *(uint32_t*)msg |= hasbits >> 16; // Sync hasbits. return ptr; } + // We are within 16 bytes of end-of-buffer, so we can't use fast parsing + // functions anymore (they will read up to 16b without bounds checks). uint64_t data = 0; RETURN_GENERIC("dispatch hit end\n"); } - return fastdecode_tag_dispatch(d, ptr, msg, table, hasbits, fastdecode_load_tag(ptr)); + + // Read two bytes of tag data (for a one-byte tag, the high byte is junk). + uint16_t tag = fastdecode_loadtag(ptr); + return fastdecode_tagdispatch(d, ptr, msg, table, hasbits, tag); } UPB_FORCEINLINE @@ -74,6 +113,7 @@ static void *fastdecode_getfield_ofs(upb_decstate *d, const char *ptr, switch (card) { case CARD_s: + // Set hasbit and return pointer to scalar field. if (hasbit_is_idx) { *hasbits |= 1ull << ((*data >> 32) & 63); } else { @@ -81,31 +121,24 @@ static void *fastdecode_getfield_ofs(upb_decstate *d, const char *ptr, } return field; case CARD_r: { + // Get pointer to upb_array and allocate/expand if necessary. uint8_t elem_size_lg2 = __builtin_ctz(valbytes); upb_array **arr_p = field; upb_array *arr; + char *begin; *hasbits >>= 16; *(uint32_t*)msg |= *hasbits; *hasbits = 0; if (UPB_LIKELY(!*arr_p)) { - const size_t initial_len = 8; - size_t need = (valbytes * initial_len) + sizeof(upb_array); - if (!hasbit_is_idx && UPB_UNLIKELY(!_upb_arenahas(&d->arena, need))) { - return NULL; - } - arr = upb_arena_malloc(&d->arena, need); - field = arr + 1; - arr->data = _upb_array_tagptr(field, elem_size_lg2); + arr = _upb_array_new(&d->arena, 8, elem_size_lg2); *arr_p = arr; - arr->size = initial_len; - *end = (char*)field + (arr->size * valbytes); } else { arr = *arr_p; - field = _upb_array_ptr(arr); - *end = (char*)field + (arr->size * valbytes); - field = (char*)field + (arr->len * valbytes); } - *data = fastdecode_load_tag(ptr); + begin = _upb_array_ptr(arr); + field = begin + (arr->len * valbytes); + *end = begin + (arr->size * valbytes); + *data = fastdecode_loadtag(ptr); *outarr = arr; return field; } @@ -124,11 +157,8 @@ static void *fastdecode_getfield(upb_decstate *d, const char *ptr, upb_msg *msg, /* varint fields **************************************************************/ -#ifdef __BMI2__ -#include -#endif - -UPB_FORCEINLINE uint64_t fastdecode_munge(uint64_t val, int valbytes, bool zigzag) { +UPB_FORCEINLINE +static uint64_t fastdecode_munge(uint64_t val, int valbytes, bool zigzag) { if (valbytes == 1) { return val != 0; } else if (zigzag) { @@ -215,7 +245,8 @@ TAGBYTES(o) /* string fields **************************************************************/ UPB_FORCEINLINE -bool fastdecode_boundscheck(const char *ptr, size_t len, const char *end) { +static bool fastdecode_boundscheck(const char *ptr, size_t len, + const char *end) { uintptr_t uptr = (uintptr_t)ptr; uintptr_t uend = (uintptr_t)end; uintptr_t res = uptr + len; @@ -263,9 +294,11 @@ const char *upb_pos_2bt(UPB_PARSE_PARAMS) { /* message fields *************************************************************/ -UPB_NOINLINE static -const char *fastdecode_lendelim_submsg(upb_decstate *d, const char *ptr, upb_msg *msg, - const upb_msglayout *table, uint64_t hasbits, const char* saved_limit) { +UPB_NOINLINE +static const char *fastdecode_tosubmsg(upb_decstate *d, const char *ptr, + upb_msg *msg, const upb_msglayout *table, + uint64_t hasbits, + const char *saved_limit) { size_t len = (uint8_t)ptr[-1]; if (UPB_UNLIKELY(len & 0x80)) { int i; @@ -277,7 +310,8 @@ const char *fastdecode_lendelim_submsg(upb_decstate *d, const char *ptr, upb_msg } ptr++; size_t byte = (uint8_t)ptr[-1]; - // len is limited by 2gb not 4gb, hence 8 and not 16 as normally expected for a 32 bit varint. + // len is limited by 2gb not 4gb, hence 8 and not 16 as normally expected + // for a 32 bit varint. if (UPB_UNLIKELY(byte >= 8)) return fastdecode_err(d); len += (byte - 1) << 28; } @@ -342,7 +376,7 @@ again: ptr += tagbytes + 1; - ptr = fastdecode_lendelim_submsg(d, ptr, child, subl, 0, saved_limit); + ptr = fastdecode_tosubmsg(d, ptr, child, subl, 0, saved_limit); if (UPB_UNLIKELY(ptr != d->limit || d->end_group != 0)) { return fastdecode_err(d); @@ -351,7 +385,7 @@ again: if (card == CARD_r) { submsg++; if (UPB_LIKELY(ptr < saved_fastlimit)) { - uint32_t tag = fastdecode_load_tag(ptr); + uint32_t tag = fastdecode_loadtag(ptr); if (tagbytes == 1) { if ((uint8_t)tag == (uint8_t)data) goto again; } else { @@ -361,7 +395,7 @@ again: d->limit = saved_limit; d->fastlimit = saved_fastlimit; d->depth++; - return fastdecode_tag_dispatch(d, ptr, msg, table, hasbits, tag); + return fastdecode_tagdispatch(d, ptr, msg, table, hasbits, tag); } else { if (ptr == saved_limit) { arr->len = submsg - (upb_msg**)_upb_array_ptr(arr); diff --git a/upb/decode_fast.h b/upb/decode_fast.h index 47ca1bc4ba..bb0f14d721 100644 --- a/upb/decode_fast.h +++ b/upb/decode_fast.h @@ -1,3 +1,8 @@ +// These are the specialized field parser functions for the fast parser. +// Generated tables will refer to these by name. +// +// Here we follow the same pattern of macros used in decode_fast.c to declare +// all of the variants. #ifndef UPB_DECODE_FAST_H_ #define UPB_DECODE_FAST_H_ diff --git a/upb/def.c b/upb/def.c index 9496476546..0b59667a09 100644 --- a/upb/def.c +++ b/upb/def.c @@ -957,6 +957,8 @@ static bool make_layout(const upb_symtab *symtab, const upb_msgdef *m) { l->fields = fields; l->submsgs = submsgs; + /* TODO(haberman): initialize fast tables so that reflection-based parsing + * can get the same speeds as linked-in types. */ for (i = 0; i < 32; i++) { l->fasttable[i].field_parser = &fastdecode_generic; } From 3238821315a2866c3892e1f7336593e1dab9d9a2 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Thu, 15 Oct 2020 20:01:50 -0700 Subject: [PATCH 7/7] Gave fast table entry a nicer name. --- upb/msg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upb/msg.h b/upb/msg.h index 06787506d5..8c87b42154 100644 --- a/upb/msg.h +++ b/upb/msg.h @@ -46,21 +46,21 @@ typedef struct { uint8_t label; /* google.protobuf.Label or _UPB_LABEL_* above. */ } upb_msglayout_field; -struct upb_msglayout; struct upb_decstate; +struct upb_msglayout; typedef const char *_upb_field_parser(struct upb_decstate *d, const char *ptr, upb_msg *msg, const struct upb_msglayout *table, uint64_t hasbits, uint64_t data); -typedef struct _upb_table_pair { +typedef struct { _upb_field_parser *field_parser; uint64_t field_data; -} _upb_table_pair; +} _upb_fasttable_entry; typedef struct upb_msglayout { - _upb_table_pair fasttable[32]; + _upb_fasttable_entry fasttable[32]; const struct upb_msglayout *const* submsgs; const upb_msglayout_field *fields; /* Must be aligned to sizeof(void*). Doesn't include internal members like