diff options
| author | Nickolay Mazurkin <mazurkin@gmail.com> | 2016-09-18 10:38:18 +0300 |
|---|---|---|
| committer | Nickolay Mazurkin <mazurkin@gmail.com> | 2016-09-18 15:48:08 +0300 |
| commit | aba6f7ef6703d72eda3d063dc2e6566d84f080a5 (patch) | |
| tree | 7f49320e07120b3931b8ee59470495001b6e1a61 /src/google/protobuf/compiler/java/java_primitive_field.cc | |
| parent | c44ca26fe89ed8a81d3ee475a2ccc1797141dbce (diff) | |
| download | protobuf-aba6f7ef6703d72eda3d063dc2e6566d84f080a5.tar.gz protobuf-aba6f7ef6703d72eda3d063dc2e6566d84f080a5.tar.bz2 protobuf-aba6f7ef6703d72eda3d063dc2e6566d84f080a5.zip | |
[issue-2108] [protoc/java] Excessive copying on buildPartial()
Diffstat (limited to 'src/google/protobuf/compiler/java/java_primitive_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_primitive_field.cc | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/java/java_primitive_field.cc b/src/google/protobuf/compiler/java/java_primitive_field.cc index 877baf0a..d5bc3652 100644 --- a/src/google/protobuf/compiler/java/java_primitive_field.cc +++ b/src/google/protobuf/compiler/java/java_primitive_field.cc @@ -257,7 +257,9 @@ GenerateFieldBuilderInitializationCode(io::Printer* printer) const { void ImmutablePrimitiveFieldGenerator:: GenerateInitializationCode(io::Printer* printer) const { - printer->Print(variables_, "$name$_ = $default$;\n"); + if (!IsDefaultValueJavaDefault(descriptor_)) { + printer->Print(variables_, "$name$_ = $default$;\n"); + } } void ImmutablePrimitiveFieldGenerator:: @@ -287,11 +289,21 @@ GenerateBuildingCode(io::Printer* printer) const { if (SupportFieldPresence(descriptor_->file())) { printer->Print(variables_, "if ($get_has_field_bit_from_local$) {\n" - " $set_has_field_bit_to_local$;\n" - "}\n"); + " result.$name$_ = $name$_;\n" + " $set_has_field_bit_to_local$;\n"); + if (IsDefaultValueJavaDefault(descriptor_)) { + printer->Print(variables_, + "}\n"); + } else { + printer->Print(variables_, + "} else {\n" + " result.$name$_ = $default$;\n" + "}\n"); + } + } else { + printer->Print(variables_, + "result.$name$_ = $name$_;\n"); } - printer->Print(variables_, - "result.$name$_ = $name$_;\n"); } void ImmutablePrimitiveFieldGenerator:: |