Migrate remaining old-style $tag_size$ substitutions to $kTagBytes$ in field generators.

PiperOrigin-RevId: 908608483

Author: ClaytonKnittel

src/google/protobuf/compiler/cpp/field.cc

@@ -85,7 +85,6 @@ std::vector<Sub> FieldVars(const FieldDescriptor* field, const Options& opts) {
       // Old-style names.
       {"classname", ClassName(FieldScope(field), false)},
       {"ns", Namespace(field)},
-      {"tag_size", WireFormat::TagSize(field->number(), field->type())},
       {"deprecated_attr", DeprecatedAttribute(opts, field)},
       Sub("WeakDescriptorSelfPin",
           UsingImplicitWeakDescriptor(field->file(), opts)

src/google/protobuf/compiler/cpp/field_generators/cord_field.cc

@@ -287,8 +287,8 @@ void CordFieldGenerator::GenerateSerializeWithCachedSizesToArray(
 void CordFieldGenerator::GenerateByteSize(io::Printer* p) const {
   auto v = p->WithVars(variables_);
   p->Emit(R"cc(
-    total_size += $tag_size$ + $pbi$::WireFormatLite::$DeclaredType$Size(
-                                   this_._internal_$name$());
+    total_size += $kTagBytes$ + $pbi$::WireFormatLite::$DeclaredType$Size(
+                                    this_._internal_$name$());
   )cc");
 }
 

src/google/protobuf/compiler/cpp/field_generators/message_field.cc

@@ -407,8 +407,8 @@ void SingularMessage::GenerateSerializeWithCachedSizesToArray(
 
 void SingularMessage::GenerateByteSize(io::Printer* p) const {
   p->Emit(R"cc(
-    total_size +=
-        $tag_size$ + $pbi$::WireFormatLite::$DeclaredType$Size(*this_.$field_$);
+    total_size += $kTagBytes$ +
+                  $pbi$::WireFormatLite::$DeclaredType$Size(*this_.$field_$);
   )cc");
 }
 
@@ -1070,7 +1070,7 @@ void RepeatedMessage::GenerateSerializeWithCachedSizesToArray(
 void RepeatedMessage::GenerateByteSize(io::Printer* p) const {
   p->Emit(
       R"cc(
-        total_size += $tag_size$UL * this_._internal_$name$_size();
+        total_size += $kTagBytes$UL * this_._internal_$name$_size();
         for (const auto& msg : this_._internal$_weak$_$name$()) {
           total_size += $pbi$::WireFormatLite::$DeclaredType$Size(msg);
         }