Index: third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc |
index 178bbe19004633f45b4fda820df455dc3e85c8a4..e42ec2801fcb269a5f3de1d7d336549cdf4af8eb 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc |
@@ -75,12 +75,7 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor, |
"" : ("= " + ImmutableDefaultValue(descriptor, name_resolver)); |
(*variables)["capitalized_type"] = |
GetCapitalizedType(descriptor, /* immutable = */ true); |
- if (descriptor->is_packed()) { |
- (*variables)["tag"] = SimpleItoa(WireFormatLite::MakeTag( |
- descriptor->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED)); |
- } else { |
- (*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor)); |
- } |
+ (*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor)); |
(*variables)["tag_size"] = SimpleItoa( |
WireFormat::TagSize(descriptor->number(), GetType(descriptor))); |
if (IsReferenceType(GetJavaType(descriptor))) { |
@@ -99,8 +94,7 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor, |
if (fixed_size != -1) { |
(*variables)["fixed_size"] = SimpleItoa(fixed_size); |
} |
- (*variables)["on_changed"] = |
- HasDescriptorMethods(descriptor->containing_type()) ? "onChanged();" : ""; |
+ (*variables)["on_changed"] = "onChanged();"; |
if (SupportFieldPresence(descriptor->file())) { |
// For singular messages and builders, one bit is used for the hasField bit. |
@@ -606,7 +600,7 @@ GenerateMembers(io::Printer* printer) const { |
"}\n"); |
if (descriptor_->is_packed() && |
- HasGeneratedMethods(descriptor_->containing_type())) { |
+ context_->HasGeneratedMethods(descriptor_->containing_type())) { |
printer->Print(variables_, |
"private int $name$MemoizedSerializedSize = -1;\n"); |
} |