AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #2810 from xfxyjwf/i1994

Browse Source 
Avoid redundant type casts for oneof bytes fields.
This commit is contained in:
Feng Xiao 2017-03-09 13:57:34 -08:00 committed by GitHub
commit 8e465dcf46
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/google/protobuf/compiler/java/java_primitive_field.cc
View File

@ -523,8 +523,17 @@ void ImmutablePrimitiveOneofFieldGenerator::
GenerateSerializationCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($has_oneof_case_message$) {\n"
" output.write$capitalized_type$(\n"
" $number$, ($type$)(($boxed_type$) $oneof_name$_));\n"
" output.write$capitalized_type$(\n");
// $type$ and $boxed_type$ is the same for bytes fields so we don't need to
// do redundant casts.
if (GetJavaType(descriptor_) == JAVATYPE_BYTES) {
printer->Print(variables_,
" $number$, ($type$) $oneof_name$_);\n");
} else {
printer->Print(variables_,
" $number$, ($type$)(($boxed_type$) $oneof_name$_));\n");
}
printer->Print(
"}\n");
}
@ -533,8 +542,17 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
printer->Print(variables_,
"if ($has_oneof_case_message$) {\n"
" size += com.google.protobuf.CodedOutputStream\n"
" .compute$capitalized_type$Size(\n"
" $number$, ($type$)(($boxed_type$) $oneof_name$_));\n"
" .compute$capitalized_type$Size(\n");
// $type$ and $boxed_type$ is the same for bytes fields so we don't need to
// do redundant casts.
if (GetJavaType(descriptor_) == JAVATYPE_BYTES) {
printer->Print(variables_,
" $number$, ($type$) $oneof_name$_);\n");
} else {
printer->Print(variables_,
" $number$, ($type$)(($boxed_type$) $oneof_name$_));\n");
}
printer->Print(
"}\n");
}