diff options
| author |  Max Cai <maxtroy@google.com> | 2013-10-11 16:41:41 +0100 |
|---|---|---|
| committer | Max Cai <maxtroy@google.com> | 2013-10-11 16:44:40 +0100 |
| commit | 0652d7017400e5a09fa3d6702de7e5b8980843a4 (patch) | |
| tree | 11115e24bff2bc7d93f8eb7908b299044fd0bf10 /src/google/protobuf/compiler/javanano/javanano_message_field.cc | |
| parent | 3289fe1a86f311756923afeda88db0108228927a (diff) | |
Remove all field initializers and let ctor call clear().
The field initializers have basically caused the compiled <init> method
to inline the whole clear() method, which means if ProGuard is not used
or failed to inline or remove clear(), there are two big chunks of code
that do the same thing. So why not just call clear() from the ctor.
Change-Id: Ief71e2b03db2e059b3bfa98309649368089ffab0
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message_field.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc index 02dbdb17..277eb4e1 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc @@ -84,7 +84,7 @@ MessageFieldGenerator::~MessageFieldGenerator() {} void MessageFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "public $type$ $name$ = null;\n"); + "public $type$ $name$;\n"); } void MessageFieldGenerator:: @@ -144,7 +144,7 @@ AccessorMessageFieldGenerator::~AccessorMessageFieldGenerator() {} void AccessorMessageFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "private $type$ $name$_ = null;\n" + "private $type$ $name$_;\n" "public $type$ get$capitalized_name$() {\n" " return $name$_;\n" "}\n" @@ -218,7 +218,7 @@ RepeatedMessageFieldGenerator::~RepeatedMessageFieldGenerator() {} void RepeatedMessageFieldGenerator:: GenerateMembers(io::Printer* printer) const { printer->Print(variables_, - "public $type$[] $name$ = $type$.EMPTY_ARRAY;\n"); + "public $type$[] $name$;\n"); } void RepeatedMessageFieldGenerator:: @@ -231,7 +231,8 @@ void RepeatedMessageFieldGenerator:: GenerateMergingCode(io::Printer* printer) const { // First, figure out the length of the array, then parse. printer->Print(variables_, - "int arrayLength = com.google.protobuf.nano.WireFormatNano.getRepeatedFieldArrayLength(input, $tag$);\n" + "int arrayLength = com.google.protobuf.nano.WireFormatNano" + " .getRepeatedFieldArrayLength(input, $tag$);\n" "int i = this.$name$.length;\n" "$type$[] newArray = new $type$[i + arrayLength];\n" "System.arraycopy(this.$name$, 0, newArray, 0, i);\n" |