third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.cc - Issue 1291903002: Pull new version of protobuf sources.

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.cc

Issue 1291903002: Pull new version of protobuf sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Build fix attempts Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.h ('k') | third_party/protobuf/src/google/protobuf/compiler/javanano/javanano_enum.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.cc

similarity index 50%

copy from third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

copy to third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.cc

index 4815663b1db3848e1be682d3c97b8f1bd1df64d9..51bb245c493ea055690e892978b1f8e96c1a486b 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.cc

@@ -1,6 +1,6 @@

// Protocol Buffers - Google's data interchange format

-// http://code.google.com/p/protobuf/

+// https://developers.google.com/protocol-buffers/

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

@@ -36,10 +36,12 @@

#include <map>

#include <string>

-#include <google/protobuf/compiler/java/java_string_field.h>

-#include <google/protobuf/compiler/java/java_doc_comment.h>

#include <google/protobuf/stubs/common.h>

+#include <google/protobuf/compiler/java/java_context.h>

+#include <google/protobuf/compiler/java/java_doc_comment.h>

#include <google/protobuf/compiler/java/java_helpers.h>

+#include <google/protobuf/compiler/java/java_name_resolver.h>

+#include <google/protobuf/compiler/java/java_string_field_lite.h>

#include <google/protobuf/io/printer.h>

#include <google/protobuf/wire_format.h>

#include <google/protobuf/stubs/strutil.h>

@@ -57,17 +59,16 @@ namespace {

void SetPrimitiveVariables(const FieldDescriptor* descriptor,

int messageBitIndex,

int builderBitIndex,

+ const FieldGeneratorInfo* info,

+ ClassNameResolver* name_resolver,

map<string, string>* variables) {

- (*variables)["name"] =

- UnderscoresToCamelCase(descriptor);

- (*variables)["capitalized_name"] =

- UnderscoresToCapitalizedCamelCase(descriptor);

- (*variables)["constant_name"] = FieldConstantName(descriptor);

- (*variables)["number"] = SimpleItoa(descriptor->number());

- (*variables)["empty_list"] = "com.google.protobuf.LazyStringArrayList.EMPTY";

- (*variables)["default"] = DefaultValue(descriptor);

- (*variables)["default_init"] = ("= " + DefaultValue(descriptor));

+ SetCommonFieldVariables(descriptor, info, variables);

+ (*variables)["empty_list"] = "emptyLazyStringArrayList()";

+ (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);

+ (*variables)["default_init"] =

+ "= " + ImmutableDefaultValue(descriptor, name_resolver);

(*variables)["capitalized_type"] = "String";

(*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor));

(*variables)["tag_size"] = SimpleItoa(

@@ -84,26 +85,27 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,

(*variables)["on_changed"] =

HasDescriptorMethods(descriptor->containing_type()) ? "onChanged();" : "";

- // For singular messages and builders, one bit is used for the hasField bit.

- (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);

- (*variables)["set_has_field_bit_message"] = GenerateSetBit(messageBitIndex);

+ if (SupportFieldPresence(descriptor->file())) {

+ // For singular messages and builders, one bit is used for the hasField bit.

+ (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);

+ // Note that these have a trailing ";".

+ (*variables)["set_has_field_bit_message"] =

+ GenerateSetBit(messageBitIndex) + ";";

+ (*variables)["clear_has_field_bit_message"] =

+ GenerateClearBit(messageBitIndex) + ";";

- (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);

- (*variables)["set_has_field_bit_builder"] = GenerateSetBit(builderBitIndex);

- (*variables)["clear_has_field_bit_builder"] =

- GenerateClearBit(builderBitIndex);

+ (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);

+ } else {

+ (*variables)["set_has_field_bit_message"] = "";

+ (*variables)["clear_has_field_bit_message"] = "";

- // For repated builders, one bit is used for whether the array is immutable.

- (*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);

- (*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);

- (*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);

+ (*variables)["is_field_present_message"] =

+ "!get" + (*variables)["capitalized_name"] + "Bytes().isEmpty()";

+ }

- // For repeated fields, one bit is used for whether the array is immutable

- // in the parsing constructor.

- (*variables)["get_mutable_bit_parser"] =

- GenerateGetBitMutableLocal(builderBitIndex);

- (*variables)["set_mutable_bit_parser"] =

- GenerateSetBitMutableLocal(builderBitIndex);

+ // For repeated builders, the underlying list tracks mutability state.

+ (*variables)["is_mutable"] = (*variables)["name"] + "_.isModifiable()";

(*variables)["get_has_field_bit_from_local"] =

GenerateGetBitFromLocal(builderBitIndex);

@@ -111,28 +113,35 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,

GenerateSetBitToLocal(messageBitIndex);

}

+bool CheckUtf8(const FieldDescriptor* descriptor) {

+ return descriptor->file()->options().java_string_check_utf8();

} // namespace

// ===================================================================

-StringFieldGenerator::

-StringFieldGenerator(const FieldDescriptor* descriptor,

- int messageBitIndex,

- int builderBitIndex)

+ImmutableStringFieldLiteGenerator::

+ImmutableStringFieldLiteGenerator(const FieldDescriptor* descriptor,

+ int messageBitIndex,

+ int builderBitIndex,

+ Context* context)

: descriptor_(descriptor), messageBitIndex_(messageBitIndex),

- builderBitIndex_(builderBitIndex) {

+ builderBitIndex_(builderBitIndex), context_(context),

+ name_resolver_(context->GetNameResolver()) {

SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,

- &variables_);

+ context->GetFieldGeneratorInfo(descriptor),

+ name_resolver_, &variables_);

}

