From f9174079bac9fc2aaa980bcbf1f6649378fad586 Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Mon, 15 May 2023 17:54:07 -0700 Subject: [PATCH] Incremental migration of message.cc to Emit PiperOrigin-RevId: 532282926 --- src/google/protobuf/compiler/cpp/message.cc | 15 ++++++------ src/google/protobuf/descriptor.pb.cc | 27 +++++++-------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc index 301ddf379b..9f606e2704 100644 --- a/src/google/protobuf/compiler/cpp/message.cc +++ b/src/google/protobuf/compiler/cpp/message.cc @@ -3674,14 +3674,13 @@ void MessageGenerator::GenerateSerializeOneField(io::Printer* p, void MessageGenerator::GenerateSerializeOneExtensionRange(io::Printer* p, int start, int end) { - absl::flat_hash_map vars = variables_; - vars["start"] = absl::StrCat(start); - vars["end"] = absl::StrCat(end); - Formatter format(p, vars); - format("// Extension range [$start$, $end$)\n"); - format( - "target = $extensions$._InternalSerialize(\n" - "internal_default_instance(), $start$, $end$, target, stream);\n\n"); + auto v = p->WithVars(variables_); + p->Emit({{"start", start}, {"end", end}}, + R"cc( + // Extension range [$start$, $end$) + target = $extensions$._InternalSerialize( + internal_default_instance(), $start$, $end$, target, stream); + )cc"); } void MessageGenerator::GenerateSerializeWithCachedSizesToArray(io::Printer* p) { diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 045d7eba7b..36b0eea961 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -4344,8 +4344,7 @@ constexpr ::_pbi::TcParseTable<1, 3, 3, 0, 7> ExtensionRangeOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -7532,8 +7531,7 @@ constexpr ::_pbi::TcParseTable<5, 21, 2, 202, 12> FileOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -8043,8 +8041,7 @@ constexpr ::_pbi::TcParseTable<3, 6, 1, 0, 7> MessageOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -8510,8 +8507,7 @@ constexpr ::_pbi::TcParseTable<4, 12, 6, 0, 7> FieldOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -8819,8 +8815,7 @@ constexpr ::_pbi::TcParseTable<0, 1, 1, 0, 7> OneofOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -9081,8 +9076,7 @@ constexpr ::_pbi::TcParseTable<3, 4, 1, 0, 7> EnumOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -9339,8 +9333,7 @@ constexpr ::_pbi::TcParseTable<2, 2, 1, 0, 7> EnumValueOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -9571,8 +9564,7 @@ constexpr ::_pbi::TcParseTable<2, 2, 1, 0, 12> ServiceOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( @@ -9828,8 +9820,7 @@ constexpr ::_pbi::TcParseTable<2, 3, 2, 0, 12> MethodOptions::_table_ = { // Extension range [1000, 536870912) target = _impl_._extensions_._InternalSerialize( - internal_default_instance(), 1000, 536870912, target, stream); - + internal_default_instance(), 1000, 536870912, target, stream); if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(