diff options
| author | Max Cai <maxtroy@google.com> | 2013-10-09 13:36:23 +0100 |
|---|---|---|
| committer | Max Cai <maxtroy@google.com> | 2013-12-10 16:46:22 +0000 |
| commit | 5cc242074f189837b38e7768b57ccfb0bca258df (patch) | |
| tree | 186c81cc5282eb6ae8056ad478692e3a24188e33 /src/google/protobuf/compiler/javanano/javanano_message_field.cc | |
| parent | cea499acf68b35921b956785c26c0e6f18c241c1 (diff) | |
| download | external_protobuf-5cc242074f189837b38e7768b57ccfb0bca258df.zip external_protobuf-5cc242074f189837b38e7768b57ccfb0bca258df.tar.gz external_protobuf-5cc242074f189837b38e7768b57ccfb0bca258df.tar.bz2 | |
Avoid class initializers to help ProGuard.
Class initializers prevent ProGuard from inlining any methods
because it thinks the class initializer may have side effects.
This is true for static methods, but instance methods can still
be inlined, because to have an instance you will have touched
the class and any class initializers would have run. But
ProGuard only starts inlining instance methods of classes with
class initializers from v4.11b6, and Android uses v4.4 now.
This change tries to avoid the class initializers as much as
possible, by delaying the initialization of the empty array and
some fields' saved defaults until when they're needed. However,
if the message hosts any extensions, they must be public static
final and therefore introducing the class initializer. In that
case we won't bother with lazy initialization.
Change-Id: I00d8296f6eb0023112b93ee135cdb28dbd52b0b8
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message_field.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc index 74d3f85..a46081d 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc @@ -82,7 +82,7 @@ MessageFieldGenerator(const FieldDescriptor* descriptor, const Params& params) MessageFieldGenerator::~MessageFieldGenerator() {} void MessageFieldGenerator:: -GenerateMembers(io::Printer* printer) const { +GenerateMembers(io::Printer* printer, bool /* unused lazy_init */) const { printer->Print(variables_, "public $type$ $name$;\n"); } @@ -158,7 +158,7 @@ RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor, const Params& p RepeatedMessageFieldGenerator::~RepeatedMessageFieldGenerator() {} void RepeatedMessageFieldGenerator:: -GenerateMembers(io::Printer* printer) const { +GenerateMembers(io::Printer* printer, bool /* unused lazy_init */) const { printer->Print(variables_, "public $type$[] $name$;\n"); } @@ -166,7 +166,7 @@ GenerateMembers(io::Printer* printer) const { void RepeatedMessageFieldGenerator:: GenerateClearCode(io::Printer* printer) const { printer->Print(variables_, - "$name$ = $type$.EMPTY_ARRAY;\n"); + "$name$ = $type$.emptyArray();\n"); } void RepeatedMessageFieldGenerator:: |