-StringFieldGenerator::~StringFieldGenerator() {}

+ImmutableStringFieldLiteGenerator::~ImmutableStringFieldLiteGenerator() {}

-int StringFieldGenerator::GetNumBitsForMessage() const {

+int ImmutableStringFieldLiteGenerator::GetNumBitsForMessage() const {

return 1;

}

-int StringFieldGenerator::GetNumBitsForBuilder() const {

- return 1;

+int ImmutableStringFieldLiteGenerator::GetNumBitsForBuilder() const {

+ return 0;

}

// A note about how strings are handled. This code used to just store a String

@@ -167,11 +176,13 @@ int StringFieldGenerator::GetNumBitsForBuilder() const {

// For single fields, the logic for this is done inside the generated code. For

// repeated fields, the logic is done in LazyStringArrayList and

// UnmodifiableLazyStringList.

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateInterfaceMembers(io::Printer* printer) const {

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$boolean has$capitalized_name$();\n");

+ if (SupportFieldPresence(descriptor_->file())) {

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$boolean has$capitalized_name$();\n");

+ }

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$java.lang.String get$capitalized_name$();\n");

@@ -181,15 +192,19 @@ GenerateInterfaceMembers(io::Printer* printer) const {

" get$capitalized_name$Bytes();\n");

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateMembers(io::Printer* printer) const {

printer->Print(variables_,

"private java.lang.Object $name$_;\n");

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public boolean has$capitalized_name$() {\n"

- " return $get_has_field_bit_message$;\n"

- "}\n");

+ PrintExtraFieldInfo(variables_, printer);

+ if (SupportFieldPresence(descriptor_->file())) {

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public boolean has$capitalized_name$() {\n"

+ " return $get_has_field_bit_message$;\n"

+ "}\n");

+ }

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

@@ -200,10 +215,17 @@ GenerateMembers(io::Printer* printer) const {

" } else {\n"

" com.google.protobuf.ByteString bs = \n"

" (com.google.protobuf.ByteString) ref;\n"

- " java.lang.String s = bs.toStringUtf8();\n"

- " if (bs.isValidUtf8()) {\n"

- " $name$_ = s;\n"

- " }\n"

+ " java.lang.String s = bs.toStringUtf8();\n");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ " $name$_ = s;\n");

+ } else {

+ printer->Print(variables_,

+ " if (bs.isValidUtf8()) {\n"

+ " $name$_ = s;\n"

+ " }\n");

+ }

+ printer->Print(variables_,

" return s;\n"

" }\n"

"}\n");

@@ -222,68 +244,75 @@ GenerateMembers(io::Printer* printer) const {

" return (com.google.protobuf.ByteString) ref;\n"

" }\n"

"}\n");

-void StringFieldGenerator::

-GenerateBuilderMembers(io::Printer* printer) const {

+ WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "private java.lang.Object $name$_ $default_init$;\n");

+ "private void set$capitalized_name$(\n"

+ " java.lang.String value) {\n"

+ "$null_check$"

+ " $set_has_field_bit_message$\n"

+ " $name$_ = value;\n"

+ "}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$public boolean has$capitalized_name$() {\n"

- " return $get_has_field_bit_builder$;\n"

+ "private void clear$capitalized_name$() {\n"

+ " $clear_has_field_bit_message$\n"

+ // The default value is not a simple literal so we want to avoid executing

+ // it multiple times. Instead, get the default out of the default instance.

+ " $name$_ = getDefaultInstance().get$capitalized_name$();\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

+ "private void set$capitalized_name$Bytes(\n"

+ " com.google.protobuf.ByteString value) {\n"

+ "$null_check$");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ " checkByteStringIsUtf8(value);\n");

+ }

