diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-06-18 15:00:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 15:00:06 -0700 |
| commit | 8af87de949dda877390288ebcdada8c708c4ff8c (patch) | |
| tree | 24be4771f3e108fb9889c0f9d6dcb0ffae3eccd8 /src/google/protobuf/compiler/java/java_primitive_field.cc | |
| parent | e264d6bc581481094829478e5d4547dcef35e70e (diff) | |
| parent | aba6f7ef6703d72eda3d063dc2e6566d84f080a5 (diff) | |
| download | protobuf-8af87de949dda877390288ebcdada8c708c4ff8c.tar.gz protobuf-8af87de949dda877390288ebcdada8c708c4ff8c.tar.bz2 protobuf-8af87de949dda877390288ebcdada8c708c4ff8c.zip | |
Merge pull request #2121 from mazurkin/issue-2108
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 71ee0992..e6ce69c7 100644 --- a/src/google/protobuf/compiler/java/java_primitive_field.cc +++ b/src/google/protobuf/compiler/java/java_primitive_field.cc @@ -264,7 +264,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:: @@ -294,11 +296,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:: |