[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
/* This file was generated by upbc (the upb compiler) from the input
|
|
|
|
* file:
|
|
|
|
*
|
|
|
|
* google/protobuf/descriptor.proto
|
|
|
|
*
|
|
|
|
* Do not edit -- your changes will be discarded when the file is
|
|
|
|
* regenerated. */
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include "upb/collections/array_internal.h"
|
|
|
|
#include "upb/message/internal.h"
|
|
|
|
#include "upb/mini_table/enum_internal.h"
|
|
|
|
#include "google/protobuf/descriptor.upb.h"
|
|
|
|
|
|
|
|
// Must be last.
|
|
|
|
#include "upb/port/def.inc"
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_FileDescriptorProto_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_FileDescriptorSet__fields[1] = {
|
|
|
|
{1, 0, 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_FileDescriptorSet_msg_init = {
|
|
|
|
&google_protobuf_FileDescriptorSet_submsgs[0],
|
|
|
|
&google_protobuf_FileDescriptorSet__fields[0],
|
|
|
|
8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000000003f00000a, &upb_prm_1bt_max192b},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_FileDescriptorProto_submsgs[6] = {
|
|
|
|
{.submsg = &google_protobuf_DescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_ServiceDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_FileOptions_msg_init},
|
|
|
|
{.submsg = &google_protobuf_SourceCodeInfo_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_FileDescriptorProto__fields[13] = {
|
|
|
|
{1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(48, 24), 2, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(4, 40), 0, kUpb_NoSub, 12, kUpb_FieldMode_Array | kUpb_LabelFlags_IsAlternate | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(8, 48), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{5, UPB_SIZE(12, 56), 0, 1, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{6, UPB_SIZE(16, 64), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{7, UPB_SIZE(20, 72), 0, 3, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{8, UPB_SIZE(24, 80), 3, 4, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{9, UPB_SIZE(28, 88), 4, 5, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{10, UPB_SIZE(32, 96), 0, kUpb_NoSub, 5, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{11, UPB_SIZE(36, 104), 0, kUpb_NoSub, 5, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{12, UPB_SIZE(56, 112), 5, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{13, UPB_SIZE(64, 128), 6, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_FileDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_FileDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_FileDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(72, 144), 13, kUpb_ExtMode_NonExtendable, 13, UPB_FASTTABLE_MASK(120), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
|
|
|
{0x0018000002000012, &upb_pss_1bt},
|
|
|
|
{0x002800003f00001a, &upb_prs_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x003000003f000022, &upb_prm_1bt_max128b},
|
|
|
|
{0x003800003f01002a, &upb_prm_1bt_max64b},
|
|
|
|
{0x004000003f020032, &upb_prm_1bt_max64b},
|
|
|
|
{0x004800003f03003a, &upb_prm_1bt_max128b},
|
|
|
|
{0x0050000003040042, &upb_psm_1bt_max256b},
|
|
|
|
{0x005800000405004a, &upb_psm_1bt_max64b},
|
|
|
|
{0x006000003f000050, &upb_prv4_1bt},
|
|
|
|
{0x006800003f000058, &upb_prv4_1bt},
|
|
|
|
{0x0070000005000062, &upb_pss_1bt},
|
|
|
|
{0x008000000600006a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_DescriptorProto_submsgs[8] = {
|
|
|
|
{.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_DescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_EnumDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_DescriptorProto_ExtensionRange_msg_init},
|
|
|
|
{.submsg = &google_protobuf_FieldDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_MessageOptions_msg_init},
|
|
|
|
{.submsg = &google_protobuf_OneofDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_DescriptorProto_ReservedRange_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_DescriptorProto__fields[10] = {
|
|
|
|
{1, UPB_SIZE(40, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(4, 24), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 32), 0, 1, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(12, 40), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{5, UPB_SIZE(16, 48), 0, 3, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{6, UPB_SIZE(20, 56), 0, 4, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{7, UPB_SIZE(24, 64), 2, 5, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{8, UPB_SIZE(28, 72), 0, 6, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{9, UPB_SIZE(32, 80), 0, 7, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{10, UPB_SIZE(36, 88), 0, kUpb_NoSub, 12, kUpb_FieldMode_Array | kUpb_LabelFlags_IsAlternate | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_DescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_DescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_DescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(120), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x001800003f000012, &upb_prm_1bt_max128b},
|
|
|
|
{0x002000003f01001a, &upb_prm_1bt_max128b},
|
|
|
|
{0x002800003f020022, &upb_prm_1bt_max64b},
|
|
|
|
{0x003000003f03002a, &upb_prm_1bt_max64b},
|
|
|
|
{0x003800003f040032, &upb_prm_1bt_max128b},
|
|
|
|
{0x004000000205003a, &upb_psm_1bt_max64b},
|
|
|
|
{0x004800003f060042, &upb_prm_1bt_max64b},
|
|
|
|
{0x005000003f07004a, &upb_prm_1bt_max64b},
|
|
|
|
{0x005800003f000052, &upb_prs_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_ExtensionRangeOptions_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
|
|
|
|
{1, 4, 1, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 8, 2, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(12, 16), 3, 0, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msg_init = {
|
|
|
|
&google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
|
|
|
|
&google_protobuf_DescriptorProto_ExtensionRange__fields[0],
|
|
|
|
UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0004000001000008, &upb_psv4_1bt},
|
|
|
|
{0x0008000002000010, &upb_psv4_1bt},
|
|
|
|
{0x001000000300001a, &upb_psm_1bt_max64b},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
|
|
|
|
{1, 4, 1, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 8, 2, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msg_init = {
|
|
|
|
NULL,
|
|
|
|
&google_protobuf_DescriptorProto_ReservedRange__fields[0],
|
|
|
|
16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0004000001000008, &upb_psv4_1bt},
|
|
|
|
{0x0008000002000010, &upb_psv4_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_ExtensionRangeOptions_submsgs[3] = {
|
|
|
|
{.submsg = &google_protobuf_ExtensionRangeOptions_Declaration_msg_init},
|
|
|
|
{.subenum = &google_protobuf_ExtensionRangeOptions_VerificationState_enum_init},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_ExtensionRangeOptions__fields[3] = {
|
|
|
|
{2, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 4), 1, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{999, UPB_SIZE(12, 16), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_ExtensionRangeOptions_msg_init = {
|
|
|
|
&google_protobuf_ExtensionRangeOptions_submsgs[0],
|
|
|
|
&google_protobuf_ExtensionRangeOptions__fields[0],
|
|
|
|
UPB_SIZE(16, 24), 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f000012, &upb_prm_1bt_max64b},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x001000003f023eba, &upb_prm_2bt_max128b},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_ExtensionRangeOptions_Declaration__fields[6] = {
|
|
|
|
{1, 4, 1, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(12, 16), 2, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(20, 32), 3, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{4, 8, 4, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{5, 9, 5, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{6, 10, 6, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_ExtensionRangeOptions_Declaration_msg_init = {
|
|
|
|
NULL,
|
|
|
|
&google_protobuf_ExtensionRangeOptions_Declaration__fields[0],
|
|
|
|
UPB_SIZE(32, 48), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0004000001000008, &upb_psv4_1bt},
|
|
|
|
{0x0010000002000012, &upb_pss_1bt},
|
|
|
|
{0x002000000300001a, &upb_pss_1bt},
|
|
|
|
{0x0008000004000020, &upb_psb1_1bt},
|
|
|
|
{0x0009000005000028, &upb_psb1_1bt},
|
|
|
|
{0x000a000006000030, &upb_psb1_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_FieldDescriptorProto_submsgs[3] = {
|
|
|
|
{.subenum = &google_protobuf_FieldDescriptorProto_Label_enum_init},
|
|
|
|
{.subenum = &google_protobuf_FieldDescriptorProto_Type_enum_init},
|
|
|
|
{.submsg = &google_protobuf_FieldOptions_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_FieldDescriptorProto__fields[11] = {
|
|
|
|
{1, UPB_SIZE(28, 24), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(36, 40), 2, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{3, 4, 3, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{4, 8, 4, 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{5, 12, 5, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{6, UPB_SIZE(44, 56), 6, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{7, UPB_SIZE(52, 72), 7, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{8, UPB_SIZE(16, 88), 8, 2, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{9, UPB_SIZE(20, 16), 9, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{10, UPB_SIZE(60, 96), 10, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{17, UPB_SIZE(24, 20), 11, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_FieldDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_FieldDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_FieldDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x001800000100000a, &upb_pss_1bt},
|
|
|
|
{0x0028000002000012, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0004000003000018, &upb_psv4_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0038000006000032, &upb_pss_1bt},
|
|
|
|
{0x004800000700003a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0058000008020042, &upb_psm_1bt_max64b},
|
|
|
|
{0x0010000009000048, &upb_psv4_1bt},
|
|
|
|
{0x006000000a000052, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x001400000b000188, &upb_psb1_2bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_OneofDescriptorProto_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_OneofOptions_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_OneofDescriptorProto__fields[2] = {
|
|
|
|
{1, 8, 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(4, 24), 2, 0, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_OneofDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_OneofDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_OneofDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0018000002000012, &upb_psm_1bt_max64b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_EnumDescriptorProto_submsgs[3] = {
|
|
|
|
{.submsg = &google_protobuf_EnumValueDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_EnumOptions_msg_init},
|
|
|
|
{.submsg = &google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_EnumDescriptorProto__fields[5] = {
|
|
|
|
{1, UPB_SIZE(20, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(4, 24), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 32), 2, 1, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(12, 40), 0, 2, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{5, UPB_SIZE(16, 48), 0, kUpb_NoSub, 12, kUpb_FieldMode_Array | kUpb_LabelFlags_IsAlternate | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_EnumDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_EnumDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_EnumDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x001800003f000012, &upb_prm_1bt_max64b},
|
|
|
|
{0x002000000201001a, &upb_psm_1bt_max64b},
|
|
|
|
{0x002800003f020022, &upb_prm_1bt_max64b},
|
|
|
|
{0x003000003f00002a, &upb_prs_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
|
|
|
|
{1, 4, 1, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 8, 2, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init = {
|
|
|
|
NULL,
|
|
|
|
&google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
|
|
|
|
16, 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0004000001000008, &upb_psv4_1bt},
|
|
|
|
{0x0008000002000010, &upb_psv4_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_EnumValueOptions_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_EnumValueDescriptorProto__fields[3] = {
|
|
|
|
{1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 4, 2, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 24), 3, 0, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_EnumValueDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_EnumValueDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0004000002000010, &upb_psv4_1bt},
|
|
|
|
{0x001800000300001a, &upb_psm_1bt_max64b},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
|
|
|
|
{.submsg = &google_protobuf_MethodDescriptorProto_msg_init},
|
|
|
|
{.submsg = &google_protobuf_ServiceOptions_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_ServiceDescriptorProto__fields[3] = {
|
|
|
|
{1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(4, 24), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 32), 2, 1, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_ServiceDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_ServiceDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_ServiceDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, UPB_FASTTABLE_MASK(24), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x001800003f000012, &upb_prm_1bt_max128b},
|
|
|
|
{0x002000000201001a, &upb_psm_1bt_max64b},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_MethodDescriptorProto_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_MethodOptions_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_MethodDescriptorProto__fields[6] = {
|
|
|
|
{1, UPB_SIZE(12, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(20, 24), 2, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(28, 40), 3, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(4, 56), 4, 0, 11, kUpb_FieldMode_Scalar | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{5, UPB_SIZE(8, 1), 5, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{6, UPB_SIZE(9, 2), 6, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_MethodDescriptorProto_msg_init = {
|
|
|
|
&google_protobuf_MethodDescriptorProto_submsgs[0],
|
|
|
|
&google_protobuf_MethodDescriptorProto__fields[0],
|
|
|
|
UPB_SIZE(40, 64), 6, kUpb_ExtMode_NonExtendable, 6, UPB_FASTTABLE_MASK(56), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
|
|
|
{0x0018000002000012, &upb_pss_1bt},
|
|
|
|
{0x002800000300001a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0038000004000022, &upb_psm_1bt_max64b},
|
|
|
|
{0x0001000005000028, &upb_psb1_1bt},
|
|
|
|
{0x0002000006000030, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_FileOptions_submsgs[2] = {
|
|
|
|
{.subenum = &google_protobuf_FileOptions_OptimizeMode_enum_init},
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_FileOptions__fields[21] = {
|
|
|
|
{1, 24, 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{8, UPB_SIZE(32, 40), 2, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{9, 4, 3, 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{10, 8, 4, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{11, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{16, 9, 6, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{17, 10, 7, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{18, 11, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{20, 12, 9, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{23, 13, 10, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{27, 14, 11, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{31, 15, 12, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{36, UPB_SIZE(48, 72), 13, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{37, UPB_SIZE(56, 88), 14, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{39, UPB_SIZE(64, 104), 15, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{40, UPB_SIZE(72, 120), 16, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{41, UPB_SIZE(80, 136), 17, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{42, 16, 18, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{44, UPB_SIZE(88, 152), 19, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{45, UPB_SIZE(96, 168), 20, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{999, UPB_SIZE(20, 184), 0, 1, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_FileOptions_msg_init = {
|
|
|
|
&google_protobuf_FileOptions_submsgs[0],
|
|
|
|
&google_protobuf_FileOptions__fields[0],
|
|
|
|
UPB_SIZE(104, 192), 21, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x001800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0028000002000042, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0008000004000050, &upb_psb1_1bt},
|
|
|
|
{0x003800000500005a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0009000006000180, &upb_psb1_2bt},
|
|
|
|
{0x000a000007000188, &upb_psb1_2bt},
|
|
|
|
{0x000b000008000190, &upb_psb1_2bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000c0000090001a0, &upb_psb1_2bt},
|
|
|
|
{0x005800000e0002aa, &upb_pss_2bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000d00000a0001b8, &upb_psb1_2bt},
|
|
|
|
{0x00780000100002c2, &upb_pss_2bt},
|
|
|
|
{0x00880000110002ca, &upb_pss_2bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x00100000120002d0, &upb_psb1_2bt},
|
|
|
|
{0x000e00000b0001d8, &upb_psb1_2bt},
|
|
|
|
{0x00980000130002e2, &upb_pss_2bt},
|
|
|
|
{0x00a80000140002ea, &upb_pss_2bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000f00000c0001f8, &upb_psb1_2bt},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_MessageOptions_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_MessageOptions__fields[6] = {
|
|
|
|
{1, 1, 1, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 2, 2, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{3, 3, 3, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{7, 4, 4, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{11, 5, 5, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{999, 8, 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_MessageOptions_msg_init = {
|
|
|
|
&google_protobuf_MessageOptions_submsgs[0],
|
|
|
|
&google_protobuf_MessageOptions__fields[0],
|
|
|
|
16, 6, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0001000001000008, &upb_psb1_1bt},
|
|
|
|
{0x0002000002000010, &upb_psb1_1bt},
|
|
|
|
{0x0003000003000018, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0004000004000038, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0005000005000058, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f003eba, &upb_prm_2bt_max128b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_FieldOptions_submsgs[6] = {
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{.subenum = &google_protobuf_FieldOptions_CType_enum_init},
|
|
|
|
{.subenum = &google_protobuf_FieldOptions_JSType_enum_init},
|
|
|
|
{.subenum = &google_protobuf_FieldOptions_OptionRetention_enum_init},
|
|
|
|
{.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
|
|
|
|
{.subenum = &google_protobuf_FieldOptions_OptionTargetType_enum_init},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_FieldOptions__fields[12] = {
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{1, 4, 1, 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 8, 2, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{3, 9, 3, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{5, 10, 4, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{6, 12, 5, 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{10, 16, 6, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{15, 17, 7, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{17, 20, 9, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{18, 24, 10, 3, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{19, UPB_SIZE(28, 32), 0, 4, 14, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{999, UPB_SIZE(32, 40), 0, 5, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_FieldOptions_msg_init = {
|
|
|
|
&google_protobuf_FieldOptions_submsgs[0],
|
|
|
|
&google_protobuf_FieldOptions__fields[0],
|
|
|
|
UPB_SIZE(40, 48), 12, kUpb_ExtMode_Extendable, 3, UPB_FASTTABLE_MASK(248), 0,
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0008000002000010, &upb_psb1_1bt},
|
|
|
|
{0x0009000003000018, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000a000004000028, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0010000006000050, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0011000007000078, &upb_psb1_1bt},
|
|
|
|
{0x0012000008000180, &upb_psb1_2bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x002800003f053eba, &upb_prm_2bt_max128b},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_OneofOptions_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_OneofOptions__fields[1] = {
|
|
|
|
{999, 0, 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_OneofOptions_msg_init = {
|
|
|
|
&google_protobuf_OneofOptions_submsgs[0],
|
|
|
|
&google_protobuf_OneofOptions__fields[0],
|
|
|
|
8, 1, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000000003f003eba, &upb_prm_2bt_max128b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_EnumOptions_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_EnumOptions__fields[4] = {
|
|
|
|
{2, 1, 1, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{3, 2, 2, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{6, 3, 3, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_EnumOptions_msg_init = {
|
|
|
|
&google_protobuf_EnumOptions_submsgs[0],
|
|
|
|
&google_protobuf_EnumOptions__fields[0],
|
|
|
|
UPB_SIZE(8, 16), 4, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0001000001000010, &upb_psb1_1bt},
|
|
|
|
{0x0002000002000018, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0003000003000030, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f003eba, &upb_prm_2bt_max128b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_EnumValueOptions_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_EnumValueOptions__fields[2] = {
|
|
|
|
{1, 1, 1, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_EnumValueOptions_msg_init = {
|
|
|
|
&google_protobuf_EnumValueOptions_submsgs[0],
|
|
|
|
&google_protobuf_EnumValueOptions__fields[0],
|
|
|
|
UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 1, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0001000001000008, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f003eba, &upb_prm_2bt_max128b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_ServiceOptions_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_ServiceOptions__fields[2] = {
|
|
|
|
{33, 1, 1, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{999, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_ServiceOptions_msg_init = {
|
|
|
|
&google_protobuf_ServiceOptions_submsgs[0],
|
|
|
|
&google_protobuf_ServiceOptions__fields[0],
|
|
|
|
UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0001000001000288, &upb_psb1_2bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f003eba, &upb_prm_2bt_max128b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_MethodOptions_submsgs[2] = {
|
|
|
|
{.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enum_init},
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_MethodOptions__fields[3] = {
|
|
|
|
{33, 1, 1, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{34, 4, 2, 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{999, 8, 0, 1, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_MethodOptions_msg_init = {
|
|
|
|
&google_protobuf_MethodOptions_submsgs[0],
|
|
|
|
&google_protobuf_MethodOptions__fields[0],
|
|
|
|
16, 3, kUpb_ExtMode_Extendable, 0, UPB_FASTTABLE_MASK(248), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0001000001000288, &upb_psb1_2bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f013eba, &upb_prm_2bt_max128b},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_UninterpretedOption_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_UninterpretedOption_NamePart_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_UninterpretedOption__fields[7] = {
|
|
|
|
{2, UPB_SIZE(4, 8), 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 16), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(16, 32), 2, kUpb_NoSub, 4, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{5, UPB_SIZE(24, 40), 3, kUpb_NoSub, 3, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{6, UPB_SIZE(32, 48), 4, kUpb_NoSub, 1, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{7, UPB_SIZE(40, 56), 5, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{8, UPB_SIZE(48, 72), 6, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_UninterpretedOption_msg_init = {
|
|
|
|
&google_protobuf_UninterpretedOption_submsgs[0],
|
|
|
|
&google_protobuf_UninterpretedOption__fields[0],
|
|
|
|
UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, UPB_FASTTABLE_MASK(120), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f000012, &upb_prm_1bt_max64b},
|
|
|
|
{0x001000000100001a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0020000002000020, &upb_psv8_1bt},
|
|
|
|
{0x0028000003000028, &upb_psv8_1bt},
|
|
|
|
{0x0030000004000031, &upb_psf8_1bt},
|
|
|
|
{0x003800000500003a, &upb_psb_1bt},
|
|
|
|
{0x0048000006000042, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_UninterpretedOption_NamePart__fields[2] = {
|
|
|
|
{1, UPB_SIZE(4, 8), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{2, 1, 2, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msg_init = {
|
|
|
|
NULL,
|
|
|
|
&google_protobuf_UninterpretedOption_NamePart__fields[0],
|
|
|
|
UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, UPB_FASTTABLE_MASK(24), 2,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800000100000a, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0001000002000010, &upb_psb1_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_SourceCodeInfo_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_SourceCodeInfo_Location_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_SourceCodeInfo__fields[1] = {
|
|
|
|
{1, 0, 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_SourceCodeInfo_msg_init = {
|
|
|
|
&google_protobuf_SourceCodeInfo_submsgs[0],
|
|
|
|
&google_protobuf_SourceCodeInfo__fields[0],
|
|
|
|
8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000000003f00000a, &upb_prm_1bt_max128b},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_SourceCodeInfo_Location__fields[5] = {
|
|
|
|
{1, UPB_SIZE(4, 8), 0, kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(16, 24), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(24, 40), 2, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{6, UPB_SIZE(12, 56), 0, kUpb_NoSub, 12, kUpb_FieldMode_Array | kUpb_LabelFlags_IsAlternate | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msg_init = {
|
|
|
|
NULL,
|
|
|
|
&google_protobuf_SourceCodeInfo_Location__fields[0],
|
|
|
|
UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000800003f00000a, &upb_ppv4_1bt},
|
|
|
|
{0x001000003f000012, &upb_ppv4_1bt},
|
|
|
|
{0x001800000100001a, &upb_pss_1bt},
|
|
|
|
{0x0028000002000022, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x003800003f000032, &upb_prs_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
|
|
|
|
{.submsg = &google_protobuf_GeneratedCodeInfo_Annotation_msg_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_GeneratedCodeInfo__fields[1] = {
|
|
|
|
{1, 0, 0, 0, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_GeneratedCodeInfo_msg_init = {
|
|
|
|
&google_protobuf_GeneratedCodeInfo_submsgs[0],
|
|
|
|
&google_protobuf_GeneratedCodeInfo__fields[0],
|
|
|
|
8, 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(8), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x000000003f00000a, &upb_prm_1bt_max64b},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableSub google_protobuf_GeneratedCodeInfo_Annotation_submsgs[1] = {
|
|
|
|
{.subenum = &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableField google_protobuf_GeneratedCodeInfo_Annotation__fields[5] = {
|
|
|
|
{1, UPB_SIZE(4, 16), 0, kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
|
|
|
|
{2, UPB_SIZE(20, 24), 1, kUpb_NoSub, 12, kUpb_FieldMode_Scalar | kUpb_LabelFlags_IsAlternate | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
|
|
|
|
{3, UPB_SIZE(8, 4), 2, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{4, UPB_SIZE(12, 8), 3, kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
{5, UPB_SIZE(16, 12), 4, 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msg_init = {
|
|
|
|
&google_protobuf_GeneratedCodeInfo_Annotation_submsgs[0],
|
|
|
|
&google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
|
|
|
|
UPB_SIZE(32, 40), 5, kUpb_ExtMode_NonExtendable, 5, UPB_FASTTABLE_MASK(56), 0,
|
|
|
|
UPB_FASTTABLE_INIT({
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x001000003f00000a, &upb_ppv4_1bt},
|
|
|
|
{0x0018000001000012, &upb_pss_1bt},
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
{0x0004000002000018, &upb_psv4_1bt},
|
|
|
|
{0x0008000003000020, &upb_psv4_1bt},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
|
|
|
|
})
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTable *messages_layout[28] = {
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
&google_protobuf_FileDescriptorSet_msg_init,
|
|
|
|
&google_protobuf_FileDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_DescriptorProto_msg_init,
|
|
|
|
&google_protobuf_DescriptorProto_ExtensionRange_msg_init,
|
|
|
|
&google_protobuf_DescriptorProto_ReservedRange_msg_init,
|
|
|
|
&google_protobuf_ExtensionRangeOptions_msg_init,
|
|
|
|
&google_protobuf_ExtensionRangeOptions_Declaration_msg_init,
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
&google_protobuf_FieldDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_OneofDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_EnumDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_EnumDescriptorProto_EnumReservedRange_msg_init,
|
|
|
|
&google_protobuf_EnumValueDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_ServiceDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_MethodDescriptorProto_msg_init,
|
|
|
|
&google_protobuf_FileOptions_msg_init,
|
|
|
|
&google_protobuf_MessageOptions_msg_init,
|
|
|
|
&google_protobuf_FieldOptions_msg_init,
|
|
|
|
&google_protobuf_OneofOptions_msg_init,
|
|
|
|
&google_protobuf_EnumOptions_msg_init,
|
|
|
|
&google_protobuf_EnumValueOptions_msg_init,
|
|
|
|
&google_protobuf_ServiceOptions_msg_init,
|
|
|
|
&google_protobuf_MethodOptions_msg_init,
|
|
|
|
&google_protobuf_UninterpretedOption_msg_init,
|
|
|
|
&google_protobuf_UninterpretedOption_NamePart_msg_init,
|
|
|
|
&google_protobuf_SourceCodeInfo_msg_init,
|
|
|
|
&google_protobuf_SourceCodeInfo_Location_msg_init,
|
|
|
|
&google_protobuf_GeneratedCodeInfo_msg_init,
|
|
|
|
&google_protobuf_GeneratedCodeInfo_Annotation_msg_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_ExtensionRangeOptions_VerificationState_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x3,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0xe,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Type_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x7fffe,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x7,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x7,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x7,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x3ff,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0xe,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x7,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
|
|
|
|
64,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
0x7,
|
|
|
|
0x0,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static const upb_MiniTableEnum *enums_layout[10] = {
|
|
|
|
&google_protobuf_ExtensionRangeOptions_VerificationState_enum_init,
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
&google_protobuf_FieldDescriptorProto_Label_enum_init,
|
|
|
|
&google_protobuf_FieldDescriptorProto_Type_enum_init,
|
|
|
|
&google_protobuf_FieldOptions_CType_enum_init,
|
|
|
|
&google_protobuf_FieldOptions_JSType_enum_init,
|
|
|
|
&google_protobuf_FieldOptions_OptionRetention_enum_init,
|
|
|
|
&google_protobuf_FieldOptions_OptionTargetType_enum_init,
|
|
|
|
&google_protobuf_FileOptions_OptimizeMode_enum_init,
|
|
|
|
&google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
|
|
|
|
&google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
|
|
|
|
messages_layout,
|
|
|
|
enums_layout,
|
|
|
|
NULL,
|
|
|
|
28,
|
|
|
|
10,
|
[protobuf] Upgrade third_party/protobuf to 22.x (#32606)
The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
2 years ago
|
|
|
0,
|
|
|
|
};
|
|
|
|
|
|
|
|
#include "upb/port/undef.inc"
|
|
|
|
|