Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Automated rollback of commit d0c631ce7f.

Browse Source 
PiperOrigin-RevId: 615472723
pull/16142/head
Chris Kennelly 9 months ago committed by Copybara-Service
parent d0c631ce7f
commit c6727f4eba
3 changed files with 38 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/google/protobuf/compiler/cpp/options.h
  2. 64
      src/google/protobuf/descriptor.pb.cc
  3. 6
      src/google/protobuf/generated_message_tctable_gen.cc

4
src/google/protobuf/compiler/cpp/options.h
Unescape View File

@ -55,7 +55,9 @@ struct Options {
bool opensource_runtime = false; bool opensource_runtime = false;
bool annotate_accessor = false; bool annotate_accessor = false;
bool force_split = false; bool force_split = false;
bool profile_driven_cluster_aux_subtable = false; // TODO: clean this up after the change is rolled out for 2
// weeks.
bool profile_driven_cluster_aux_subtable = true;
#ifdef PROTOBUF_STABLE_EXPERIMENTS #ifdef PROTOBUF_STABLE_EXPERIMENTS
bool force_eagerly_verified_lazy = true; bool force_eagerly_verified_lazy = true;
bool force_inline_string = true; bool force_inline_string = true;

64
src/google/protobuf/descriptor.pb.cc
Unescape View File

@ -4577,7 +4577,7 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ =
{::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{::_pbi::TcParser::FastMtR2, {::_pbi::TcParser::FastMtR2,
{16058, 63, 3, PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.uninterpreted_option_)}}, {16058, 63, 2, PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.uninterpreted_option_)}},
}}, {{ }}, {{
50, 0, 1, 50, 0, 1,
65534, 2,999, 0, 1, 65534, 2,999, 0, 1,
@ -4588,19 +4588,19 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ =
{PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.declaration_), -1, 0, {PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.declaration_), -1, 0,
(0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
// optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE]; // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
{PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.verification_), _Internal::kHasBitsOffset + 1, 1, {PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.verification_), _Internal::kHasBitsOffset + 1, 3,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional .google.protobuf.FeatureSet features = 50; // optional .google.protobuf.FeatureSet features = 50;
{PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.features_), _Internal::kHasBitsOffset + 0, 2, {PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.features_), _Internal::kHasBitsOffset + 0, 1,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.uninterpreted_option_), -1, 3, {PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.uninterpreted_option_), -1, 2,
(0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
}}, {{ }}, {{
{::_pbi::TcParser::GetTable<::google::protobuf::ExtensionRangeOptions_Declaration>()}, {::_pbi::TcParser::GetTable<::google::protobuf::ExtensionRangeOptions_Declaration>()},
{0, 2},
{::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()}, {::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()},
{::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()}, {::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()},
{0, 2},
}}, {{ }}, {{
}}, }},
}; };
@ -4939,7 +4939,7 @@ constexpr ::_pbi::TcParseTable<4, 11, 3, 96, 2> FieldDescriptorProto::_table_ =
{58, 3, 0, PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.default_value_)}}, {58, 3, 0, PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.default_value_)}},
// optional .google.protobuf.FieldOptions options = 8; // optional .google.protobuf.FieldOptions options = 8;
{::_pbi::TcParser::FastMtS1, {::_pbi::TcParser::FastMtS1,
{66, 5, 2, PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.options_)}}, {66, 5, 0, PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.options_)}},
// optional int32 oneof_index = 9; // optional int32 oneof_index = 9;
{::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FieldDescriptorProto, _impl_.oneof_index_), 7>(), {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FieldDescriptorProto, _impl_.oneof_index_), 7>(),
{72, 7, 0, PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.oneof_index_)}}, {72, 7, 0, PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.oneof_index_)}},
@ -4964,10 +4964,10 @@ constexpr ::_pbi::TcParseTable<4, 11, 3, 96, 2> FieldDescriptorProto::_table_ =
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.number_), _Internal::kHasBitsOffset + 6, 0, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.number_), _Internal::kHasBitsOffset + 6, 0,
(0 | ::_fl::kFcOptional | ::_fl::kInt32)}, (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
// optional .google.protobuf.FieldDescriptorProto.Label label = 4; // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.label_), _Internal::kHasBitsOffset + 9, 0, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.label_), _Internal::kHasBitsOffset + 9, 1,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional .google.protobuf.FieldDescriptorProto.Type type = 5; // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.type_), _Internal::kHasBitsOffset + 10, 1, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.type_), _Internal::kHasBitsOffset + 10, 2,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional string type_name = 6; // optional string type_name = 6;
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.type_name_), _Internal::kHasBitsOffset + 2, 0, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.type_name_), _Internal::kHasBitsOffset + 2, 0,
@ -4976,7 +4976,7 @@ constexpr ::_pbi::TcParseTable<4, 11, 3, 96, 2> FieldDescriptorProto::_table_ =
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.default_value_), _Internal::kHasBitsOffset + 3, 0, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.default_value_), _Internal::kHasBitsOffset + 3, 0,
(0 | ::_fl::kFcOptional | ::_fl::kRawString | ::_fl::kRepAString)}, (0 | ::_fl::kFcOptional | ::_fl::kRawString | ::_fl::kRepAString)},
// optional .google.protobuf.FieldOptions options = 8; // optional .google.protobuf.FieldOptions options = 8;
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.options_), _Internal::kHasBitsOffset + 5, 2, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.options_), _Internal::kHasBitsOffset + 5, 0,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
// optional int32 oneof_index = 9; // optional int32 oneof_index = 9;
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.oneof_index_), _Internal::kHasBitsOffset + 7, 0, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.oneof_index_), _Internal::kHasBitsOffset + 7, 0,
@ -4988,9 +4988,9 @@ constexpr ::_pbi::TcParseTable<4, 11, 3, 96, 2> FieldDescriptorProto::_table_ =
{PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.proto3_optional_), _Internal::kHasBitsOffset + 8, 0, {PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.proto3_optional_), _Internal::kHasBitsOffset + 8, 0,
(0 | ::_fl::kFcOptional | ::_fl::kBool)}, (0 | ::_fl::kFcOptional | ::_fl::kBool)},
}}, {{ }}, {{
{::_pbi::TcParser::GetTable<::google::protobuf::FieldOptions>()},
{1, 3}, {1, 3},
{1, 18}, {1, 18},
{::_pbi::TcParser::GetTable<::google::protobuf::FieldOptions>()},
}}, {{ }}, {{
"\44\4\10\0\0\0\11\15\0\0\11\0\0\0\0\0" "\44\4\10\0\0\0\11\15\0\0\11\0\0\0\0\0"
"google.protobuf.FieldDescriptorProto" "google.protobuf.FieldDescriptorProto"
@ -7333,7 +7333,7 @@ constexpr ::_pbi::TcParseTable<5, 21, 3, 202, 12> FileOptions::_table_ = {
{PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.java_outer_classname_), _Internal::kHasBitsOffset + 1, 0, {PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.java_outer_classname_), _Internal::kHasBitsOffset + 1, 0,
(0 | ::_fl::kFcOptional | ::_fl::kRawString | ::_fl::kRepAString)}, (0 | ::_fl::kFcOptional | ::_fl::kRawString | ::_fl::kRepAString)},
// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
{PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.optimize_for_), _Internal::kHasBitsOffset + 18, 0, {PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.optimize_for_), _Internal::kHasBitsOffset + 18, 2,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional bool java_multiple_files = 10 [default = false]; // optional bool java_multiple_files = 10 [default = false];
{PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.java_multiple_files_), _Internal::kHasBitsOffset + 11, 0, {PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.java_multiple_files_), _Internal::kHasBitsOffset + 11, 0,
@ -7384,15 +7384,15 @@ constexpr ::_pbi::TcParseTable<5, 21, 3, 202, 12> FileOptions::_table_ = {
{PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.ruby_package_), _Internal::kHasBitsOffset + 9, 0, {PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.ruby_package_), _Internal::kHasBitsOffset + 9, 0,
(0 | ::_fl::kFcOptional | ::_fl::kRawString | ::_fl::kRepAString)}, (0 | ::_fl::kFcOptional | ::_fl::kRawString | ::_fl::kRepAString)},
// optional .google.protobuf.FeatureSet features = 50; // optional .google.protobuf.FeatureSet features = 50;
{PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.features_), _Internal::kHasBitsOffset + 10, 1, {PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.features_), _Internal::kHasBitsOffset + 10, 0,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.uninterpreted_option_), -1, 2, {PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.uninterpreted_option_), -1, 1,
(0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
}}, {{ }}, {{
{1, 3},
{::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()}, {::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()},
{::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()}, {::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()},
{1, 3},
}}, {{ }}, {{
"\33\14\24\0\0\12\0\0\0\0\0\0\0\21\20\14\20\15\26\14\0\0\0\0" "\33\14\24\0\0\12\0\0\0\0\0\0\0\21\20\14\20\15\26\14\0\0\0\0"
"google.protobuf.FileOptions" "google.protobuf.FileOptions"
@ -8687,7 +8687,7 @@ constexpr ::_pbi::TcParseTable<4, 13, 7, 0, 7> FieldOptions::_table_ = {
{24, 6, 0, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.deprecated_)}}, {24, 6, 0, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.deprecated_)}},
// repeated .google.protobuf.FieldOptions.EditionDefault edition_defaults = 20; // repeated .google.protobuf.FieldOptions.EditionDefault edition_defaults = 20;
{::_pbi::TcParser::FastMtR2, {::_pbi::TcParser::FastMtR2,
{418, 63, 4, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.edition_defaults_)}}, {418, 63, 0, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.edition_defaults_)}},
// optional bool lazy = 5 [default = false]; // optional bool lazy = 5 [default = false];
{::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FieldOptions, _impl_.lazy_), 4>(), {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FieldOptions, _impl_.lazy_), 4>(),
{40, 4, 0, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.lazy_)}}, {40, 4, 0, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.lazy_)}},
@ -8696,7 +8696,7 @@ constexpr ::_pbi::TcParseTable<4, 13, 7, 0, 7> FieldOptions::_table_ = {
{48, 2, 2, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.jstype_)}}, {48, 2, 2, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.jstype_)}},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{::_pbi::TcParser::FastMtR2, {::_pbi::TcParser::FastMtR2,
{16058, 63, 6, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.uninterpreted_option_)}}, {16058, 63, 2, PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.uninterpreted_option_)}},
{::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}},
{::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}},
// optional bool weak = 10 [default = false]; // optional bool weak = 10 [default = false];
@ -8715,7 +8715,7 @@ constexpr ::_pbi::TcParseTable<4, 13, 7, 0, 7> FieldOptions::_table_ = {
65535, 65535 65535, 65535
}}, {{ }}, {{
// optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.ctype_), _Internal::kHasBitsOffset + 1, 0, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.ctype_), _Internal::kHasBitsOffset + 1, 3,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional bool packed = 2; // optional bool packed = 2;
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.packed_), _Internal::kHasBitsOffset + 3, 0, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.packed_), _Internal::kHasBitsOffset + 3, 0,
@ -8727,7 +8727,7 @@ constexpr ::_pbi::TcParseTable<4, 13, 7, 0, 7> FieldOptions::_table_ = {
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.lazy_), _Internal::kHasBitsOffset + 4, 0, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.lazy_), _Internal::kHasBitsOffset + 4, 0,
(0 | ::_fl::kFcOptional | ::_fl::kBool)}, (0 | ::_fl::kFcOptional | ::_fl::kBool)},
// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.jstype_), _Internal::kHasBitsOffset + 2, 1, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.jstype_), _Internal::kHasBitsOffset + 2, 4,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional bool weak = 10 [default = false]; // optional bool weak = 10 [default = false];
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.weak_), _Internal::kHasBitsOffset + 7, 0, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.weak_), _Internal::kHasBitsOffset + 7, 0,
@ -8739,28 +8739,28 @@ constexpr ::_pbi::TcParseTable<4, 13, 7, 0, 7> FieldOptions::_table_ = {
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.debug_redact_), _Internal::kHasBitsOffset + 8, 0, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.debug_redact_), _Internal::kHasBitsOffset + 8, 0,
(0 | ::_fl::kFcOptional | ::_fl::kBool)}, (0 | ::_fl::kFcOptional | ::_fl::kBool)},
// optional .google.protobuf.FieldOptions.OptionRetention retention = 17; // optional .google.protobuf.FieldOptions.OptionRetention retention = 17;
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.retention_), _Internal::kHasBitsOffset + 9, 2, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.retention_), _Internal::kHasBitsOffset + 9, 5,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// repeated .google.protobuf.FieldOptions.OptionTargetType targets = 19; // repeated .google.protobuf.FieldOptions.OptionTargetType targets = 19;
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.targets_), -1, 3, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.targets_), -1, 6,
(0 | ::_fl::kFcRepeated | ::_fl::kEnumRange)}, (0 | ::_fl::kFcRepeated | ::_fl::kEnumRange)},
// repeated .google.protobuf.FieldOptions.EditionDefault edition_defaults = 20; // repeated .google.protobuf.FieldOptions.EditionDefault edition_defaults = 20;
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.edition_defaults_), -1, 4, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.edition_defaults_), -1, 0,
(0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
// optional .google.protobuf.FeatureSet features = 21; // optional .google.protobuf.FeatureSet features = 21;
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.features_), _Internal::kHasBitsOffset + 0, 5, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.features_), _Internal::kHasBitsOffset + 0, 1,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.uninterpreted_option_), -1, 6, {PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.uninterpreted_option_), -1, 2,
(0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
}}, {{ }}, {{
{::_pbi::TcParser::GetTable<::google::protobuf::FieldOptions_EditionDefault>()},
{::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()},
{::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()},
{0, 3}, {0, 3},
{0, 3}, {0, 3},
{0, 3}, {0, 3},
{0, 10}, {0, 10},
{::_pbi::TcParser::GetTable<::google::protobuf::FieldOptions_EditionDefault>()},
{::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()},
{::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()},
}}, {{ }}, {{
}}, }},
}; };
@ -10475,13 +10475,13 @@ constexpr ::_pbi::TcParseTable<3, 4, 3, 0, 12> MethodOptions::_table_ = {
{656, 2, 2, PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.idempotency_level_)}}, {656, 2, 2, PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.idempotency_level_)}},
// optional .google.protobuf.FeatureSet features = 35; // optional .google.protobuf.FeatureSet features = 35;
{::_pbi::TcParser::FastMtS2, {::_pbi::TcParser::FastMtS2,
{666, 0, 1, PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.features_)}}, {666, 0, 0, PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.features_)}},
{::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}},
{::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}},
{::_pbi::TcParser::MiniParse, {}}, {::_pbi::TcParser::MiniParse, {}},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{::_pbi::TcParser::FastMtR2, {::_pbi::TcParser::FastMtR2,
{16058, 63, 2, PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.uninterpreted_option_)}}, {16058, 63, 1, PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.uninterpreted_option_)}},
}}, {{ }}, {{
33, 0, 1, 33, 0, 1,
65528, 0,999, 0, 1, 65528, 0,999, 0, 1,
@ -10492,18 +10492,18 @@ constexpr ::_pbi::TcParseTable<3, 4, 3, 0, 12> MethodOptions::_table_ = {
{PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.deprecated_), _Internal::kHasBitsOffset + 1, 0, {PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.deprecated_), _Internal::kHasBitsOffset + 1, 0,
(0 | ::_fl::kFcOptional | ::_fl::kBool)}, (0 | ::_fl::kFcOptional | ::_fl::kBool)},
// optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
{PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.idempotency_level_), _Internal::kHasBitsOffset + 2, 0, {PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.idempotency_level_), _Internal::kHasBitsOffset + 2, 2,
(0 | ::_fl::kFcOptional | ::_fl::kEnumRange)}, (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
// optional .google.protobuf.FeatureSet features = 35; // optional .google.protobuf.FeatureSet features = 35;
{PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.features_), _Internal::kHasBitsOffset + 0, 1, {PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.features_), _Internal::kHasBitsOffset + 0, 0,
(0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
{PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.uninterpreted_option_), -1, 2, {PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.uninterpreted_option_), -1, 1,
(0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)}, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
}}, {{ }}, {{
{0, 3},
{::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()}, {::_pbi::TcParser::GetTable<::google::protobuf::FeatureSet>()},
{::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()}, {::_pbi::TcParser::GetTable<::google::protobuf::UninterpretedOption>()},
{0, 3},
}}, {{ }}, {{
}}, }},
}; };

6
src/google/protobuf/generated_message_tctable_gen.cc
Unescape View File

@ -819,9 +819,9 @@ TailCallTableInfo::TailCallTableInfo(
// the following typed fields are supported. // the following typed fields are supported.
return (field->type() == FieldDescriptor::TYPE_MESSAGE || return (field->type() == FieldDescriptor::TYPE_MESSAGE ||
field->type() == FieldDescriptor::TYPE_GROUP) && field->type() == FieldDescriptor::TYPE_GROUP) &&
!field->is_map() && !HasLazyRep(field, options) && !field->is_map() && !field->options().weak() &&
!options.is_implicitly_weak && options.use_direct_tcparser_table && !HasLazyRep(field, options) && !options.is_implicitly_weak &&
is_non_cold(options); options.use_direct_tcparser_table && is_non_cold(options);
}; };
for (const FieldDescriptor* field : ordered_fields) { for (const FieldDescriptor* field : ordered_fields) {
if (is_non_cold_subtable(field)) { if (is_non_cold_subtable(field)) {

Write Preview
Loading…
Cancel
Save