+ printer->Print(variables_,

+ " $set_has_field_bit_message$\n"

+ " $name$_ = value;\n"

+ "}\n");

+void ImmutableStringFieldLiteGenerator::

+GenerateBuilderMembers(io::Printer* printer) const {

+ if (SupportFieldPresence(descriptor_->file())) {

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public boolean has$capitalized_name$() {\n"

+ " return instance.has$capitalized_name$();\n"

+ "}\n");

+ }

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

"$deprecation$public java.lang.String get$capitalized_name$() {\n"

- " java.lang.Object ref = $name$_;\n"

- " if (!(ref instanceof java.lang.String)) {\n"

- " java.lang.String s = ((com.google.protobuf.ByteString) ref)\n"

- " .toStringUtf8();\n"

- " $name$_ = s;\n"

- " return s;\n"

- " } else {\n"

- " return (java.lang.String) ref;\n"

- " }\n"

+ " return instance.get$capitalized_name$();\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public com.google.protobuf.ByteString\n"

" get$capitalized_name$Bytes() {\n"

- " java.lang.Object ref = $name$_;\n"

- " if (ref instanceof String) {\n"

- " com.google.protobuf.ByteString b = \n"

- " com.google.protobuf.ByteString.copyFromUtf8(\n"

- " (java.lang.String) ref);\n"

- " $name$_ = b;\n"

- " return b;\n"

- " } else {\n"

- " return (com.google.protobuf.ByteString) ref;\n"

- " }\n"

+ " return instance.get$capitalized_name$Bytes();\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder set$capitalized_name$(\n"

" java.lang.String value) {\n"

- "$null_check$"

- " $set_has_field_bit_builder$;\n"

- " $name$_ = value;\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.set$capitalized_name$(value);\n"

" return this;\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder clear$capitalized_name$() {\n"

- " $clear_has_field_bit_builder$;\n");

- // The default value is not a simple literal so we want to avoid executing

- // it multiple times. Instead, get the default out of the default instance.

- printer->Print(variables_,

- " $name$_ = getDefaultInstance().get$capitalized_name$();\n");

- printer->Print(variables_,

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.clear$capitalized_name$();\n"

" return this;\n"

"}\n");

@@ -291,89 +320,101 @@ GenerateBuilderMembers(io::Printer* printer) const {

printer->Print(variables_,

"$deprecation$public Builder set$capitalized_name$Bytes(\n"

" com.google.protobuf.ByteString value) {\n"

- "$null_check$"

- " $set_has_field_bit_builder$;\n"

- " $name$_ = value;\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.set$capitalized_name$Bytes(value);\n"

" return this;\n"

"}\n");

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateFieldBuilderInitializationCode(io::Printer* printer) const {

- // noop for primitives

+ // noop for strings

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateInitializationCode(io::Printer* printer) const {

printer->Print(variables_, "$name$_ = $default$;\n");

}

-void StringFieldGenerator::

-GenerateBuilderClearCode(io::Printer* printer) const {

- printer->Print(variables_,

- "$name$_ = $default$;\n"

- "$clear_has_field_bit_builder$;\n");

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateMergingCode(io::Printer* printer) const {

- // Allow a slight breach of abstraction here in order to avoid forcing

- // all string fields to Strings when copying fields from a Message.

- printer->Print(variables_,

- "if (other.has$capitalized_name$()) {\n"

- " $set_has_field_bit_builder$;\n"

- " $name$_ = other.$name$_;\n"

- " $on_changed$\n"

- "}\n");

+ if (SupportFieldPresence(descriptor_->file())) {

+ // Allow a slight breach of abstraction here in order to avoid forcing

+ // all string fields to Strings when copying fields from a Message.

+ printer->Print(variables_,

+ "if (other.has$capitalized_name$()) {\n"

+ " $set_has_field_bit_message$\n"

+ " $name$_ = other.$name$_;\n"

+ " $on_changed$\n"

+ "}\n");

+ } else {

+ printer->Print(variables_,

+ "if (!other.get$capitalized_name$().isEmpty()) {\n"

+ " $name$_ = other.$name$_;\n"

+ " $on_changed$\n"

+ "}\n");

+ }

}

-void StringFieldGenerator::

-GenerateBuildingCode(io::Printer* printer) const {

- printer->Print(variables_,

- "if ($get_has_field_bit_from_local$) {\n"

- " $set_has_field_bit_to_local$;\n"

- "}\n"

- "result.$name$_ = $name$_;\n");

+void ImmutableStringFieldLiteGenerator::

+GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const {

+ // noop for scalars

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateParsingCode(io::Printer* printer) const {

- printer->Print(variables_,

- "$set_has_field_bit_message$;\n"

- "$name$_ = input.readBytes();\n");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ "String s = input.readStringRequireUtf8();\n"

+ "$set_has_field_bit_message$\n"

+ "$name$_ = s;\n");

+ } else if (!HasDescriptorMethods(descriptor_->file())) {

+ // Lite runtime should attempt to reduce allocations by attempting to

+ // construct the string directly from the input stream buffer. This avoids

+ // spurious intermediary ByteString allocations, cutting overall allocations

+ // in half.

+ printer->Print(variables_,

+ "String s = input.readString();\n"

+ "$set_has_field_bit_message$\n"

+ "$name$_ = s;\n");

+ } else {

+ printer->Print(variables_,

+ "com.google.protobuf.ByteString bs = input.readBytes();\n"

+ "$set_has_field_bit_message$\n"

+ "$name$_ = bs;\n");

+ }

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateParsingDoneCode(io::Printer* printer) const {

- // noop for strings.

+ // noop for strings

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateSerializationCode(io::Printer* printer) const {

printer->Print(variables_,

- "if ($get_has_field_bit_message$) {\n"

+ "if ($is_field_present_message$) {\n"

" output.writeBytes($number$, get$capitalized_name$Bytes());\n"

"}\n");

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateSerializedSizeCode(io::Printer* printer) const {

printer->Print(variables_,

- "if ($get_has_field_bit_message$) {\n"

+ "if ($is_field_present_message$) {\n"

" size += com.google.protobuf.CodedOutputStream\n"

" .computeBytesSize($number$, get$capitalized_name$Bytes());\n"

"}\n");

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateEqualsCode(io::Printer* printer) const {

printer->Print(variables_,

"result = result && get$capitalized_name$()\n"

" .equals(other.get$capitalized_name$());\n");

}

-void StringFieldGenerator::

+void ImmutableStringFieldLiteGenerator::

GenerateHashCode(io::Printer* printer) const {

printer->Print(variables_,

"hash = (37 * hash) + $constant_name$;\n");

@@ -381,39 +422,253 @@ GenerateHashCode(io::Printer* printer) const {

"hash = (53 * hash) + get$capitalized_name$().hashCode();\n");

}

-string StringFieldGenerator::GetBoxedType() const {

+string ImmutableStringFieldLiteGenerator::GetBoxedType() const {

return "java.lang.String";

}

+// ===================================================================

+ImmutableStringOneofFieldLiteGenerator::

+ImmutableStringOneofFieldLiteGenerator(const FieldDescriptor* descriptor,

+ int messageBitIndex,

+ int builderBitIndex,

+ Context* context)

+ : ImmutableStringFieldLiteGenerator(

+ descriptor, messageBitIndex, builderBitIndex, context) {

+ const OneofGeneratorInfo* info =

+ context->GetOneofGeneratorInfo(descriptor->containing_oneof());

+ SetCommonOneofVariables(descriptor, info, &variables_);

+ImmutableStringOneofFieldLiteGenerator::

+~ImmutableStringOneofFieldLiteGenerator() {}

+void ImmutableStringOneofFieldLiteGenerator::

+GenerateMembers(io::Printer* printer) const {

+ PrintExtraFieldInfo(variables_, printer);

+ if (SupportFieldPresence(descriptor_->file())) {

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public boolean has$capitalized_name$() {\n"

+ " return $has_oneof_case_message$;\n"

+ "}\n");

+ }

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public java.lang.String get$capitalized_name$() {\n"

+ " java.lang.Object ref $default_init$;\n"

+ " if ($has_oneof_case_message$) {\n"

+ " ref = $oneof_name$_;\n"

+ " }\n"

+ " if (ref instanceof java.lang.String) {\n"

+ " return (java.lang.String) ref;\n"

+ " } else {\n"

+ " com.google.protobuf.ByteString bs = \n"

+ " (com.google.protobuf.ByteString) ref;\n"

+ " java.lang.String s = bs.toStringUtf8();\n");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ " if ($has_oneof_case_message$) {\n"

+ " $oneof_name$_ = s;\n"

+ " }\n");

+ } else {

+ printer->Print(variables_,

+ " if (bs.isValidUtf8() && ($has_oneof_case_message$)) {\n"

+ " $oneof_name$_ = s;\n"

+ " }\n");

+ }

+ printer->Print(variables_,

+ " return s;\n"

+ " }\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public com.google.protobuf.ByteString\n"

+ " get$capitalized_name$Bytes() {\n"

+ " java.lang.Object ref $default_init$;\n"

+ " if ($has_oneof_case_message$) {\n"

+ " ref = $oneof_name$_;\n"

+ " }\n"

+ " if (ref instanceof java.lang.String) {\n"

+ " com.google.protobuf.ByteString b = \n"

+ " com.google.protobuf.ByteString.copyFromUtf8(\n"

+ " (java.lang.String) ref);\n"

+ " if ($has_oneof_case_message$) {\n"

+ " $oneof_name$_ = b;\n"

+ " }\n"

+ " return b;\n"

+ " } else {\n"

+ " return (com.google.protobuf.ByteString) ref;\n"

+ " }\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void set$capitalized_name$(\n"

+ " java.lang.String value) {\n"

+ "$null_check$"

+ " $set_oneof_case_message$;\n"

+ " $oneof_name$_ = value;\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void clear$capitalized_name$() {\n"

+ " if ($has_oneof_case_message$) {\n"

+ " $clear_oneof_case_message$;\n"

+ " $oneof_name$_ = null;\n"

+ " }\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void set$capitalized_name$Bytes(\n"

+ " com.google.protobuf.ByteString value) {\n"

+ "$null_check$");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ " checkByteStringIsUtf8(value);\n");

+ }

+ printer->Print(variables_,

+ " $set_oneof_case_message$;\n"

+ " $oneof_name$_ = value;\n"

+ "}\n");

+void ImmutableStringOneofFieldLiteGenerator::

+GenerateBuilderMembers(io::Printer* printer) const {

+ if (SupportFieldPresence(descriptor_->file())) {

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public boolean has$capitalized_name$() {\n"

+ " return instance.has$capitalized_name$();\n"

+ "}\n");

+ }

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public java.lang.String get$capitalized_name$() {\n"

+ " return instance.get$capitalized_name$();\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public com.google.protobuf.ByteString\n"

+ " get$capitalized_name$Bytes() {\n"

+ " return instance.get$capitalized_name$Bytes();\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public Builder set$capitalized_name$(\n"

+ " java.lang.String value) {\n"

+ " copyOnWrite();\n"

+ " instance.set$capitalized_name$(value);\n"

+ " return this;\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public Builder clear$capitalized_name$() {\n"

+ " copyOnWrite();\n"

+ " instance.clear$capitalized_name$();\n"

+ " return this;\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public Builder set$capitalized_name$Bytes(\n"

+ " com.google.protobuf.ByteString value) {\n"

+ " copyOnWrite();\n"

+ " instance.set$capitalized_name$Bytes(value);\n"

+ " return this;\n"

+ "}\n");

+void ImmutableStringOneofFieldLiteGenerator::

+GenerateMergingCode(io::Printer* printer) const {

+ // Allow a slight breach of abstraction here in order to avoid forcing

+ // all string fields to Strings when copying fields from a Message.

+ printer->Print(variables_,

+ "$set_oneof_case_message$;\n"

+ "$oneof_name$_ = other.$oneof_name$_;\n"

+ "$on_changed$\n");

+void ImmutableStringOneofFieldLiteGenerator::

+GenerateParsingCode(io::Printer* printer) const {

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ "String s = input.readStringRequireUtf8();\n"

+ "$set_oneof_case_message$;\n"

+ "$oneof_name$_ = s;\n");

+ } else if (!HasDescriptorMethods(descriptor_->file())) {

+ // Lite runtime should attempt to reduce allocations by attempting to

+ // construct the string directly from the input stream buffer. This avoids

+ // spurious intermediary ByteString allocations, cutting overall allocations

+ // in half.

+ printer->Print(variables_,

+ "String s = input.readString();\n"

+ "$set_oneof_case_message$;\n"

+ "$oneof_name$_ = s;\n");

+ } else {

+ printer->Print(variables_,

+ "com.google.protobuf.ByteString bs = input.readBytes();\n"

+ "$set_oneof_case_message$;\n"

+ "$oneof_name$_ = bs;\n");

+ }

+void ImmutableStringOneofFieldLiteGenerator::

+GenerateSerializationCode(io::Printer* printer) const {

+ printer->Print(variables_,

+ "if ($has_oneof_case_message$) {\n"

+ " output.writeBytes($number$, get$capitalized_name$Bytes());\n"

+ "}\n");

+void ImmutableStringOneofFieldLiteGenerator::

+GenerateSerializedSizeCode(io::Printer* printer) const {

+ printer->Print(variables_,

+ "if ($has_oneof_case_message$) {\n"

+ " size += com.google.protobuf.CodedOutputStream\n"

+ " .computeBytesSize($number$, get$capitalized_name$Bytes());\n"

+ "}\n");

// ===================================================================

-RepeatedStringFieldGenerator::

-RepeatedStringFieldGenerator(const FieldDescriptor* descriptor,

- int messageBitIndex,

- int builderBitIndex)

+RepeatedImmutableStringFieldLiteGenerator::

+RepeatedImmutableStringFieldLiteGenerator(const FieldDescriptor* descriptor,

+ int messageBitIndex,

+ int builderBitIndex,

+ Context* context)

: descriptor_(descriptor), messageBitIndex_(messageBitIndex),

- builderBitIndex_(builderBitIndex) {

+ builderBitIndex_(builderBitIndex), context_(context),

+ name_resolver_(context->GetNameResolver()) {

SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,

- &variables_);

+ context->GetFieldGeneratorInfo(descriptor),

+ name_resolver_, &variables_);

}

-RepeatedStringFieldGenerator::~RepeatedStringFieldGenerator() {}

+RepeatedImmutableStringFieldLiteGenerator::

+~RepeatedImmutableStringFieldLiteGenerator() {}

-int RepeatedStringFieldGenerator::GetNumBitsForMessage() const {

+int RepeatedImmutableStringFieldLiteGenerator::GetNumBitsForMessage() const {

return 0;

}

-int RepeatedStringFieldGenerator::GetNumBitsForBuilder() const {

- return 1;

+int RepeatedImmutableStringFieldLiteGenerator::GetNumBitsForBuilder() const {

+ return 0;

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateInterfaceMembers(io::Printer* printer) const {

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$java.util.List<java.lang.String>\n"

- "get$capitalized_name$List();\n");

+ "$deprecation$com.google.protobuf.ProtocolStringList\n"

+ " get$capitalized_name$List();\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$int get$capitalized_name$Count();\n");

@@ -427,13 +682,14 @@ GenerateInterfaceMembers(io::Printer* printer) const {

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateMembers(io::Printer* printer) const {

printer->Print(variables_,

- "private com.google.protobuf.LazyStringList $name$_;\n");

+ "private com.google.protobuf.LazyStringArrayList $name$_;\n");

+ PrintExtraFieldInfo(variables_, printer);

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$public java.util.List<java.lang.String>\n"

+ "$deprecation$public com.google.protobuf.ProtocolStringList\n"

" get$capitalized_name$List() {\n"

" return $name$_;\n" // note: unmodifiable list

"}\n");

@@ -459,91 +715,113 @@ GenerateMembers(io::Printer* printer) const {

printer->Print(variables_,

"private int $name$MemoizedSerializedSize = -1;\n");

}

-void RepeatedStringFieldGenerator::

-GenerateBuilderMembers(io::Printer* printer) const {

- // One field is the list and the bit field keeps track of whether the

- // list is immutable. If it's immutable, the invariant is that it must

- // either an instance of Collections.emptyList() or it's an ArrayList

- // wrapped in a Collections.unmodifiableList() wrapper and nobody else has

- // a refererence to the underlying ArrayList. This invariant allows us to

- // share instances of lists between protocol buffers avoiding expensive

- // memory allocations. Note, immutable is a strong guarantee here -- not

- // just that the list cannot be modified via the reference but that the

- // list can never be modified.

- printer->Print(variables_,

- "private com.google.protobuf.LazyStringList $name$_ = $empty_list$;\n");

printer->Print(variables_,

"private void ensure$capitalized_name$IsMutable() {\n"

- " if (!$get_mutable_bit_builder$) {\n"

+ " if (!$is_mutable$) {\n"

" $name$_ = new com.google.protobuf.LazyStringArrayList($name$_);\n"

- " $set_mutable_bit_builder$;\n"

" }\n"

"}\n");

- // Note: We return an unmodifiable list because otherwise the caller

- // could hold on to the returned list and modify it after the message

- // has been built, thus mutating the message which is supposed to be

- // immutable.

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$public java.util.List<java.lang.String>\n"

+ "private void set$capitalized_name$(\n"

+ " int index, java.lang.String value) {\n"

+ "$null_check$"

+ " ensure$capitalized_name$IsMutable();\n"

+ " $name$_.set(index, value);\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void add$capitalized_name$(\n"

+ " java.lang.String value) {\n"

+ "$null_check$"

+ " ensure$capitalized_name$IsMutable();\n"

+ " $name$_.add(value);\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void addAll$capitalized_name$(\n"

+ " java.lang.Iterable<java.lang.String> values) {\n"

+ " ensure$capitalized_name$IsMutable();\n"

+ " com.google.protobuf.AbstractMessageLite.addAll(\n"

+ " values, $name$_);\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void clear$capitalized_name$() {\n"

+ " $name$_ = $empty_list$;\n"

+ "}\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "private void add$capitalized_name$Bytes(\n"

+ " com.google.protobuf.ByteString value) {\n"

+ "$null_check$");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ " checkByteStringIsUtf8(value);\n");

+ }

+ printer->Print(variables_,

+ " ensure$capitalized_name$IsMutable();\n"

+ " $name$_.add(value);\n"

+ "}\n");

+void RepeatedImmutableStringFieldLiteGenerator::

+GenerateBuilderMembers(io::Printer* printer) const {

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public com.google.protobuf.ProtocolStringList\n"

" get$capitalized_name$List() {\n"

- " return java.util.Collections.unmodifiableList($name$_);\n"

+ " return ((com.google.protobuf.LazyStringList)\n"

+ " instance.get$capitalized_name$List()).getUnmodifiableView();\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public int get$capitalized_name$Count() {\n"

- " return $name$_.size();\n"

+ " return instance.get$capitalized_name$Count();\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public java.lang.String get$capitalized_name$(int index) {\n"

- " return $name$_.get(index);\n"

+ " return instance.get$capitalized_name$(index);\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public com.google.protobuf.ByteString\n"

" get$capitalized_name$Bytes(int index) {\n"

- " return $name$_.getByteString(index);\n"

+ " return instance.get$capitalized_name$Bytes(index);\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder set$capitalized_name$(\n"

" int index, java.lang.String value) {\n"

- "$null_check$"

- " ensure$capitalized_name$IsMutable();\n"

- " $name$_.set(index, value);\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.set$capitalized_name$(index, value);\n"

" return this;\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder add$capitalized_name$(\n"

" java.lang.String value) {\n"

- "$null_check$"

- " ensure$capitalized_name$IsMutable();\n"

- " $name$_.add(value);\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.add$capitalized_name$(value);\n"

" return this;\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder addAll$capitalized_name$(\n"

" java.lang.Iterable<java.lang.String> values) {\n"

- " ensure$capitalized_name$IsMutable();\n"

- " super.addAll(values, $name$_);\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.addAll$capitalized_name$(values);\n"

" return this;\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder clear$capitalized_name$() {\n"

- " $name$_ = $empty_list$;\n"

- " $clear_mutable_bit_builder$;\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.clear$capitalized_name$();\n"

" return this;\n"

"}\n");

@@ -551,32 +829,23 @@ GenerateBuilderMembers(io::Printer* printer) const {

printer->Print(variables_,

"$deprecation$public Builder add$capitalized_name$Bytes(\n"

" com.google.protobuf.ByteString value) {\n"

- "$null_check$"

- " ensure$capitalized_name$IsMutable();\n"

- " $name$_.add(value);\n"

- " $on_changed$\n"

+ " copyOnWrite();\n"

+ " instance.add$capitalized_name$Bytes(value);\n"

" return this;\n"

"}\n");

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateFieldBuilderInitializationCode(io::Printer* printer) const {

- // noop for primitives

+ // noop for strings

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateInitializationCode(io::Printer* printer) const {

printer->Print(variables_, "$name$_ = $empty_list$;\n");

}

-void RepeatedStringFieldGenerator::

-GenerateBuilderClearCode(io::Printer* printer) const {

- printer->Print(variables_,

- "$name$_ = $empty_list$;\n"

- "$clear_mutable_bit_builder$;\n");

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateMergingCode(io::Printer* printer) const {

// The code below does two optimizations:

// 1. If the other list is empty, there's nothing to do. This ensures we

@@ -587,7 +856,6 @@ GenerateMergingCode(io::Printer* printer) const {

"if (!other.$name$_.isEmpty()) {\n"

" if ($name$_.isEmpty()) {\n"

" $name$_ = other.$name$_;\n"

- " $clear_mutable_bit_builder$;\n"

" } else {\n"

" ensure$capitalized_name$IsMutable();\n"

" $name$_.addAll(other.$name$_);\n"

@@ -596,54 +864,73 @@ GenerateMergingCode(io::Printer* printer) const {

"}\n");

}

-void RepeatedStringFieldGenerator::

-GenerateBuildingCode(io::Printer* printer) const {

- // The code below ensures that the result has an immutable list. If our

- // list is immutable, we can just reuse it. If not, we make it immutable.

+void RepeatedImmutableStringFieldLiteGenerator::

+GenerateDynamicMethodMakeImmutableCode(io::Printer* printer) const {

printer->Print(variables_,

- "if ($get_mutable_bit_builder$) {\n"

- " $name$_ = new com.google.protobuf.UnmodifiableLazyStringList(\n"

- " $name$_);\n"

- " $clear_mutable_bit_builder$;\n"

- "}\n"

- "result.$name$_ = $name$_;\n");

+ "$name$_.makeImmutable();\n");

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateParsingCode(io::Printer* printer) const {

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ "String s = input.readStringRequireUtf8();\n");

+ } else if (!HasDescriptorMethods(descriptor_->file())) {

+ // Lite runtime should attempt to reduce allocations by attempting to

+ // construct the string directly from the input stream buffer. This avoids

+ // spurious intermediary ByteString allocations, cutting overall allocations

+ // in half.

+ printer->Print(variables_,

+ "String s = input.readString();\n");

+ } else {

+ printer->Print(variables_,

+ "com.google.protobuf.ByteString bs = input.readBytes();\n");

+ }

printer->Print(variables_,

- "if (!$get_mutable_bit_parser$) {\n"

+ "if (!$is_mutable$) {\n"

" $name$_ = new com.google.protobuf.LazyStringArrayList();\n"

- " $set_mutable_bit_parser$;\n"

- "}\n"

- "$name$_.add(input.readBytes());\n");

+ "}\n");

+ if (CheckUtf8(descriptor_) || !HasDescriptorMethods(descriptor_->file())) {

+ printer->Print(variables_,

+ "$name$_.add(s);\n");

+ } else {

+ printer->Print(variables_,

+ "$name$_.add(bs);\n");

+ }

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateParsingCodeFromPacked(io::Printer* printer) const {

printer->Print(variables_,

"int length = input.readRawVarint32();\n"

"int limit = input.pushLimit(length);\n"

- "if (!$get_mutable_bit_parser$ && input.getBytesUntilLimit() > 0) {\n"

+ "if (!$is_mutable$ && input.getBytesUntilLimit() > 0) {\n"

" $name$_ = new com.google.protobuf.LazyStringArrayList();\n"

- " $set_mutable_bit_parser$;\n"

"}\n"

- "while (input.getBytesUntilLimit() > 0) {\n"

- " $name$.add(input.read$capitalized_type$());\n"

+ "while (input.getBytesUntilLimit() > 0) {\n");

+ if (CheckUtf8(descriptor_)) {

+ printer->Print(variables_,

+ " String s = input.readStringRequireUtf8();\n");

+ } else {

+ printer->Print(variables_,

+ " String s = input.readString();\n");

+ }

+ printer->Print(variables_,

+ " $name$.add(s);\n");

+ printer->Print(variables_,

"}\n"

"input.popLimit(limit);\n");

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateParsingDoneCode(io::Printer* printer) const {

printer->Print(variables_,

- "if ($get_mutable_bit_parser$) {\n"

- " $name$_ = new com.google.protobuf.UnmodifiableLazyStringList($name$_);\n"

+ "if ($is_mutable$) {\n"

+ " $name$_.makeImmutable();\n"

"}\n");

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateSerializationCode(io::Printer* printer) const {

if (descriptor_->options().packed()) {

printer->Print(variables_,

@@ -662,7 +949,7 @@ GenerateSerializationCode(io::Printer* printer) const {

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateSerializedSizeCode(io::Printer* printer) const {

printer->Print(variables_,

"{\n"

@@ -700,14 +987,14 @@ GenerateSerializedSizeCode(io::Printer* printer) const {

printer->Print("}\n");

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateEqualsCode(io::Printer* printer) const {

printer->Print(variables_,

"result = result && get$capitalized_name$List()\n"

" .equals(other.get$capitalized_name$List());\n");

}

-void RepeatedStringFieldGenerator::

+void RepeatedImmutableStringFieldLiteGenerator::

GenerateHashCode(io::Printer* printer) const {

printer->Print(variables_,

"if (get$capitalized_name$Count() > 0) {\n"

@@ -716,7 +1003,7 @@ GenerateHashCode(io::Printer* printer) const {

"}\n");

}

-string RepeatedStringFieldGenerator::GetBoxedType() const {

+string RepeatedImmutableStringFieldLiteGenerator::GetBoxedType() const {

return "String";

}