Commit 9db5b11c authored by Chris Kennelly's avatar Chris Kennelly

Work with truncated tag numbers.

This allows more compact comparisons (1 byte instead of 4 byte
immediates on x86) for each possible wire/tag inside each field.
parent 0026dff9
...@@ -220,7 +220,8 @@ bool Any::MergePartialFromCodedStream( ...@@ -220,7 +220,8 @@ bool Any::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string type_url = 1; // string type_url = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_type_url())); input, this->mutable_type_url()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -235,7 +236,8 @@ bool Any::MergePartialFromCodedStream( ...@@ -235,7 +236,8 @@ bool Any::MergePartialFromCodedStream(
// bytes value = 2; // bytes value = 2;
case 2: { case 2: {
if (tag == 18u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(18u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
input, this->mutable_value())); input, this->mutable_value()));
} else { } else {
......
...@@ -288,7 +288,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -288,7 +288,8 @@ bool Api::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string name = 1; // string name = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_name())); input, this->mutable_name()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -303,7 +304,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -303,7 +304,8 @@ bool Api::MergePartialFromCodedStream(
// repeated .google.protobuf.Method methods = 2; // repeated .google.protobuf.Method methods = 2;
case 2: { case 2: {
if (tag == 18u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(18u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_methods())); input, add_methods()));
...@@ -316,7 +318,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -316,7 +318,8 @@ bool Api::MergePartialFromCodedStream(
// repeated .google.protobuf.Option options = 3; // repeated .google.protobuf.Option options = 3;
case 3: { case 3: {
if (tag == 26u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(26u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_options())); input, add_options()));
...@@ -329,7 +332,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -329,7 +332,8 @@ bool Api::MergePartialFromCodedStream(
// string version = 4; // string version = 4;
case 4: { case 4: {
if (tag == 34u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(34u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_version())); input, this->mutable_version()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -344,7 +348,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -344,7 +348,8 @@ bool Api::MergePartialFromCodedStream(
// .google.protobuf.SourceContext source_context = 5; // .google.protobuf.SourceContext source_context = 5;
case 5: { case 5: {
if (tag == 42u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(42u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_source_context())); input, mutable_source_context()));
} else { } else {
...@@ -355,7 +360,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -355,7 +360,8 @@ bool Api::MergePartialFromCodedStream(
// repeated .google.protobuf.Mixin mixins = 6; // repeated .google.protobuf.Mixin mixins = 6;
case 6: { case 6: {
if (tag == 50u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(50u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_mixins())); input, add_mixins()));
...@@ -368,7 +374,8 @@ bool Api::MergePartialFromCodedStream( ...@@ -368,7 +374,8 @@ bool Api::MergePartialFromCodedStream(
// .google.protobuf.Syntax syntax = 7; // .google.protobuf.Syntax syntax = 7;
case 7: { case 7: {
if (tag == 56u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(56u)) {
int value; int value;
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
...@@ -1029,7 +1036,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1029,7 +1036,8 @@ bool Method::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string name = 1; // string name = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_name())); input, this->mutable_name()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -1044,7 +1052,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1044,7 +1052,8 @@ bool Method::MergePartialFromCodedStream(
// string request_type_url = 2; // string request_type_url = 2;
case 2: { case 2: {
if (tag == 18u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(18u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_request_type_url())); input, this->mutable_request_type_url()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -1059,7 +1068,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1059,7 +1068,8 @@ bool Method::MergePartialFromCodedStream(
// bool request_streaming = 3; // bool request_streaming = 3;
case 3: { case 3: {
if (tag == 24u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(24u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
...@@ -1072,7 +1082,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1072,7 +1082,8 @@ bool Method::MergePartialFromCodedStream(
// string response_type_url = 4; // string response_type_url = 4;
case 4: { case 4: {
if (tag == 34u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(34u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_response_type_url())); input, this->mutable_response_type_url()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -1087,7 +1098,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1087,7 +1098,8 @@ bool Method::MergePartialFromCodedStream(
// bool response_streaming = 5; // bool response_streaming = 5;
case 5: { case 5: {
if (tag == 40u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(40u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
...@@ -1100,7 +1112,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1100,7 +1112,8 @@ bool Method::MergePartialFromCodedStream(
// repeated .google.protobuf.Option options = 6; // repeated .google.protobuf.Option options = 6;
case 6: { case 6: {
if (tag == 50u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(50u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_options())); input, add_options()));
...@@ -1113,7 +1126,8 @@ bool Method::MergePartialFromCodedStream( ...@@ -1113,7 +1126,8 @@ bool Method::MergePartialFromCodedStream(
// .google.protobuf.Syntax syntax = 7; // .google.protobuf.Syntax syntax = 7;
case 7: { case 7: {
if (tag == 56u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(56u)) {
int value; int value;
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
...@@ -1729,7 +1743,8 @@ bool Mixin::MergePartialFromCodedStream( ...@@ -1729,7 +1743,8 @@ bool Mixin::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string name = 1; // string name = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_name())); input, this->mutable_name()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -1744,7 +1759,8 @@ bool Mixin::MergePartialFromCodedStream( ...@@ -1744,7 +1759,8 @@ bool Mixin::MergePartialFromCodedStream(
// string root = 2; // string root = 2;
case 2: { case 2: {
if (tag == 18u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(18u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_root())); input, this->mutable_root()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
......
...@@ -3028,7 +3028,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) { ...@@ -3028,7 +3028,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) {
const FieldGenerator& field_generator = field_generators_.get(field); const FieldGenerator& field_generator = field_generators_.get(field);
// Emit code to parse the common, expected case. // Emit code to parse the common, expected case.
printer->Print("if (tag == $commontag$u) {\n", printer->Print("if (static_cast<::google::protobuf::uint8>(tag) ==\n"
" static_cast<::google::protobuf::uint8>($commontag$u)) {\n",
"commontag", SimpleItoa(WireFormat::MakeTag(field))); "commontag", SimpleItoa(WireFormat::MakeTag(field)));
if (loops) { if (loops) {
...@@ -3047,7 +3048,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) { ...@@ -3047,7 +3048,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) {
if (field->is_packed()) { if (field->is_packed()) {
internal::WireFormatLite::WireType wiretype = internal::WireFormatLite::WireType wiretype =
WireFormat::WireTypeForFieldType(field->type()); WireFormat::WireTypeForFieldType(field->type());
printer->Print("} else if (tag == $uncommontag$u) {\n", printer->Print("} else if (static_cast<::google::protobuf::uint8>(tag) ==\n"
" static_cast<::google::protobuf::uint8>($uncommontag$u)) {\n",
"uncommontag", SimpleItoa( "uncommontag", SimpleItoa(
internal::WireFormatLite::MakeTag( internal::WireFormatLite::MakeTag(
field->number(), wiretype))); field->number(), wiretype)));
...@@ -3057,7 +3059,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) { ...@@ -3057,7 +3059,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) {
} else if (field->is_packable() && !field->is_packed()) { } else if (field->is_packable() && !field->is_packed()) {
internal::WireFormatLite::WireType wiretype = internal::WireFormatLite::WireType wiretype =
internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED; internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
printer->Print("} else if (tag == $uncommontag$u) {\n", printer->Print("} else if (static_cast<::google::protobuf::uint8>(tag) ==\n"
" static_cast<::google::protobuf::uint8>($uncommontag$u)) {\n",
"uncommontag", SimpleItoa( "uncommontag", SimpleItoa(
internal::WireFormatLite::MakeTag( internal::WireFormatLite::MakeTag(
field->number(), wiretype))); field->number(), wiretype)));
......
...@@ -287,7 +287,8 @@ bool Version::MergePartialFromCodedStream( ...@@ -287,7 +287,8 @@ bool Version::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// optional int32 major = 1; // optional int32 major = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
set_has_major(); set_has_major();
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
...@@ -300,7 +301,8 @@ bool Version::MergePartialFromCodedStream( ...@@ -300,7 +301,8 @@ bool Version::MergePartialFromCodedStream(
// optional int32 minor = 2; // optional int32 minor = 2;
case 2: { case 2: {
if (tag == 16u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(16u)) {
set_has_minor(); set_has_minor();
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
...@@ -313,7 +315,8 @@ bool Version::MergePartialFromCodedStream( ...@@ -313,7 +315,8 @@ bool Version::MergePartialFromCodedStream(
// optional int32 patch = 3; // optional int32 patch = 3;
case 3: { case 3: {
if (tag == 24u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(24u)) {
set_has_patch(); set_has_patch();
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
...@@ -326,7 +329,8 @@ bool Version::MergePartialFromCodedStream( ...@@ -326,7 +329,8 @@ bool Version::MergePartialFromCodedStream(
// optional string suffix = 4; // optional string suffix = 4;
case 4: { case 4: {
if (tag == 34u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(34u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_suffix())); input, this->mutable_suffix()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -800,7 +804,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream( ...@@ -800,7 +804,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// repeated string file_to_generate = 1; // repeated string file_to_generate = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_file_to_generate())); input, this->add_file_to_generate()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -816,7 +821,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream( ...@@ -816,7 +821,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
// optional string parameter = 2; // optional string parameter = 2;
case 2: { case 2: {
if (tag == 18u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(18u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_parameter())); input, this->mutable_parameter()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -831,7 +837,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream( ...@@ -831,7 +837,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
// optional .google.protobuf.compiler.Version compiler_version = 3; // optional .google.protobuf.compiler.Version compiler_version = 3;
case 3: { case 3: {
if (tag == 26u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(26u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_compiler_version())); input, mutable_compiler_version()));
} else { } else {
...@@ -842,7 +849,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream( ...@@ -842,7 +849,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
// repeated .google.protobuf.FileDescriptorProto proto_file = 15; // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
case 15: { case 15: {
if (tag == 122u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(122u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_proto_file())); input, add_proto_file()));
...@@ -1404,7 +1412,8 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream( ...@@ -1404,7 +1412,8 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// optional string name = 1; // optional string name = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_name())); input, this->mutable_name()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -1419,7 +1428,8 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream( ...@@ -1419,7 +1428,8 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream(
// optional string insertion_point = 2; // optional string insertion_point = 2;
case 2: { case 2: {
if (tag == 18u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(18u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_insertion_point())); input, this->mutable_insertion_point()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -1434,7 +1444,8 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream( ...@@ -1434,7 +1444,8 @@ bool CodeGeneratorResponse_File::MergePartialFromCodedStream(
// optional string content = 15; // optional string content = 15;
case 15: { case 15: {
if (tag == 122u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(122u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_content())); input, this->mutable_content()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -1944,7 +1955,8 @@ bool CodeGeneratorResponse::MergePartialFromCodedStream( ...@@ -1944,7 +1955,8 @@ bool CodeGeneratorResponse::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// optional string error = 1; // optional string error = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_error())); input, this->mutable_error()));
::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
...@@ -1959,7 +1971,8 @@ bool CodeGeneratorResponse::MergePartialFromCodedStream( ...@@ -1959,7 +1971,8 @@ bool CodeGeneratorResponse::MergePartialFromCodedStream(
// repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15; // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
case 15: { case 15: {
if (tag == 122u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(122u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_file())); input, add_file()));
......
This diff is collapsed.
...@@ -216,7 +216,8 @@ bool Duration::MergePartialFromCodedStream( ...@@ -216,7 +216,8 @@ bool Duration::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// int64 seconds = 1; // int64 seconds = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
...@@ -229,7 +230,8 @@ bool Duration::MergePartialFromCodedStream( ...@@ -229,7 +230,8 @@ bool Duration::MergePartialFromCodedStream(
// int32 nanos = 2; // int32 nanos = 2;
case 2: { case 2: {
if (tag == 16u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(16u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
......
...@@ -192,7 +192,8 @@ bool FieldMask::MergePartialFromCodedStream( ...@@ -192,7 +192,8 @@ bool FieldMask::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// repeated string paths = 1; // repeated string paths = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_paths())); input, this->add_paths()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
......
...@@ -198,7 +198,8 @@ bool SourceContext::MergePartialFromCodedStream( ...@@ -198,7 +198,8 @@ bool SourceContext::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string file_name = 1; // string file_name = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_file_name())); input, this->mutable_file_name()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
......
...@@ -306,7 +306,8 @@ bool Struct::MergePartialFromCodedStream( ...@@ -306,7 +306,8 @@ bool Struct::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// map<string, .google.protobuf.Value> fields = 1; // map<string, .google.protobuf.Value> fields = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
Struct_FieldsEntry::Parser< ::google::protobuf::internal::MapField< Struct_FieldsEntry::Parser< ::google::protobuf::internal::MapField<
::std::string, ::google::protobuf::Value, ::std::string, ::google::protobuf::Value,
...@@ -769,7 +770,8 @@ bool Value::MergePartialFromCodedStream( ...@@ -769,7 +770,8 @@ bool Value::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// .google.protobuf.NullValue null_value = 1; // .google.protobuf.NullValue null_value = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
int value; int value;
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
...@@ -783,7 +785,8 @@ bool Value::MergePartialFromCodedStream( ...@@ -783,7 +785,8 @@ bool Value::MergePartialFromCodedStream(
// double number_value = 2; // double number_value = 2;
case 2: { case 2: {
if (tag == 17u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(17u)) {
clear_kind(); clear_kind();
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
...@@ -797,7 +800,8 @@ bool Value::MergePartialFromCodedStream( ...@@ -797,7 +800,8 @@ bool Value::MergePartialFromCodedStream(
// string string_value = 3; // string string_value = 3;
case 3: { case 3: {
if (tag == 26u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(26u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_string_value())); input, this->mutable_string_value()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -812,7 +816,8 @@ bool Value::MergePartialFromCodedStream( ...@@ -812,7 +816,8 @@ bool Value::MergePartialFromCodedStream(
// bool bool_value = 4; // bool bool_value = 4;
case 4: { case 4: {
if (tag == 32u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(32u)) {
clear_kind(); clear_kind();
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
...@@ -826,7 +831,8 @@ bool Value::MergePartialFromCodedStream( ...@@ -826,7 +831,8 @@ bool Value::MergePartialFromCodedStream(
// .google.protobuf.Struct struct_value = 5; // .google.protobuf.Struct struct_value = 5;
case 5: { case 5: {
if (tag == 42u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(42u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_struct_value())); input, mutable_struct_value()));
} else { } else {
...@@ -837,7 +843,8 @@ bool Value::MergePartialFromCodedStream( ...@@ -837,7 +843,8 @@ bool Value::MergePartialFromCodedStream(
// .google.protobuf.ListValue list_value = 6; // .google.protobuf.ListValue list_value = 6;
case 6: { case 6: {
if (tag == 50u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(50u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
input, mutable_list_value())); input, mutable_list_value()));
} else { } else {
...@@ -1590,7 +1597,8 @@ bool ListValue::MergePartialFromCodedStream( ...@@ -1590,7 +1597,8 @@ bool ListValue::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// repeated .google.protobuf.Value values = 1; // repeated .google.protobuf.Value values = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(input->IncrementRecursionDepth()); DO_(input->IncrementRecursionDepth());
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth(
input, add_values())); input, add_values()));
......
...@@ -216,7 +216,8 @@ bool Timestamp::MergePartialFromCodedStream( ...@@ -216,7 +216,8 @@ bool Timestamp::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// int64 seconds = 1; // int64 seconds = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
...@@ -229,7 +230,8 @@ bool Timestamp::MergePartialFromCodedStream( ...@@ -229,7 +230,8 @@ bool Timestamp::MergePartialFromCodedStream(
// int32 nanos = 2; // int32 nanos = 2;
case 2: { case 2: {
if (tag == 16u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(16u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
......
This diff is collapsed.
...@@ -312,7 +312,8 @@ bool DoubleValue::MergePartialFromCodedStream( ...@@ -312,7 +312,8 @@ bool DoubleValue::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// double value = 1; // double value = 1;
case 1: { case 1: {
if (tag == 9u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(9u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
...@@ -567,7 +568,8 @@ bool FloatValue::MergePartialFromCodedStream( ...@@ -567,7 +568,8 @@ bool FloatValue::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// float value = 1; // float value = 1;
case 1: { case 1: {
if (tag == 13u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(13u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>( float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
...@@ -822,7 +824,8 @@ bool Int64Value::MergePartialFromCodedStream( ...@@ -822,7 +824,8 @@ bool Int64Value::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// int64 value = 1; // int64 value = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
...@@ -1079,7 +1082,8 @@ bool UInt64Value::MergePartialFromCodedStream( ...@@ -1079,7 +1082,8 @@ bool UInt64Value::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// uint64 value = 1; // uint64 value = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
...@@ -1336,7 +1340,8 @@ bool Int32Value::MergePartialFromCodedStream( ...@@ -1336,7 +1340,8 @@ bool Int32Value::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// int32 value = 1; // int32 value = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
...@@ -1593,7 +1598,8 @@ bool UInt32Value::MergePartialFromCodedStream( ...@@ -1593,7 +1598,8 @@ bool UInt32Value::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// uint32 value = 1; // uint32 value = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
...@@ -1850,7 +1856,8 @@ bool BoolValue::MergePartialFromCodedStream( ...@@ -1850,7 +1856,8 @@ bool BoolValue::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// bool value = 1; // bool value = 1;
case 1: { case 1: {
if (tag == 8u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(8u)) {
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
...@@ -2110,7 +2117,8 @@ bool StringValue::MergePartialFromCodedStream( ...@@ -2110,7 +2117,8 @@ bool StringValue::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// string value = 1; // string value = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->mutable_value())); input, this->mutable_value()));
DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
...@@ -2437,7 +2445,8 @@ bool BytesValue::MergePartialFromCodedStream( ...@@ -2437,7 +2445,8 @@ bool BytesValue::MergePartialFromCodedStream(
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
// bytes value = 1; // bytes value = 1;
case 1: { case 1: {
if (tag == 10u) { if (static_cast<::google::protobuf::uint8>(tag) ==
static_cast<::google::protobuf::uint8>(10u)) {
DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
input, this->mutable_value())); input, this->mutable_value()));
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment