azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update protobuf from 2.5.0 to 2.6.1

Browse Source
This commit is contained in:
Alexander Udalov
2016-06-24 12:54:42 +03:00
parent cfbe48ac46
commit 4c8e8b099a
20 changed files with 2086 additions and 1988 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/KotlinPlugin.xml
Generated
+1 -1
View File
@@ -52,7 +52,7 @@
<element id="module-output" name="idea-ultimate" /> <element id="module-output" name="idea-ultimate" />
<element id="module-output" name="formatter" /> <element id="module-output" name="formatter" />
<element id="module-output" name="idea-maven" /> <element id="module-output" name="idea-maven" />
<element id="extracted-dir" path="$PROJECT_DIR$/dependencies/protobuf-2.5.0.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar" path-in-jar="/" />
</element> </element>
<element id="library" level="project" name="javax.inject" /> <element id="library" level="project" name="javax.inject" />
<element id="directory" name="jps"> <element id="directory" name="jps">
.idea/libraries/protobuf_java.xml
Generated
+2 -2
View File
@@ -4,11 +4,11 @@
<root url="file://$PROJECT_DIR$/annotations" /> <root url="file://$PROJECT_DIR$/annotations" />
</ANNOTATIONS> </ANNOTATIONS>
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.5.0.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.6.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.5.0-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/protobuf-2.6.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java
+12 -11
View File
@@ -77,22 +77,23 @@ public final class DebugExtOptionsProtoBuf {
"\001(\010B\031B\027DebugExtOptionsProtoBuf" "\001(\010B\031B\027DebugExtOptionsProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors( public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) { org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
descriptor = root; descriptor = root;
skipInComparison.internalInit(descriptor.getExtensions().get(0)); return null;
nameIdInTable.internalInit(descriptor.getExtensions().get(1)); }
fqNameIdInTable.internalInit(descriptor.getExtensions().get(2)); };
stringIdInTable.internalInit(descriptor.getExtensions().get(3));
return null;
}
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor(), org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor(),
}, assigner); }, assigner);
skipInComparison.internalInit(descriptor.getExtensions().get(0));
nameIdInTable.internalInit(descriptor.getExtensions().get(1));
fqNameIdInTable.internalInit(descriptor.getExtensions().get(2));
stringIdInTable.internalInit(descriptor.getExtensions().get(3));
org.jetbrains.kotlin.protobuf.DescriptorProtos.getDescriptor();
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+419 -635
View File
File diff suppressed because it is too large Load Diff
build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+172 -178
View File
@@ -18,10 +18,10 @@ public final class DebugBuiltInsProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeAnnotation); registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeAnnotation);
registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation); registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation);
} }
public interface BuiltInsOrBuilder public interface BuiltInsOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code> * <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code>
*/ */
@@ -35,7 +35,6 @@ public final class DebugBuiltInsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder(); org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
// optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code> * <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code>
*/ */
@@ -49,7 +48,6 @@ public final class DebugBuiltInsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder(); org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
// optional .org.jetbrains.kotlin.serialization.Package package = 3;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code> * <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code>
*/ */
@@ -63,37 +61,37 @@ public final class DebugBuiltInsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder(); org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder();
// repeated .org.jetbrains.kotlin.serialization.Class class = 4;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>
getClassList(); getClass_List();
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index); org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index);
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
int getClassCount(); int getClass_Count();
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>
getClassOrBuilderList(); getClass_OrBuilderList();
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder( org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index); int index);
} }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
*/ */
public static final class BuiltIns extends public static final class BuiltIns extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements BuiltInsOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
BuiltInsOrBuilder {
// Use BuiltIns.newBuilder() to construct. // Use BuiltIns.newBuilder() to construct.
private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -180,10 +178,10 @@ public final class DebugBuiltInsProtoBuf {
} }
case 34: { case 34: {
if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>(); class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>();
mutable_bitField0_ |= 0x00000008; mutable_bitField0_ |= 0x00000008;
} }
class_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry)); class__.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry));
break; break;
} }
} }
@@ -195,7 +193,7 @@ public final class DebugBuiltInsProtoBuf {
e.getMessage()).setUnfinishedMessage(this); e.getMessage()).setUnfinishedMessage(this);
} finally { } finally {
if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
class_ = java.util.Collections.unmodifiableList(class_); class__ = java.util.Collections.unmodifiableList(class__);
} }
this.unknownFields = unknownFields.build(); this.unknownFields = unknownFields.build();
makeExtensionsImmutable(); makeExtensionsImmutable();
@@ -229,7 +227,6 @@ public final class DebugBuiltInsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
public static final int STRINGS_FIELD_NUMBER = 1; public static final int STRINGS_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_; private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_;
/** /**
@@ -251,7 +248,6 @@ public final class DebugBuiltInsProtoBuf {
return strings_; return strings_;
} }
// optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2; public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_; private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
/** /**
@@ -273,7 +269,6 @@ public final class DebugBuiltInsProtoBuf {
return qualifiedNames_; return qualifiedNames_;
} }
// optional .org.jetbrains.kotlin.serialization.Package package = 3;
public static final int PACKAGE_FIELD_NUMBER = 3; public static final int PACKAGE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_; private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_;
/** /**
@@ -295,52 +290,52 @@ public final class DebugBuiltInsProtoBuf {
return package_; return package_;
} }
// repeated .org.jetbrains.kotlin.serialization.Class class = 4;
public static final int CLASS_FIELD_NUMBER = 4; public static final int CLASS_FIELD_NUMBER = 4;
private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class_; private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class__;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClassList() { public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClass_List() {
return class_; return class__;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>
getClassOrBuilderList() { getClass_OrBuilderList() {
return class_; return class__;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public int getClassCount() { public int getClass_Count() {
return class_.size(); return class__.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index) { public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
return class_.get(index); return class__.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder( public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index) { int index) {
return class_.get(index); return class__.get(index);
} }
private void initFields() { private void initFields() {
strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance(); package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
class_ = java.util.Collections.emptyList(); class__ = java.util.Collections.emptyList();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (hasQualifiedNames()) { if (hasQualifiedNames()) {
if (!getQualifiedNames().isInitialized()) { if (!getQualifiedNames().isInitialized()) {
@@ -354,8 +349,8 @@ public final class DebugBuiltInsProtoBuf {
return false; return false;
} }
} }
for (int i = 0; i < getClassCount(); i++) { for (int i = 0; i < getClass_Count(); i++) {
if (!getClass(i).isInitialized()) { if (!getClass_(i).isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
@@ -376,8 +371,8 @@ public final class DebugBuiltInsProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, package_); output.writeMessage(3, package_);
} }
for (int i = 0; i < class_.size(); i++) { for (int i = 0; i < class__.size(); i++) {
output.writeMessage(4, class_.get(i)); output.writeMessage(4, class__.get(i));
} }
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@@ -400,9 +395,9 @@ public final class DebugBuiltInsProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, package_); .computeMessageSize(3, package_);
} }
for (int i = 0; i < class_.size(); i++) { for (int i = 0; i < class__.size(); i++) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, class_.get(i)); .computeMessageSize(4, class__.get(i));
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -486,8 +481,9 @@ public final class DebugBuiltInsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltInsOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.BuiltInsOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor; return org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor;
@@ -515,7 +511,7 @@ public final class DebugBuiltInsProtoBuf {
getStringsFieldBuilder(); getStringsFieldBuilder();
getQualifiedNamesFieldBuilder(); getQualifiedNamesFieldBuilder();
getPackageFieldBuilder(); getPackageFieldBuilder();
getClassFieldBuilder(); getClass_FieldBuilder();
} }
} }
private static Builder create() { private static Builder create() {
@@ -542,11 +538,11 @@ public final class DebugBuiltInsProtoBuf {
packageBuilder_.clear(); packageBuilder_.clear();
} }
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
if (classBuilder_ == null) { if (class_Builder_ == null) {
class_ = java.util.Collections.emptyList(); class__ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
} else { } else {
classBuilder_.clear(); class_Builder_.clear();
} }
return this; return this;
} }
@@ -600,14 +596,14 @@ public final class DebugBuiltInsProtoBuf {
} else { } else {
result.package_ = packageBuilder_.build(); result.package_ = packageBuilder_.build();
} }
if (classBuilder_ == null) { if (class_Builder_ == null) {
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
class_ = java.util.Collections.unmodifiableList(class_); class__ = java.util.Collections.unmodifiableList(class__);
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
} }
result.class_ = class_; result.class__ = class__;
} else { } else {
result.class_ = classBuilder_.build(); result.class__ = class_Builder_.build();
} }
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
@@ -634,29 +630,29 @@ public final class DebugBuiltInsProtoBuf {
if (other.hasPackage()) { if (other.hasPackage()) {
mergePackage(other.getPackage()); mergePackage(other.getPackage());
} }
if (classBuilder_ == null) { if (class_Builder_ == null) {
if (!other.class_.isEmpty()) { if (!other.class__.isEmpty()) {
if (class_.isEmpty()) { if (class__.isEmpty()) {
class_ = other.class_; class__ = other.class__;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
} else { } else {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.addAll(other.class_); class__.addAll(other.class__);
} }
onChanged(); onChanged();
} }
} else { } else {
if (!other.class_.isEmpty()) { if (!other.class__.isEmpty()) {
if (classBuilder_.isEmpty()) { if (class_Builder_.isEmpty()) {
classBuilder_.dispose(); class_Builder_.dispose();
classBuilder_ = null; class_Builder_ = null;
class_ = other.class_; class__ = other.class__;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
classBuilder_ = class_Builder_ =
org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getClassFieldBuilder() : null; getClass_FieldBuilder() : null;
} else { } else {
classBuilder_.addAllMessages(other.class_); class_Builder_.addAllMessages(other.class__);
} }
} }
} }
@@ -677,8 +673,8 @@ public final class DebugBuiltInsProtoBuf {
return false; return false;
} }
} }
for (int i = 0; i < getClassCount(); i++) { for (int i = 0; i < getClass_Count(); i++) {
if (!getClass(i).isInitialized()) { if (!getClass_(i).isInitialized()) {
return false; return false;
} }
@@ -705,7 +701,6 @@ public final class DebugBuiltInsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_; org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
@@ -814,7 +809,7 @@ public final class DebugBuiltInsProtoBuf {
if (stringsBuilder_ == null) { if (stringsBuilder_ == null) {
stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>( org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>(
strings_, getStrings(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
strings_ = null; strings_ = null;
@@ -822,7 +817,6 @@ public final class DebugBuiltInsProtoBuf {
return stringsBuilder_; return stringsBuilder_;
} }
// optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_; org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
@@ -931,7 +925,7 @@ public final class DebugBuiltInsProtoBuf {
if (qualifiedNamesBuilder_ == null) { if (qualifiedNamesBuilder_ == null) {
qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>( org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>(
qualifiedNames_, getQualifiedNames(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
qualifiedNames_ = null; qualifiedNames_ = null;
@@ -939,7 +933,6 @@ public final class DebugBuiltInsProtoBuf {
return qualifiedNamesBuilder_; return qualifiedNamesBuilder_;
} }
// optional .org.jetbrains.kotlin.serialization.Package package = 3;
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance(); private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> packageBuilder_; org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> packageBuilder_;
@@ -1048,7 +1041,7 @@ public final class DebugBuiltInsProtoBuf {
if (packageBuilder_ == null) { if (packageBuilder_ == null) {
packageBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< packageBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder>( org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder>(
package_, getPackage(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
package_ = null; package_ = null;
@@ -1056,244 +1049,244 @@ public final class DebugBuiltInsProtoBuf {
return packageBuilder_; return packageBuilder_;
} }
// repeated .org.jetbrains.kotlin.serialization.Class class = 4; private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class__ =
private java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> class_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureClassIsMutable() { private void ensureClass_IsMutable() {
if (!((bitField0_ & 0x00000008) == 0x00000008)) { if (!((bitField0_ & 0x00000008) == 0x00000008)) {
class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>(class_); class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class>(class__);
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
} }
} }
private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> classBuilder_; org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> class_Builder_;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClassList() { public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> getClass_List() {
if (classBuilder_ == null) { if (class_Builder_ == null) {
return java.util.Collections.unmodifiableList(class_); return java.util.Collections.unmodifiableList(class__);
} else { } else {
return classBuilder_.getMessageList(); return class_Builder_.getMessageList();
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public int getClassCount() { public int getClass_Count() {
if (classBuilder_ == null) { if (class_Builder_ == null) {
return class_.size(); return class__.size();
} else { } else {
return classBuilder_.getCount(); return class_Builder_.getCount();
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass(int index) { public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
return class_.get(index); return class__.get(index);
} else { } else {
return classBuilder_.getMessage(index); return class_Builder_.getMessage(index);
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder setClass( public Builder setClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) { int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureClassIsMutable(); ensureClass_IsMutable();
class_.set(index, value); class__.set(index, value);
onChanged(); onChanged();
} else { } else {
classBuilder_.setMessage(index, value); class_Builder_.setMessage(index, value);
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder setClass( public Builder setClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) { int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.set(index, builderForValue.build()); class__.set(index, builderForValue.build());
onChanged(); onChanged();
} else { } else {
classBuilder_.setMessage(index, builderForValue.build()); class_Builder_.setMessage(index, builderForValue.build());
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) { public Builder addClass_(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(value); class__.add(value);
onChanged(); onChanged();
} else { } else {
classBuilder_.addMessage(value); class_Builder_.addMessage(value);
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass( public Builder addClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) { int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(index, value); class__.add(index, value);
onChanged(); onChanged();
} else { } else {
classBuilder_.addMessage(index, value); class_Builder_.addMessage(index, value);
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass( public Builder addClass_(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) { org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(builderForValue.build()); class__.add(builderForValue.build());
onChanged(); onChanged();
} else { } else {
classBuilder_.addMessage(builderForValue.build()); class_Builder_.addMessage(builderForValue.build());
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass( public Builder addClass_(
int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) { int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(index, builderForValue.build()); class__.add(index, builderForValue.build());
onChanged(); onChanged();
} else { } else {
classBuilder_.addMessage(index, builderForValue.build()); class_Builder_.addMessage(index, builderForValue.build());
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addAllClass( public Builder addAllClass_(
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.Class> values) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
ensureClassIsMutable(); ensureClass_IsMutable();
super.addAll(values, class_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, class__);
onChanged(); onChanged();
} else { } else {
classBuilder_.addAllMessages(values); class_Builder_.addAllMessages(values);
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder clearClass() { public Builder clearClass_() {
if (classBuilder_ == null) { if (class_Builder_ == null) {
class_ = java.util.Collections.emptyList(); class__ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
onChanged(); onChanged();
} else { } else {
classBuilder_.clear(); class_Builder_.clear();
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder removeClass(int index) { public Builder removeClass_(int index) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.remove(index); class__.remove(index);
onChanged(); onChanged();
} else { } else {
classBuilder_.remove(index); class_Builder_.remove(index);
} }
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClassBuilder( public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClass_Builder(
int index) { int index) {
return getClassFieldBuilder().getBuilder(index); return getClass_FieldBuilder().getBuilder(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClassOrBuilder( public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index) { int index) {
if (classBuilder_ == null) { if (class_Builder_ == null) {
return class_.get(index); } else { return class__.get(index); } else {
return classBuilder_.getMessageOrBuilder(index); return class_Builder_.getMessageOrBuilder(index);
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> public java.util.List<? extends org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>
getClassOrBuilderList() { getClass_OrBuilderList() {
if (classBuilder_ != null) { if (class_Builder_ != null) {
return classBuilder_.getMessageOrBuilderList(); return class_Builder_.getMessageOrBuilderList();
} else { } else {
return java.util.Collections.unmodifiableList(class_); return java.util.Collections.unmodifiableList(class__);
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClassBuilder() { public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder() {
return getClassFieldBuilder().addBuilder( return getClass_FieldBuilder().addBuilder(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()); org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClassBuilder( public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder(
int index) { int index) {
return getClassFieldBuilder().addBuilder( return getClass_FieldBuilder().addBuilder(
index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()); index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder> public java.util.List<org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder>
getClassBuilderList() { getClass_BuilderList() {
return getClassFieldBuilder().getBuilderList(); return getClass_FieldBuilder().getBuilderList();
} }
private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>
getClassFieldBuilder() { getClass_FieldBuilder() {
if (classBuilder_ == null) { if (class_Builder_ == null) {
classBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< class_Builder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>( org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>(
class_, class__,
((bitField0_ & 0x00000008) == 0x00000008), ((bitField0_ & 0x00000008) == 0x00000008),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
class_ = null; class__ = null;
} }
return classBuilder_; return class_Builder_;
} }
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns) // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
@@ -1417,7 +1410,7 @@ public final class DebugBuiltInsProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()); org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor; internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1475,34 +1468,35 @@ public final class DebugBuiltInsProtoBuf {
"B\027B\025DebugBuiltInsProtoBuf" "B\027B\025DebugBuiltInsProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors( public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) { org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
descriptor = root; descriptor = root;
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor = return null;
getDescriptor().getMessageTypes().get(0); }
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new };
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor,
new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class", });
packageFqName.internalInit(descriptor.getExtensions().get(0));
classAnnotation.internalInit(descriptor.getExtensions().get(1));
constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
functionAnnotation.internalInit(descriptor.getExtensions().get(3));
propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
compileTimeValue.internalInit(descriptor.getExtensions().get(5));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
typeAnnotation.internalInit(descriptor.getExtensions().get(8));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
return null;
}
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(), org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
}, assigner); }, assigner);
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_builtins_BuiltIns_descriptor,
new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class_", });
packageFqName.internalInit(descriptor.getExtensions().get(0));
classAnnotation.internalInit(descriptor.getExtensions().get(1));
constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
functionAnnotation.internalInit(descriptor.getExtensions().get(3));
propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
compileTimeValue.internalInit(descriptor.getExtensions().get(5));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
typeAnnotation.internalInit(descriptor.getExtensions().get(8));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+94 -92
View File
@@ -17,10 +17,10 @@ public final class DebugJsProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeAnnotation); registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeAnnotation);
registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeParameterAnnotation); registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeParameterAnnotation);
} }
public interface ClassesOrBuilder public interface ClassesOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// repeated int32 class_name = 1 [packed = true];
/** /**
* <code>repeated int32 class_name = 1 [packed = true];</code> * <code>repeated int32 class_name = 1 [packed = true];</code>
* *
@@ -50,8 +50,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
*/ */
public static final class Classes extends public static final class Classes extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements ClassesOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
ClassesOrBuilder {
// Use Classes.newBuilder() to construct. // Use Classes.newBuilder() to construct.
private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -160,7 +161,6 @@ public final class DebugJsProtoBuf {
return PARSER; return PARSER;
} }
// repeated int32 class_name = 1 [packed = true];
public static final int CLASS_NAME_FIELD_NUMBER = 1; public static final int CLASS_NAME_FIELD_NUMBER = 1;
private java.util.List<java.lang.Integer> className_; private java.util.List<java.lang.Integer> className_;
/** /**
@@ -202,7 +202,8 @@ public final class DebugJsProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -323,8 +324,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor; return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
@@ -443,7 +445,6 @@ public final class DebugJsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated int32 class_name = 1 [packed = true];
private java.util.List<java.lang.Integer> className_ = java.util.Collections.emptyList(); private java.util.List<java.lang.Integer> className_ = java.util.Collections.emptyList();
private void ensureClassNameIsMutable() { private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) { if (!((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -519,7 +520,8 @@ public final class DebugJsProtoBuf {
public Builder addAllClassName( public Builder addAllClassName(
java.lang.Iterable<? extends java.lang.Integer> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureClassNameIsMutable(); ensureClassNameIsMutable();
super.addAll(values, className_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, className_);
onChanged(); onChanged();
return this; return this;
} }
@@ -548,10 +550,10 @@ public final class DebugJsProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
} }
public interface LibraryOrBuilder public interface LibraryOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;</code> * <code>repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;</code>
*/ */
@@ -576,7 +578,6 @@ public final class DebugJsProtoBuf {
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder getEntryOrBuilder( org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder getEntryOrBuilder(
int index); int index);
// optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code> * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
*/ */
@@ -586,12 +587,11 @@ public final class DebugJsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind(); org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind();
// repeated string importedModules = 3;
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
java.util.List<java.lang.String> org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList(); getImportedModulesList();
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
@@ -610,8 +610,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
*/ */
public static final class Library extends public static final class Library extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements LibraryOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
LibraryOrBuilder {
// Use Library.newBuilder() to construct. // Use Library.newBuilder() to construct.
private Library(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private Library(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -677,11 +678,12 @@ public final class DebugJsProtoBuf {
break; break;
} }
case 26: { case 26: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(); importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000004; mutable_bitField0_ |= 0x00000004;
} }
importedModules_.add(input.readBytes()); importedModules_.add(bs);
break; break;
} }
} }
@@ -696,7 +698,7 @@ public final class DebugJsProtoBuf {
entry_ = java.util.Collections.unmodifiableList(entry_); entry_ = java.util.Collections.unmodifiableList(entry_);
} }
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(importedModules_); importedModules_ = importedModules_.getUnmodifiableView();
} }
this.unknownFields = unknownFields.build(); this.unknownFields = unknownFields.build();
makeExtensionsImmutable(); makeExtensionsImmutable();
@@ -829,10 +831,10 @@ public final class DebugJsProtoBuf {
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind) // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
} }
public interface FileEntryOrBuilder public interface FileEntryOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// required string path = 1;
/** /**
* <code>required string path = 1;</code> * <code>required string path = 1;</code>
*/ */
@@ -847,7 +849,6 @@ public final class DebugJsProtoBuf {
org.jetbrains.kotlin.protobuf.ByteString org.jetbrains.kotlin.protobuf.ByteString
getPathBytes(); getPathBytes();
// required bytes content = 2;
/** /**
* <code>required bytes content = 2;</code> * <code>required bytes content = 2;</code>
*/ */
@@ -861,8 +862,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
*/ */
public static final class FileEntry extends public static final class FileEntry extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements FileEntryOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
FileEntryOrBuilder {
// Use FileEntry.newBuilder() to construct. // Use FileEntry.newBuilder() to construct.
private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -909,8 +911,9 @@ public final class DebugJsProtoBuf {
break; break;
} }
case 10: { case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
path_ = input.readBytes(); path_ = bs;
break; break;
} }
case 18: { case 18: {
@@ -958,7 +961,6 @@ public final class DebugJsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// required string path = 1;
public static final int PATH_FIELD_NUMBER = 1; public static final int PATH_FIELD_NUMBER = 1;
private java.lang.Object path_; private java.lang.Object path_;
/** /**
@@ -1001,7 +1003,6 @@ public final class DebugJsProtoBuf {
} }
} }
// required bytes content = 2;
public static final int CONTENT_FIELD_NUMBER = 2; public static final int CONTENT_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.ByteString content_; private org.jetbrains.kotlin.protobuf.ByteString content_;
/** /**
@@ -1024,7 +1025,8 @@ public final class DebugJsProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (!hasPath()) { if (!hasPath()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -1146,8 +1148,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntryOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor; return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor;
@@ -1279,7 +1282,6 @@ public final class DebugJsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// required string path = 1;
private java.lang.Object path_ = ""; private java.lang.Object path_ = "";
/** /**
* <code>required string path = 1;</code> * <code>required string path = 1;</code>
@@ -1293,9 +1295,12 @@ public final class DebugJsProtoBuf {
public java.lang.String getPath() { public java.lang.String getPath() {
java.lang.Object ref = path_; java.lang.Object ref = path_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref) org.jetbrains.kotlin.protobuf.ByteString bs =
.toStringUtf8(); (org.jetbrains.kotlin.protobuf.ByteString) ref;
path_ = s; java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
path_ = s;
}
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
@@ -1353,7 +1358,6 @@ public final class DebugJsProtoBuf {
return this; return this;
} }
// required bytes content = 2;
private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY; private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;
/** /**
* <code>required bytes content = 2;</code> * <code>required bytes content = 2;</code>
@@ -1401,7 +1405,6 @@ public final class DebugJsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
public static final int ENTRY_FIELD_NUMBER = 1; public static final int ENTRY_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> entry_; private java.util.List<org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> entry_;
/** /**
@@ -1437,7 +1440,6 @@ public final class DebugJsProtoBuf {
return entry_.get(index); return entry_.get(index);
} }
// optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
public static final int KIND_FIELD_NUMBER = 2; public static final int KIND_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_; private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_;
/** /**
@@ -1453,13 +1455,12 @@ public final class DebugJsProtoBuf {
return kind_; return kind_;
} }
// repeated string importedModules = 3;
public static final int IMPORTEDMODULES_FIELD_NUMBER = 3; public static final int IMPORTEDMODULES_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_; private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_;
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() { getImportedModulesList() {
return importedModules_; return importedModules_;
} }
@@ -1491,7 +1492,8 @@ public final class DebugJsProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
for (int i = 0; i < getEntryCount(); i++) { for (int i = 0; i < getEntryCount(); i++) {
if (!getEntry(i).isInitialized()) { if (!getEntry(i).isInitialized()) {
@@ -1623,8 +1625,9 @@ public final class DebugJsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor; return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
@@ -1710,8 +1713,7 @@ public final class DebugJsProtoBuf {
} }
result.kind_ = kind_; result.kind_ = kind_;
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList( importedModules_ = importedModules_.getUnmodifiableView();
importedModules_);
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
} }
result.importedModules_ = importedModules_; result.importedModules_ = importedModules_;
@@ -1803,7 +1805,6 @@ public final class DebugJsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
private java.util.List<org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> entry_ = private java.util.List<org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> entry_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureEntryIsMutable() { private void ensureEntryIsMutable() {
@@ -1945,7 +1946,8 @@ public final class DebugJsProtoBuf {
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.FileEntry> values) {
if (entryBuilder_ == null) { if (entryBuilder_ == null) {
ensureEntryIsMutable(); ensureEntryIsMutable();
super.addAll(values, entry_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, entry_);
onChanged(); onChanged();
} else { } else {
entryBuilder_.addAllMessages(values); entryBuilder_.addAllMessages(values);
@@ -2043,7 +2045,6 @@ public final class DebugJsProtoBuf {
return entryBuilder_; return entryBuilder_;
} }
// optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN; private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code> * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
@@ -2079,7 +2080,6 @@ public final class DebugJsProtoBuf {
return this; return this;
} }
// repeated string importedModules = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY; private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureImportedModulesIsMutable() { private void ensureImportedModulesIsMutable() {
if (!((bitField0_ & 0x00000004) == 0x00000004)) { if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -2090,9 +2090,9 @@ public final class DebugJsProtoBuf {
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() { getImportedModulesList() {
return java.util.Collections.unmodifiableList(importedModules_); return importedModules_.getUnmodifiableView();
} }
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
@@ -2145,7 +2145,8 @@ public final class DebugJsProtoBuf {
public Builder addAllImportedModules( public Builder addAllImportedModules(
java.lang.Iterable<java.lang.String> values) { java.lang.Iterable<java.lang.String> values) {
ensureImportedModulesIsMutable(); ensureImportedModulesIsMutable();
super.addAll(values, importedModules_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, importedModules_);
onChanged(); onChanged();
return this; return this;
} }
@@ -2282,17 +2283,17 @@ public final class DebugJsProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()); org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor; internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor; internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor; internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2349,45 +2350,46 @@ public final class DebugJsProtoBuf {
"rotoBuf" "rotoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors( public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) { org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
descriptor = root; descriptor = root;
internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor = return null;
getDescriptor().getMessageTypes().get(0); }
internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new };
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
new java.lang.String[] { "ClassName", });
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
new java.lang.String[] { "Entry", "Kind", "ImportedModules", });
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor =
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
new java.lang.String[] { "Path", "Content", });
classAnnotation.internalInit(descriptor.getExtensions().get(0));
constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
functionAnnotation.internalInit(descriptor.getExtensions().get(2));
propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
compileTimeValue.internalInit(descriptor.getExtensions().get(4));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(5));
parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
typeAnnotation.internalInit(descriptor.getExtensions().get(7));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(8));
return null;
}
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(), org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
}, assigner); }, assigner);
internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
new java.lang.String[] { "ClassName", });
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
new java.lang.String[] { "Entry", "Kind", "ImportedModules", });
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor =
internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_Library_FileEntry_descriptor,
new java.lang.String[] { "Path", "Content", });
classAnnotation.internalInit(descriptor.getExtensions().get(0));
constructorAnnotation.internalInit(descriptor.getExtensions().get(1));
functionAnnotation.internalInit(descriptor.getExtensions().get(2));
propertyAnnotation.internalInit(descriptor.getExtensions().get(3));
compileTimeValue.internalInit(descriptor.getExtensions().get(4));
enumEntryAnnotation.internalInit(descriptor.getExtensions().get(5));
parameterAnnotation.internalInit(descriptor.getExtensions().get(6));
typeAnnotation.internalInit(descriptor.getExtensions().get(7));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(8));
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
+64 -59
View File
@@ -8,10 +8,10 @@ public final class DebugJvmPackageTable {
public static void registerAllExtensions( public static void registerAllExtensions(
org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) { org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
} }
public interface PackageTableOrBuilder public interface PackageTableOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code> * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
*/ */
@@ -40,8 +40,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/ */
public static final class PackageTable extends public static final class PackageTable extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements PackageTableOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
PackageTableOrBuilder {
// Use PackageTable.newBuilder() to construct. // Use PackageTable.newBuilder() to construct.
private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -137,7 +138,6 @@ public final class DebugJvmPackageTable {
return PARSER; return PARSER;
} }
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
public static final int PACKAGE_PARTS_FIELD_NUMBER = 1; public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_; private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_;
/** /**
@@ -179,7 +179,8 @@ public final class DebugJvmPackageTable {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
for (int i = 0; i < getPackagePartsCount(); i++) { for (int i = 0; i < getPackagePartsCount(); i++) {
if (!getPackageParts(i).isInitialized()) { if (!getPackageParts(i).isInitialized()) {
@@ -292,8 +293,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
@@ -443,7 +445,6 @@ public final class DebugJvmPackageTable {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_ = private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensurePackagePartsIsMutable() { private void ensurePackagePartsIsMutable() {
@@ -585,7 +586,8 @@ public final class DebugJvmPackageTable {
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> values) {
if (packagePartsBuilder_ == null) { if (packagePartsBuilder_ == null) {
ensurePackagePartsIsMutable(); ensurePackagePartsIsMutable();
super.addAll(values, packageParts_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, packageParts_);
onChanged(); onChanged();
} else { } else {
packagePartsBuilder_.addAllMessages(values); packagePartsBuilder_.addAllMessages(values);
@@ -694,10 +696,10 @@ public final class DebugJvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
} }
public interface PackagePartsOrBuilder public interface PackagePartsOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// required string package_fq_name = 1;
/** /**
* <code>required string package_fq_name = 1;</code> * <code>required string package_fq_name = 1;</code>
*/ */
@@ -712,12 +714,11 @@ public final class DebugJvmPackageTable {
org.jetbrains.kotlin.protobuf.ByteString org.jetbrains.kotlin.protobuf.ByteString
getPackageFqNameBytes(); getPackageFqNameBytes();
// repeated string class_name = 2;
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
java.util.List<java.lang.String> org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList(); getClassNameList();
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
@@ -736,8 +737,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/ */
public static final class PackageParts extends public static final class PackageParts extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements PackagePartsOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
PackagePartsOrBuilder {
// Use PackageParts.newBuilder() to construct. // Use PackageParts.newBuilder() to construct.
private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -784,16 +786,18 @@ public final class DebugJvmPackageTable {
break; break;
} }
case 10: { case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
packageFqName_ = input.readBytes(); packageFqName_ = bs;
break; break;
} }
case 18: { case 18: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(); className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002; mutable_bitField0_ |= 0x00000002;
} }
className_.add(input.readBytes()); className_.add(bs);
break; break;
} }
} }
@@ -805,7 +809,7 @@ public final class DebugJvmPackageTable {
e.getMessage()).setUnfinishedMessage(this); e.getMessage()).setUnfinishedMessage(this);
} finally { } finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_); className_ = className_.getUnmodifiableView();
} }
this.unknownFields = unknownFields.build(); this.unknownFields = unknownFields.build();
makeExtensionsImmutable(); makeExtensionsImmutable();
@@ -839,7 +843,6 @@ public final class DebugJvmPackageTable {
} }
private int bitField0_; private int bitField0_;
// required string package_fq_name = 1;
public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1; public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
private java.lang.Object packageFqName_; private java.lang.Object packageFqName_;
/** /**
@@ -882,13 +885,12 @@ public final class DebugJvmPackageTable {
} }
} }
// repeated string class_name = 2;
public static final int CLASS_NAME_FIELD_NUMBER = 2; public static final int CLASS_NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_; private org.jetbrains.kotlin.protobuf.LazyStringList className_;
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() { getClassNameList() {
return className_; return className_;
} }
@@ -919,7 +921,8 @@ public final class DebugJvmPackageTable {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (!hasPackageFqName()) { if (!hasPackageFqName()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -1042,8 +1045,9 @@ public final class DebugJvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
@@ -1113,8 +1117,7 @@ public final class DebugJvmPackageTable {
} }
result.packageFqName_ = packageFqName_; result.packageFqName_ = packageFqName_;
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList( className_ = className_.getUnmodifiableView();
className_);
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
} }
result.className_ = className_; result.className_ = className_;
@@ -1180,7 +1183,6 @@ public final class DebugJvmPackageTable {
} }
private int bitField0_; private int bitField0_;
// required string package_fq_name = 1;
private java.lang.Object packageFqName_ = ""; private java.lang.Object packageFqName_ = "";
/** /**
* <code>required string package_fq_name = 1;</code> * <code>required string package_fq_name = 1;</code>
@@ -1194,9 +1196,12 @@ public final class DebugJvmPackageTable {
public java.lang.String getPackageFqName() { public java.lang.String getPackageFqName() {
java.lang.Object ref = packageFqName_; java.lang.Object ref = packageFqName_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref) org.jetbrains.kotlin.protobuf.ByteString bs =
.toStringUtf8(); (org.jetbrains.kotlin.protobuf.ByteString) ref;
packageFqName_ = s; java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
packageFqName_ = s;
}
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
@@ -1254,7 +1259,6 @@ public final class DebugJvmPackageTable {
return this; return this;
} }
// repeated string class_name = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY; private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureClassNameIsMutable() { private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) { if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -1265,9 +1269,9 @@ public final class DebugJvmPackageTable {
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() { getClassNameList() {
return java.util.Collections.unmodifiableList(className_); return className_.getUnmodifiableView();
} }
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
@@ -1320,7 +1324,8 @@ public final class DebugJvmPackageTable {
public Builder addAllClassName( public Builder addAllClassName(
java.lang.Iterable<java.lang.String> values) { java.lang.Iterable<java.lang.String> values) {
ensureClassNameIsMutable(); ensureClassNameIsMutable();
super.addAll(values, className_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, className_);
onChanged(); onChanged();
return this; return this;
} }
@@ -1358,12 +1363,12 @@ public final class DebugJvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
} }
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1387,29 +1392,29 @@ public final class DebugJvmPackageTable {
"e" "e"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors( public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) { org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
descriptor = root; descriptor = root;
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor = return null;
getDescriptor().getMessageTypes().get(0); }
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new };
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
new java.lang.String[] { "PackageParts", });
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
new java.lang.String[] { "PackageFqName", "ClassName", });
return null;
}
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
}, assigner); }, assigner);
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
new java.lang.String[] { "PackageParts", });
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
new java.lang.String[] { "PackageFqName", "ClassName", });
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+141 -153
View File
@@ -16,10 +16,10 @@ public final class DebugJvmProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classModuleName); registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classModuleName);
registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageModuleName); registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageModuleName);
} }
public interface StringTableTypesOrBuilder public interface StringTableTypesOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;</code> * <code>repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;</code>
*/ */
@@ -44,7 +44,6 @@ public final class DebugJvmProtoBuf {
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder( org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
int index); int index);
// repeated int32 local_name = 5 [packed = true];
/** /**
* <code>repeated int32 local_name = 5 [packed = true];</code> * <code>repeated int32 local_name = 5 [packed = true];</code>
* *
@@ -74,8 +73,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
*/ */
public static final class StringTableTypes extends public static final class StringTableTypes extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements StringTableTypesOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
StringTableTypesOrBuilder {
// Use StringTableTypes.newBuilder() to construct. // Use StringTableTypes.newBuilder() to construct.
private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -195,10 +195,10 @@ public final class DebugJvmProtoBuf {
return PARSER; return PARSER;
} }
public interface RecordOrBuilder public interface RecordOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// optional int32 range = 1 [default = 1];
/** /**
* <code>optional int32 range = 1 [default = 1];</code> * <code>optional int32 range = 1 [default = 1];</code>
* *
@@ -216,7 +216,6 @@ public final class DebugJvmProtoBuf {
*/ */
int getRange(); int getRange();
// optional int32 predefined_index = 2;
/** /**
* <code>optional int32 predefined_index = 2;</code> * <code>optional int32 predefined_index = 2;</code>
* *
@@ -234,7 +233,6 @@ public final class DebugJvmProtoBuf {
*/ */
int getPredefinedIndex(); int getPredefinedIndex();
// optional string string = 6;
/** /**
* <code>optional string string = 6;</code> * <code>optional string string = 6;</code>
* *
@@ -261,7 +259,6 @@ public final class DebugJvmProtoBuf {
org.jetbrains.kotlin.protobuf.ByteString org.jetbrains.kotlin.protobuf.ByteString
getStringBytes(); getStringBytes();
// optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];</code> * <code>optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];</code>
* *
@@ -279,7 +276,6 @@ public final class DebugJvmProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation(); org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation();
// repeated int32 substring_index = 4 [packed = true];
/** /**
* <code>repeated int32 substring_index = 4 [packed = true];</code> * <code>repeated int32 substring_index = 4 [packed = true];</code>
* *
@@ -311,7 +307,6 @@ public final class DebugJvmProtoBuf {
*/ */
int getSubstringIndex(int index); int getSubstringIndex(int index);
// repeated int32 replace_char = 5 [packed = true];
/** /**
* <code>repeated int32 replace_char = 5 [packed = true];</code> * <code>repeated int32 replace_char = 5 [packed = true];</code>
* *
@@ -344,8 +339,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
*/ */
public static final class Record extends public static final class Record extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements RecordOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
RecordOrBuilder {
// Use Record.newBuilder() to construct. // Use Record.newBuilder() to construct.
private Record(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private Record(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -455,8 +451,9 @@ public final class DebugJvmProtoBuf {
break; break;
} }
case 50: { case 50: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
string_ = input.readBytes(); string_ = bs;
break; break;
} }
} }
@@ -616,7 +613,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional int32 range = 1 [default = 1];
public static final int RANGE_FIELD_NUMBER = 1; public static final int RANGE_FIELD_NUMBER = 1;
private int range_; private int range_;
/** /**
@@ -640,7 +636,6 @@ public final class DebugJvmProtoBuf {
return range_; return range_;
} }
// optional int32 predefined_index = 2;
public static final int PREDEFINED_INDEX_FIELD_NUMBER = 2; public static final int PREDEFINED_INDEX_FIELD_NUMBER = 2;
private int predefinedIndex_; private int predefinedIndex_;
/** /**
@@ -664,7 +659,6 @@ public final class DebugJvmProtoBuf {
return predefinedIndex_; return predefinedIndex_;
} }
// optional string string = 6;
public static final int STRING_FIELD_NUMBER = 6; public static final int STRING_FIELD_NUMBER = 6;
private java.lang.Object string_; private java.lang.Object string_;
/** /**
@@ -719,7 +713,6 @@ public final class DebugJvmProtoBuf {
} }
} }
// optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
public static final int OPERATION_FIELD_NUMBER = 3; public static final int OPERATION_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_; private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_;
/** /**
@@ -743,7 +736,6 @@ public final class DebugJvmProtoBuf {
return operation_; return operation_;
} }
// repeated int32 substring_index = 4 [packed = true];
public static final int SUBSTRING_INDEX_FIELD_NUMBER = 4; public static final int SUBSTRING_INDEX_FIELD_NUMBER = 4;
private java.util.List<java.lang.Integer> substringIndex_; private java.util.List<java.lang.Integer> substringIndex_;
/** /**
@@ -785,7 +777,6 @@ public final class DebugJvmProtoBuf {
} }
private int substringIndexMemoizedSerializedSize = -1; private int substringIndexMemoizedSerializedSize = -1;
// repeated int32 replace_char = 5 [packed = true];
public static final int REPLACE_CHAR_FIELD_NUMBER = 5; public static final int REPLACE_CHAR_FIELD_NUMBER = 5;
private java.util.List<java.lang.Integer> replaceChar_; private java.util.List<java.lang.Integer> replaceChar_;
/** /**
@@ -835,7 +826,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -1005,8 +997,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
@@ -1182,7 +1175,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional int32 range = 1 [default = 1];
private int range_ = 1; private int range_ = 1;
/** /**
* <code>optional int32 range = 1 [default = 1];</code> * <code>optional int32 range = 1 [default = 1];</code>
@@ -1231,7 +1223,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// optional int32 predefined_index = 2;
private int predefinedIndex_ ; private int predefinedIndex_ ;
/** /**
* <code>optional int32 predefined_index = 2;</code> * <code>optional int32 predefined_index = 2;</code>
@@ -1280,7 +1271,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// optional string string = 6;
private java.lang.Object string_ = ""; private java.lang.Object string_ = "";
/** /**
* <code>optional string string = 6;</code> * <code>optional string string = 6;</code>
@@ -1302,9 +1292,12 @@ public final class DebugJvmProtoBuf {
public java.lang.String getString() { public java.lang.String getString() {
java.lang.Object ref = string_; java.lang.Object ref = string_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref) org.jetbrains.kotlin.protobuf.ByteString bs =
.toStringUtf8(); (org.jetbrains.kotlin.protobuf.ByteString) ref;
string_ = s; java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
string_ = s;
}
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
@@ -1378,7 +1371,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE; private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];</code> * <code>optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];</code>
@@ -1430,7 +1422,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// repeated int32 substring_index = 4 [packed = true];
private java.util.List<java.lang.Integer> substringIndex_ = java.util.Collections.emptyList(); private java.util.List<java.lang.Integer> substringIndex_ = java.util.Collections.emptyList();
private void ensureSubstringIndexIsMutable() { private void ensureSubstringIndexIsMutable() {
if (!((bitField0_ & 0x00000010) == 0x00000010)) { if (!((bitField0_ & 0x00000010) == 0x00000010)) {
@@ -1518,7 +1509,8 @@ public final class DebugJvmProtoBuf {
public Builder addAllSubstringIndex( public Builder addAllSubstringIndex(
java.lang.Iterable<? extends java.lang.Integer> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureSubstringIndexIsMutable(); ensureSubstringIndexIsMutable();
super.addAll(values, substringIndex_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, substringIndex_);
onChanged(); onChanged();
return this; return this;
} }
@@ -1538,7 +1530,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// repeated int32 replace_char = 5 [packed = true];
private java.util.List<java.lang.Integer> replaceChar_ = java.util.Collections.emptyList(); private java.util.List<java.lang.Integer> replaceChar_ = java.util.Collections.emptyList();
private void ensureReplaceCharIsMutable() { private void ensureReplaceCharIsMutable() {
if (!((bitField0_ & 0x00000020) == 0x00000020)) { if (!((bitField0_ & 0x00000020) == 0x00000020)) {
@@ -1620,7 +1611,8 @@ public final class DebugJvmProtoBuf {
public Builder addAllReplaceChar( public Builder addAllReplaceChar(
java.lang.Iterable<? extends java.lang.Integer> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureReplaceCharIsMutable(); ensureReplaceCharIsMutable();
super.addAll(values, replaceChar_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, replaceChar_);
onChanged(); onChanged();
return this; return this;
} }
@@ -1650,7 +1642,6 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
} }
// repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
public static final int RECORD_FIELD_NUMBER = 1; public static final int RECORD_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> record_; private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> record_;
/** /**
@@ -1686,7 +1677,6 @@ public final class DebugJvmProtoBuf {
return record_.get(index); return record_.get(index);
} }
// repeated int32 local_name = 5 [packed = true];
public static final int LOCAL_NAME_FIELD_NUMBER = 5; public static final int LOCAL_NAME_FIELD_NUMBER = 5;
private java.util.List<java.lang.Integer> localName_; private java.util.List<java.lang.Integer> localName_;
/** /**
@@ -1729,7 +1719,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -1857,8 +1848,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
@@ -2019,7 +2011,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> record_ = private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> record_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureRecordIsMutable() { private void ensureRecordIsMutable() {
@@ -2161,7 +2152,8 @@ public final class DebugJvmProtoBuf {
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record> values) {
if (recordBuilder_ == null) { if (recordBuilder_ == null) {
ensureRecordIsMutable(); ensureRecordIsMutable();
super.addAll(values, record_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, record_);
onChanged(); onChanged();
} else { } else {
recordBuilder_.addAllMessages(values); recordBuilder_.addAllMessages(values);
@@ -2259,7 +2251,6 @@ public final class DebugJvmProtoBuf {
return recordBuilder_; return recordBuilder_;
} }
// repeated int32 local_name = 5 [packed = true];
private java.util.List<java.lang.Integer> localName_ = java.util.Collections.emptyList(); private java.util.List<java.lang.Integer> localName_ = java.util.Collections.emptyList();
private void ensureLocalNameIsMutable() { private void ensureLocalNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) { if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -2335,7 +2326,8 @@ public final class DebugJvmProtoBuf {
public Builder addAllLocalName( public Builder addAllLocalName(
java.lang.Iterable<? extends java.lang.Integer> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureLocalNameIsMutable(); ensureLocalNameIsMutable();
super.addAll(values, localName_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, localName_);
onChanged(); onChanged();
return this; return this;
} }
@@ -2364,10 +2356,10 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
} }
public interface JvmMethodSignatureOrBuilder public interface JvmMethodSignatureOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// optional int32 name = 1;
/** /**
* <code>optional int32 name = 1;</code> * <code>optional int32 name = 1;</code>
*/ */
@@ -2377,7 +2369,6 @@ public final class DebugJvmProtoBuf {
*/ */
int getName(); int getName();
// optional int32 desc = 2;
/** /**
* <code>optional int32 desc = 2;</code> * <code>optional int32 desc = 2;</code>
* *
@@ -2399,8 +2390,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
*/ */
public static final class JvmMethodSignature extends public static final class JvmMethodSignature extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements JvmMethodSignatureOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
JvmMethodSignatureOrBuilder {
// Use JvmMethodSignature.newBuilder() to construct. // Use JvmMethodSignature.newBuilder() to construct.
private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -2496,7 +2488,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1; public static final int NAME_FIELD_NUMBER = 1;
private int name_; private int name_;
/** /**
@@ -2512,7 +2503,6 @@ public final class DebugJvmProtoBuf {
return name_; return name_;
} }
// optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2; public static final int DESC_FIELD_NUMBER = 2;
private int desc_; private int desc_;
/** /**
@@ -2543,7 +2533,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -2657,8 +2648,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
@@ -2780,7 +2772,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional int32 name = 1;
private int name_ ; private int name_ ;
/** /**
* <code>optional int32 name = 1;</code> * <code>optional int32 name = 1;</code>
@@ -2813,7 +2804,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// optional int32 desc = 2;
private int desc_ ; private int desc_ ;
/** /**
* <code>optional int32 desc = 2;</code> * <code>optional int32 desc = 2;</code>
@@ -2873,10 +2863,10 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
} }
public interface JvmFieldSignatureOrBuilder public interface JvmFieldSignatureOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// optional int32 name = 1;
/** /**
* <code>optional int32 name = 1;</code> * <code>optional int32 name = 1;</code>
*/ */
@@ -2886,7 +2876,6 @@ public final class DebugJvmProtoBuf {
*/ */
int getName(); int getName();
// optional int32 desc = 2;
/** /**
* <code>optional int32 desc = 2;</code> * <code>optional int32 desc = 2;</code>
* *
@@ -2908,8 +2897,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
*/ */
public static final class JvmFieldSignature extends public static final class JvmFieldSignature extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements JvmFieldSignatureOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
JvmFieldSignatureOrBuilder {
// Use JvmFieldSignature.newBuilder() to construct. // Use JvmFieldSignature.newBuilder() to construct.
private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -3005,7 +2995,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional int32 name = 1;
public static final int NAME_FIELD_NUMBER = 1; public static final int NAME_FIELD_NUMBER = 1;
private int name_; private int name_;
/** /**
@@ -3021,7 +3010,6 @@ public final class DebugJvmProtoBuf {
return name_; return name_;
} }
// optional int32 desc = 2;
public static final int DESC_FIELD_NUMBER = 2; public static final int DESC_FIELD_NUMBER = 2;
private int desc_; private int desc_;
/** /**
@@ -3052,7 +3040,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -3166,8 +3155,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
@@ -3289,7 +3279,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional int32 name = 1;
private int name_ ; private int name_ ;
/** /**
* <code>optional int32 name = 1;</code> * <code>optional int32 name = 1;</code>
@@ -3322,7 +3311,6 @@ public final class DebugJvmProtoBuf {
return this; return this;
} }
// optional int32 desc = 2;
private int desc_ ; private int desc_ ;
/** /**
* <code>optional int32 desc = 2;</code> * <code>optional int32 desc = 2;</code>
@@ -3382,10 +3370,10 @@ public final class DebugJvmProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
} }
public interface JvmPropertySignatureOrBuilder public interface JvmPropertySignatureOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
// optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code> * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
*/ */
@@ -3399,7 +3387,6 @@ public final class DebugJvmProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder(); org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder();
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code> * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
* *
@@ -3425,7 +3412,6 @@ public final class DebugJvmProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder(); org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code> * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
*/ */
@@ -3439,7 +3425,6 @@ public final class DebugJvmProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder(); org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder();
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code> * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
*/ */
@@ -3457,8 +3442,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
*/ */
public static final class JvmPropertySignature extends public static final class JvmPropertySignature extends
org.jetbrains.kotlin.protobuf.GeneratedMessage org.jetbrains.kotlin.protobuf.GeneratedMessage implements
implements JvmPropertySignatureOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
JvmPropertySignatureOrBuilder {
// Use JvmPropertySignature.newBuilder() to construct. // Use JvmPropertySignature.newBuilder() to construct.
private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
@@ -3596,7 +3582,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
public static final int FIELD_FIELD_NUMBER = 1; public static final int FIELD_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_; private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_;
/** /**
@@ -3618,7 +3603,6 @@ public final class DebugJvmProtoBuf {
return field_; return field_;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2; public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_; private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_;
/** /**
@@ -3652,7 +3636,6 @@ public final class DebugJvmProtoBuf {
return syntheticMethod_; return syntheticMethod_;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
public static final int GETTER_FIELD_NUMBER = 3; public static final int GETTER_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_; private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_;
/** /**
@@ -3674,7 +3657,6 @@ public final class DebugJvmProtoBuf {
return getter_; return getter_;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
public static final int SETTER_FIELD_NUMBER = 4; public static final int SETTER_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_; private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_;
/** /**
@@ -3705,7 +3687,8 @@ public final class DebugJvmProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -3833,8 +3816,9 @@ public final class DebugJvmProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder { // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor; return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
@@ -4010,7 +3994,6 @@ public final class DebugJvmProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance(); private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_; org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_;
@@ -4119,7 +4102,7 @@ public final class DebugJvmProtoBuf {
if (fieldBuilder_ == null) { if (fieldBuilder_ == null) {
fieldBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< fieldBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>( org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>(
field_, getField(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
field_ = null; field_ = null;
@@ -4127,7 +4110,6 @@ public final class DebugJvmProtoBuf {
return fieldBuilder_; return fieldBuilder_;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance(); private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_; org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_;
@@ -4272,7 +4254,7 @@ public final class DebugJvmProtoBuf {
if (syntheticMethodBuilder_ == null) { if (syntheticMethodBuilder_ == null) {
syntheticMethodBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< syntheticMethodBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>( org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
syntheticMethod_, getSyntheticMethod(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
syntheticMethod_ = null; syntheticMethod_ = null;
@@ -4280,7 +4262,6 @@ public final class DebugJvmProtoBuf {
return syntheticMethodBuilder_; return syntheticMethodBuilder_;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance(); private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_; org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_;
@@ -4389,7 +4370,7 @@ public final class DebugJvmProtoBuf {
if (getterBuilder_ == null) { if (getterBuilder_ == null) {
getterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< getterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>( org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
getter_, getGetter(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
getter_ = null; getter_ = null;
@@ -4397,7 +4378,6 @@ public final class DebugJvmProtoBuf {
return getterBuilder_; return getterBuilder_;
} }
// optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance(); private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
private org.jetbrains.kotlin.protobuf.SingleFieldBuilder< private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_; org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_;
@@ -4506,7 +4486,7 @@ public final class DebugJvmProtoBuf {
if (setterBuilder_ == null) { if (setterBuilder_ == null) {
setterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder< setterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>( org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
setter_, getSetter(),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
setter_ = null; setter_ = null;
@@ -4594,6 +4574,10 @@ public final class DebugJvmProtoBuf {
public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101; public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
*
* <pre>
* If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
* </pre>
*/ */
public static final public static final
org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension< org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
@@ -4613,27 +4597,27 @@ public final class DebugJvmProtoBuf {
.newFileScopedGeneratedExtension( .newFileScopedGeneratedExtension(
java.lang.Integer.class, java.lang.Integer.class,
null); null);
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable;
private static org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor; internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
@@ -4699,65 +4683,69 @@ public final class DebugJvmProtoBuf {
"\022B\020DebugJvmProtoBuf" "\022B\020DebugJvmProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors( public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) { org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
descriptor = root; descriptor = root;
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor = return null;
getDescriptor().getMessageTypes().get(0); }
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new };
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
new java.lang.String[] { "Record", "LocalName", });
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
new java.lang.String[] { "Name", "Desc", });
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
getDescriptor().getMessageTypes().get(2);
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
new java.lang.String[] { "Name", "Desc", });
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
getDescriptor().getMessageTypes().get(3);
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
constructorSignature.internalInit(descriptor.getExtensions().get(0));
methodSignature.internalInit(descriptor.getExtensions().get(1));
propertySignature.internalInit(descriptor.getExtensions().get(2));
typeAnnotation.internalInit(descriptor.getExtensions().get(3));
isRaw.internalInit(descriptor.getExtensions().get(4));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
classModuleName.internalInit(descriptor.getExtensions().get(6));
packageModuleName.internalInit(descriptor.getExtensions().get(7));
org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
return registry;
}
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData, .internalBuildGeneratedFileFrom(descriptorData,
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(), org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(),
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(), org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
}, assigner); }, assigner);
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
new java.lang.String[] { "Record", "LocalName", });
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
new java.lang.String[] { "Name", "Desc", });
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
getDescriptor().getMessageTypes().get(2);
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
new java.lang.String[] { "Name", "Desc", });
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
getDescriptor().getMessageTypes().get(3);
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
constructorSignature.internalInit(descriptor.getExtensions().get(0));
methodSignature.internalInit(descriptor.getExtensions().get(1));
propertySignature.internalInit(descriptor.getExtensions().get(2));
typeAnnotation.internalInit(descriptor.getExtensions().get(3));
isRaw.internalInit(descriptor.getExtensions().get(4));
typeParameterAnnotation.internalInit(descriptor.getExtensions().get(5));
classModuleName.internalInit(descriptor.getExtensions().get(6));
packageModuleName.internalInit(descriptor.getExtensions().get(7));
org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
.internalUpdateFileDescriptor(descriptor, registry);
org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor();
org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
} }
// @@protoc_insertion_point(outer_class_scope) // @@protoc_insertion_point(outer_class_scope)
build.xml
+2 -2
View File
@@ -24,8 +24,8 @@
<property name="build.number" value="snapshot"/> <property name="build.number" value="snapshot"/>
<property name="bootstrap.build.no.tests" value="false"/> <property name="bootstrap.build.no.tests" value="false"/>
<property name="idea.sdk" value="${basedir}/ideaSDK"/> <property name="idea.sdk" value="${basedir}/ideaSDK"/>
<property name="protobuf.jar" value="${basedir}/dependencies/protobuf-2.5.0.jar"/> <property name="protobuf.jar" value="${basedir}/dependencies/protobuf-2.6.1.jar"/>
<property name="protobuf-lite.jar" value="${basedir}/dependencies/protobuf-2.5.0-lite.jar"/> <property name="protobuf-lite.jar" value="${basedir}/dependencies/protobuf-2.6.1-lite.jar"/>
<property name="javax.inject.jar" value="${basedir}/lib/javax.inject.jar"/> <property name="javax.inject.jar" value="${basedir}/lib/javax.inject.jar"/>
<property name="java.target" value="1.6"/> <property name="java.target" value="1.6"/>
compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt
+1 -1
View File
@@ -133,7 +133,7 @@ class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) {
private fun serializeClass(classDescriptor: ClassDescriptor) { private fun serializeClass(classDescriptor: ClassDescriptor) {
val classProto = DescriptorSerializer.createTopLevel(extension).classProto(classDescriptor).build() val classProto = DescriptorSerializer.createTopLevel(extension).classProto(classDescriptor).build()
proto.addClass(classProto) proto.addClass_(classProto)
serializeClasses(classDescriptor.unsubstitutedInnerClassesScope) serializeClasses(classDescriptor.unsubstitutedInnerClassesScope)
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
+83 -42
View File
@@ -8,10 +8,10 @@ public final class JvmPackageTable {
public static void registerAllExtensions( public static void registerAllExtensions(
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) { org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
} }
public interface PackageTableOrBuilder public interface PackageTableOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code> * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
*/ */
@@ -30,14 +30,15 @@ public final class JvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/ */
public static final class PackageTable extends public static final class PackageTable extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
implements PackageTableOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
PackageTableOrBuilder {
// Use PackageTable.newBuilder() to construct. // Use PackageTable.newBuilder() to construct.
private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields();
} }
private PackageTable(boolean noInit) {} private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final PackageTable defaultInstance; private static final PackageTable defaultInstance;
public static PackageTable getDefaultInstance() { public static PackageTable getDefaultInstance() {
@@ -48,12 +49,18 @@ public final class JvmPackageTable {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private PackageTable( private PackageTable(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields(); initFields();
int mutable_bitField0_ = 0; int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try { try {
boolean done = false; boolean done = false;
while (!done) { while (!done) {
@@ -63,7 +70,7 @@ public final class JvmPackageTable {
done = true; done = true;
break; break;
default: { default: {
if (!parseUnknownField(input, if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) { extensionRegistry, tag)) {
done = true; done = true;
} }
@@ -88,6 +95,13 @@ public final class JvmPackageTable {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
packageParts_ = java.util.Collections.unmodifiableList(packageParts_); packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
} }
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
} }
@@ -106,7 +120,6 @@ public final class JvmPackageTable {
return PARSER; return PARSER;
} }
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
public static final int PACKAGE_PARTS_FIELD_NUMBER = 1; public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_; private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_;
/** /**
@@ -148,7 +161,8 @@ public final class JvmPackageTable {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
for (int i = 0; i < getPackagePartsCount(); i++) { for (int i = 0; i < getPackagePartsCount(); i++) {
if (!getPackageParts(i).isInitialized()) { if (!getPackageParts(i).isInitialized()) {
@@ -166,6 +180,7 @@ public final class JvmPackageTable {
for (int i = 0; i < packageParts_.size(); i++) { for (int i = 0; i < packageParts_.size(); i++) {
output.writeMessage(1, packageParts_.get(i)); output.writeMessage(1, packageParts_.get(i));
} }
output.writeRawBytes(unknownFields);
} }
private int memoizedSerializedSize = -1; private int memoizedSerializedSize = -1;
@@ -178,6 +193,7 @@ public final class JvmPackageTable {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, packageParts_.get(i)); .computeMessageSize(1, packageParts_.get(i));
} }
size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
} }
@@ -255,7 +271,9 @@ public final class JvmPackageTable {
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable, Builder> org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable, Builder>
implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder { implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder() // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
@@ -313,6 +331,8 @@ public final class JvmPackageTable {
} }
} }
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this; return this;
} }
@@ -345,7 +365,6 @@ public final class JvmPackageTable {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_ = private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensurePackagePartsIsMutable() { private void ensurePackagePartsIsMutable() {
@@ -447,7 +466,8 @@ public final class JvmPackageTable {
public Builder addAllPackageParts( public Builder addAllPackageParts(
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> values) {
ensurePackagePartsIsMutable(); ensurePackagePartsIsMutable();
super.addAll(values, packageParts_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, packageParts_);
return this; return this;
} }
@@ -481,10 +501,10 @@ public final class JvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
} }
public interface PackagePartsOrBuilder public interface PackagePartsOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// required string package_fq_name = 1;
/** /**
* <code>required string package_fq_name = 1;</code> * <code>required string package_fq_name = 1;</code>
*/ */
@@ -499,12 +519,11 @@ public final class JvmPackageTable {
org.jetbrains.kotlin.protobuf.ByteString org.jetbrains.kotlin.protobuf.ByteString
getPackageFqNameBytes(); getPackageFqNameBytes();
// repeated string class_name = 2;
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
java.util.List<java.lang.String> org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList(); getClassNameList();
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
@@ -523,14 +542,15 @@ public final class JvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts} * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/ */
public static final class PackageParts extends public static final class PackageParts extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
implements PackagePartsOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
PackagePartsOrBuilder {
// Use PackageParts.newBuilder() to construct. // Use PackageParts.newBuilder() to construct.
private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields();
} }
private PackageParts(boolean noInit) {} private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final PackageParts defaultInstance; private static final PackageParts defaultInstance;
public static PackageParts getDefaultInstance() { public static PackageParts getDefaultInstance() {
@@ -541,12 +561,18 @@ public final class JvmPackageTable {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private PackageParts( private PackageParts(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields(); initFields();
int mutable_bitField0_ = 0; int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try { try {
boolean done = false; boolean done = false;
while (!done) { while (!done) {
@@ -556,23 +582,25 @@ public final class JvmPackageTable {
done = true; done = true;
break; break;
default: { default: {
if (!parseUnknownField(input, if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) { extensionRegistry, tag)) {
done = true; done = true;
} }
break; break;
} }
case 10: { case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
packageFqName_ = input.readBytes(); packageFqName_ = bs;
break; break;
} }
case 18: { case 18: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(); className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002; mutable_bitField0_ |= 0x00000002;
} }
className_.add(input.readBytes()); className_.add(bs);
break; break;
} }
} }
@@ -584,7 +612,14 @@ public final class JvmPackageTable {
e.getMessage()).setUnfinishedMessage(this); e.getMessage()).setUnfinishedMessage(this);
} finally { } finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_); className_ = className_.getUnmodifiableView();
}
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
} }
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
@@ -605,7 +640,6 @@ public final class JvmPackageTable {
} }
private int bitField0_; private int bitField0_;
// required string package_fq_name = 1;
public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1; public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
private java.lang.Object packageFqName_; private java.lang.Object packageFqName_;
/** /**
@@ -648,13 +682,12 @@ public final class JvmPackageTable {
} }
} }
// repeated string class_name = 2;
public static final int CLASS_NAME_FIELD_NUMBER = 2; public static final int CLASS_NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_; private org.jetbrains.kotlin.protobuf.LazyStringList className_;
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() { getClassNameList() {
return className_; return className_;
} }
@@ -685,7 +718,8 @@ public final class JvmPackageTable {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (!hasPackageFqName()) { if (!hasPackageFqName()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -704,6 +738,7 @@ public final class JvmPackageTable {
for (int i = 0; i < className_.size(); i++) { for (int i = 0; i < className_.size(); i++) {
output.writeBytes(2, className_.getByteString(i)); output.writeBytes(2, className_.getByteString(i));
} }
output.writeRawBytes(unknownFields);
} }
private int memoizedSerializedSize = -1; private int memoizedSerializedSize = -1;
@@ -725,6 +760,7 @@ public final class JvmPackageTable {
size += dataSize; size += dataSize;
size += 1 * getClassNameList().size(); size += 1 * getClassNameList().size();
} }
size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
} }
@@ -802,7 +838,9 @@ public final class JvmPackageTable {
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts, Builder> org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts, Builder>
implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder { implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder() // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
@@ -848,8 +886,7 @@ public final class JvmPackageTable {
} }
result.packageFqName_ = packageFqName_; result.packageFqName_ = packageFqName_;
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList( className_ = className_.getUnmodifiableView();
className_);
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
} }
result.className_ = className_; result.className_ = className_;
@@ -874,6 +911,8 @@ public final class JvmPackageTable {
} }
} }
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this; return this;
} }
@@ -904,7 +943,6 @@ public final class JvmPackageTable {
} }
private int bitField0_; private int bitField0_;
// required string package_fq_name = 1;
private java.lang.Object packageFqName_ = ""; private java.lang.Object packageFqName_ = "";
/** /**
* <code>required string package_fq_name = 1;</code> * <code>required string package_fq_name = 1;</code>
@@ -918,9 +956,12 @@ public final class JvmPackageTable {
public java.lang.String getPackageFqName() { public java.lang.String getPackageFqName() {
java.lang.Object ref = packageFqName_; java.lang.Object ref = packageFqName_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref) org.jetbrains.kotlin.protobuf.ByteString bs =
.toStringUtf8(); (org.jetbrains.kotlin.protobuf.ByteString) ref;
packageFqName_ = s; java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
packageFqName_ = s;
}
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
@@ -978,7 +1019,6 @@ public final class JvmPackageTable {
return this; return this;
} }
// repeated string class_name = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY; private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureClassNameIsMutable() { private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) { if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -989,9 +1029,9 @@ public final class JvmPackageTable {
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() { getClassNameList() {
return java.util.Collections.unmodifiableList(className_); return className_.getUnmodifiableView();
} }
/** /**
* <code>repeated string class_name = 2;</code> * <code>repeated string class_name = 2;</code>
@@ -1044,7 +1084,8 @@ public final class JvmPackageTable {
public Builder addAllClassName( public Builder addAllClassName(
java.lang.Iterable<java.lang.String> values) { java.lang.Iterable<java.lang.String> values) {
ensureClassNameIsMutable(); ensureClassNameIsMutable();
super.addAll(values, className_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, className_);
return this; return this;
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+195 -110
View File
File diff suppressed because it is too large Load Diff
core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsClassDataFinder.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class BuiltInsClassDataFinder(
private val nameResolver: NameResolver private val nameResolver: NameResolver
) : ClassDataFinder { ) : ClassDataFinder {
private val classIdToProto = private val classIdToProto =
proto.classList.associateBy { klass -> proto.class_List.associateBy { klass ->
nameResolver.getClassId(klass.fqName) nameResolver.getClassId(klass.fqName)
} }
core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+621 -514
View File
File diff suppressed because it is too large Load Diff
core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+121 -100
View File
@@ -18,10 +18,10 @@ public final class BuiltInsProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeAnnotation); registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeAnnotation);
registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeParameterAnnotation); registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeParameterAnnotation);
} }
public interface BuiltInsOrBuilder public interface BuiltInsOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code> * <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code>
*/ */
@@ -31,7 +31,6 @@ public final class BuiltInsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings(); org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings();
// optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code> * <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code>
*/ */
@@ -41,7 +40,6 @@ public final class BuiltInsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames(); org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames();
// optional .org.jetbrains.kotlin.serialization.Package package = 3;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code> * <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code>
*/ */
@@ -51,33 +49,33 @@ public final class BuiltInsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage(); org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage();
// repeated .org.jetbrains.kotlin.serialization.Class class = 4;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class>
getClassList(); getClass_List();
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass(int index); org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index);
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
int getClassCount(); int getClass_Count();
} }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns} * Protobuf type {@code org.jetbrains.kotlin.serialization.builtins.BuiltIns}
*/ */
public static final class BuiltIns extends public static final class BuiltIns extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
implements BuiltInsOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
BuiltInsOrBuilder {
// Use BuiltIns.newBuilder() to construct. // Use BuiltIns.newBuilder() to construct.
private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private BuiltIns(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields();
} }
private BuiltIns(boolean noInit) {} private BuiltIns(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final BuiltIns defaultInstance; private static final BuiltIns defaultInstance;
public static BuiltIns getDefaultInstance() { public static BuiltIns getDefaultInstance() {
@@ -88,12 +86,18 @@ public final class BuiltInsProtoBuf {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private BuiltIns( private BuiltIns(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields(); initFields();
int mutable_bitField0_ = 0; int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try { try {
boolean done = false; boolean done = false;
while (!done) { while (!done) {
@@ -103,7 +107,7 @@ public final class BuiltInsProtoBuf {
done = true; done = true;
break; break;
default: { default: {
if (!parseUnknownField(input, if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) { extensionRegistry, tag)) {
done = true; done = true;
} }
@@ -150,10 +154,10 @@ public final class BuiltInsProtoBuf {
} }
case 34: { case 34: {
if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>(); class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>();
mutable_bitField0_ |= 0x00000008; mutable_bitField0_ |= 0x00000008;
} }
class_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry)); class__.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry));
break; break;
} }
} }
@@ -165,7 +169,14 @@ public final class BuiltInsProtoBuf {
e.getMessage()).setUnfinishedMessage(this); e.getMessage()).setUnfinishedMessage(this);
} finally { } finally {
if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
class_ = java.util.Collections.unmodifiableList(class_); class__ = java.util.Collections.unmodifiableList(class__);
}
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
} }
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
@@ -186,7 +197,6 @@ public final class BuiltInsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
public static final int STRINGS_FIELD_NUMBER = 1; public static final int STRINGS_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_; private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_;
/** /**
@@ -202,7 +212,6 @@ public final class BuiltInsProtoBuf {
return strings_; return strings_;
} }
// optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2; public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_; private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_;
/** /**
@@ -218,7 +227,6 @@ public final class BuiltInsProtoBuf {
return qualifiedNames_; return qualifiedNames_;
} }
// optional .org.jetbrains.kotlin.serialization.Package package = 3;
public static final int PACKAGE_FIELD_NUMBER = 3; public static final int PACKAGE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_; private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_;
/** /**
@@ -234,52 +242,52 @@ public final class BuiltInsProtoBuf {
return package_; return package_;
} }
// repeated .org.jetbrains.kotlin.serialization.Class class = 4;
public static final int CLASS_FIELD_NUMBER = 4; public static final int CLASS_FIELD_NUMBER = 4;
private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class_; private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class__;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClassList() { public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClass_List() {
return class_; return class__;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder> public java.util.List<? extends org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder>
getClassOrBuilderList() { getClass_OrBuilderList() {
return class_; return class__;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public int getClassCount() { public int getClass_Count() {
return class_.size(); return class__.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass(int index) { public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) {
return class_.get(index); return class__.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder getClassOrBuilder( public org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder getClass_OrBuilder(
int index) { int index) {
return class_.get(index); return class__.get(index);
} }
private void initFields() { private void initFields() {
strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance(); strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance(); qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
class_ = java.util.Collections.emptyList(); class__ = java.util.Collections.emptyList();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (hasQualifiedNames()) { if (hasQualifiedNames()) {
if (!getQualifiedNames().isInitialized()) { if (!getQualifiedNames().isInitialized()) {
@@ -293,8 +301,8 @@ public final class BuiltInsProtoBuf {
return false; return false;
} }
} }
for (int i = 0; i < getClassCount(); i++) { for (int i = 0; i < getClass_Count(); i++) {
if (!getClass(i).isInitialized()) { if (!getClass_(i).isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
@@ -315,9 +323,10 @@ public final class BuiltInsProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, package_); output.writeMessage(3, package_);
} }
for (int i = 0; i < class_.size(); i++) { for (int i = 0; i < class__.size(); i++) {
output.writeMessage(4, class_.get(i)); output.writeMessage(4, class__.get(i));
} }
output.writeRawBytes(unknownFields);
} }
private int memoizedSerializedSize = -1; private int memoizedSerializedSize = -1;
@@ -338,10 +347,11 @@ public final class BuiltInsProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, package_); .computeMessageSize(3, package_);
} }
for (int i = 0; i < class_.size(); i++) { for (int i = 0; i < class__.size(); i++) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, class_.get(i)); .computeMessageSize(4, class__.get(i));
} }
size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
} }
@@ -419,7 +429,9 @@ public final class BuiltInsProtoBuf {
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns, Builder> org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns, Builder>
implements org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltInsOrBuilder { implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.builtins.BuiltIns)
org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltInsOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns.newBuilder() // Construct using org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.BuiltIns.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
@@ -439,7 +451,7 @@ public final class BuiltInsProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
class_ = java.util.Collections.emptyList(); class__ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
return this; return this;
} }
@@ -477,10 +489,10 @@ public final class BuiltInsProtoBuf {
} }
result.package_ = package_; result.package_ = package_;
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
class_ = java.util.Collections.unmodifiableList(class_); class__ = java.util.Collections.unmodifiableList(class__);
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
} }
result.class_ = class_; result.class__ = class__;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
return result; return result;
} }
@@ -496,16 +508,18 @@ public final class BuiltInsProtoBuf {
if (other.hasPackage()) { if (other.hasPackage()) {
mergePackage(other.getPackage()); mergePackage(other.getPackage());
} }
if (!other.class_.isEmpty()) { if (!other.class__.isEmpty()) {
if (class_.isEmpty()) { if (class__.isEmpty()) {
class_ = other.class_; class__ = other.class__;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
} else { } else {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.addAll(other.class_); class__.addAll(other.class__);
} }
} }
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this; return this;
} }
@@ -522,8 +536,8 @@ public final class BuiltInsProtoBuf {
return false; return false;
} }
} }
for (int i = 0; i < getClassCount(); i++) { for (int i = 0; i < getClass_Count(); i++) {
if (!getClass(i).isInitialized()) { if (!getClass_(i).isInitialized()) {
return false; return false;
} }
@@ -550,7 +564,6 @@ public final class BuiltInsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance(); private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code> * <code>optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;</code>
@@ -611,7 +624,6 @@ public final class BuiltInsProtoBuf {
return this; return this;
} }
// optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance(); private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code> * <code>optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;</code>
@@ -672,7 +684,6 @@ public final class BuiltInsProtoBuf {
return this; return this;
} }
// optional .org.jetbrains.kotlin.serialization.Package package = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(); private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code> * <code>optional .org.jetbrains.kotlin.serialization.Package package = 3;</code>
@@ -733,12 +744,11 @@ public final class BuiltInsProtoBuf {
return this; return this;
} }
// repeated .org.jetbrains.kotlin.serialization.Class class = 4; private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class__ =
private java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> class_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureClassIsMutable() { private void ensureClass_IsMutable() {
if (!((bitField0_ & 0x00000008) == 0x00000008)) { if (!((bitField0_ & 0x00000008) == 0x00000008)) {
class_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>(class_); class__ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.ProtoBuf.Class>(class__);
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
} }
} }
@@ -746,104 +756,105 @@ public final class BuiltInsProtoBuf {
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClassList() { public java.util.List<org.jetbrains.kotlin.serialization.ProtoBuf.Class> getClass_List() {
return java.util.Collections.unmodifiableList(class_); return java.util.Collections.unmodifiableList(class__);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public int getClassCount() { public int getClass_Count() {
return class_.size(); return class__.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass(int index) { public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) {
return class_.get(index); return class__.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder setClass( public Builder setClass_(
int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) { int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureClassIsMutable(); ensureClass_IsMutable();
class_.set(index, value); class__.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder setClass( public Builder setClass_(
int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) { int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.set(index, builderForValue.build()); class__.set(index, builderForValue.build());
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) { public Builder addClass_(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(value); class__.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass( public Builder addClass_(
int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) { int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(index, value); class__.add(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass( public Builder addClass_(
org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) { org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(builderForValue.build()); class__.add(builderForValue.build());
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addClass( public Builder addClass_(
int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) { int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.add(index, builderForValue.build()); class__.add(index, builderForValue.build());
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder addAllClass( public Builder addAllClass_(
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Class> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.ProtoBuf.Class> values) {
ensureClassIsMutable(); ensureClass_IsMutable();
super.addAll(values, class_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, class__);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder clearClass() { public Builder clearClass_() {
class_ = java.util.Collections.emptyList(); class__ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
return this; return this;
@@ -851,9 +862,9 @@ public final class BuiltInsProtoBuf {
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code> * <code>repeated .org.jetbrains.kotlin.serialization.Class class = 4;</code>
*/ */
public Builder removeClass(int index) { public Builder removeClass_(int index) {
ensureClassIsMutable(); ensureClass_IsMutable();
class_.remove(index); class__.remove(index);
return this; return this;
} }
@@ -883,7 +894,8 @@ public final class BuiltInsProtoBuf {
null, null,
null, null,
151, 151,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32); org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
java.lang.Integer.class);
public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150; public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Class { ... }</code>
@@ -898,7 +910,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150; public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
@@ -913,7 +926,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150; public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Function { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Function { ... }</code>
@@ -928,7 +942,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150; public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -943,7 +958,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151; public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -958,7 +974,8 @@ public final class BuiltInsProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(), org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
null, null,
151, 151,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE); org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.class);
public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150; public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }</code>
@@ -973,7 +990,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150; public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
@@ -988,7 +1006,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150; public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
@@ -1003,7 +1022,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150; public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }</code>
@@ -1018,7 +1038,8 @@ public final class BuiltInsProtoBuf {
null, null,
150, 150,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
static { static {
} }
generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+4 -3
View File
@@ -23,7 +23,7 @@ import java.io.File
import java.util.regex.Pattern import java.util.regex.Pattern
// This file generates protobuf classes from formal description. // This file generates protobuf classes from formal description.
// To run it, you'll need protoc (protobuf compiler) 2.5.0 installed. // To run it, you'll need protoc (protobuf compiler) 2.6.1 installed.
// //
// * Windows: download and unpack from here: https://code.google.com/p/protobuf/downloads/list // * Windows: download and unpack from here: https://code.google.com/p/protobuf/downloads/list
// * Ubuntu: install "protobuf-compiler" package // * Ubuntu: install "protobuf-compiler" package
@@ -70,6 +70,7 @@ fun main(args: Array<String>) {
modifyAndExecProtoc(protoPath) modifyAndExecProtoc(protoPath)
} }
println()
println("Do not forget to run GenerateProtoBufCompare") println("Do not forget to run GenerateProtoBufCompare")
} }
catch (e: Throwable) { catch (e: Throwable) {
@@ -89,8 +90,8 @@ private fun checkVersion() {
if (version.isEmpty()) { if (version.isEmpty()) {
throw AssertionError("Output is empty, stderr: ${processOutput.stderr}") throw AssertionError("Output is empty, stderr: ${processOutput.stderr}")
} }
if (version != "libprotoc 2.5.0") { if (version != "libprotoc 2.6.1") {
throw AssertionError("Expected protoc 2.5.0, but was: $version") throw AssertionError("Expected protoc 2.6.1, but was: $version")
} }
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt
+2 -2
View File
@@ -96,10 +96,10 @@ sealed class BuiltInDefinitionFile {
val packageFqName = nameResolver.getPackageFqName(proto.`package`.getExtension(BuiltInsProtoBuf.packageFqName)) val packageFqName = nameResolver.getPackageFqName(proto.`package`.getExtension(BuiltInsProtoBuf.packageFqName))
val classesToDecompile = val classesToDecompile =
if (FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) proto.classList.filter { classProto -> if (FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) proto.class_List.filter { classProto ->
shouldDecompileBuiltInClass(nameResolver.getClassId(classProto.fqName)) shouldDecompileBuiltInClass(nameResolver.getClassId(classProto.fqName))
} }
else proto.classList else proto.class_List
private fun shouldDecompileBuiltInClass(classId: ClassId): Boolean { private fun shouldDecompileBuiltInClass(classId: ClassId): Boolean {
if (classId.isNestedClass) return false if (classId.isNestedClass) return false
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+138 -71
View File
@@ -17,10 +17,10 @@ public final class JsProtoBuf {
registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeAnnotation); registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeAnnotation);
registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeParameterAnnotation); registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeParameterAnnotation);
} }
public interface ClassesOrBuilder public interface ClassesOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// repeated int32 class_name = 1 [packed = true];
/** /**
* <code>repeated int32 class_name = 1 [packed = true];</code> * <code>repeated int32 class_name = 1 [packed = true];</code>
* *
@@ -50,14 +50,15 @@ public final class JsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
*/ */
public static final class Classes extends public static final class Classes extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
implements ClassesOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
ClassesOrBuilder {
// Use Classes.newBuilder() to construct. // Use Classes.newBuilder() to construct.
private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields();
} }
private Classes(boolean noInit) {} private Classes(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Classes defaultInstance; private static final Classes defaultInstance;
public static Classes getDefaultInstance() { public static Classes getDefaultInstance() {
@@ -68,12 +69,18 @@ public final class JsProtoBuf {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Classes( private Classes(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields(); initFields();
int mutable_bitField0_ = 0; int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try { try {
boolean done = false; boolean done = false;
while (!done) { while (!done) {
@@ -83,7 +90,7 @@ public final class JsProtoBuf {
done = true; done = true;
break; break;
default: { default: {
if (!parseUnknownField(input, if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) { extensionRegistry, tag)) {
done = true; done = true;
} }
@@ -121,6 +128,13 @@ public final class JsProtoBuf {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
className_ = java.util.Collections.unmodifiableList(className_); className_ = java.util.Collections.unmodifiableList(className_);
} }
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
} }
@@ -139,7 +153,6 @@ public final class JsProtoBuf {
return PARSER; return PARSER;
} }
// repeated int32 class_name = 1 [packed = true];
public static final int CLASS_NAME_FIELD_NUMBER = 1; public static final int CLASS_NAME_FIELD_NUMBER = 1;
private java.util.List<java.lang.Integer> className_; private java.util.List<java.lang.Integer> className_;
/** /**
@@ -181,7 +194,8 @@ public final class JsProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
@@ -197,6 +211,7 @@ public final class JsProtoBuf {
for (int i = 0; i < className_.size(); i++) { for (int i = 0; i < className_.size(); i++) {
output.writeInt32NoTag(className_.get(i)); output.writeInt32NoTag(className_.get(i));
} }
output.writeRawBytes(unknownFields);
} }
private int memoizedSerializedSize = -1; private int memoizedSerializedSize = -1;
@@ -219,6 +234,7 @@ public final class JsProtoBuf {
} }
classNameMemoizedSerializedSize = dataSize; classNameMemoizedSerializedSize = dataSize;
} }
size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
} }
@@ -296,7 +312,9 @@ public final class JsProtoBuf {
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes, Builder> org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes, Builder>
implements org.jetbrains.kotlin.serialization.js.JsProtoBuf.ClassesOrBuilder { implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
org.jetbrains.kotlin.serialization.js.JsProtoBuf.ClassesOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes.newBuilder() // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
@@ -354,6 +372,8 @@ public final class JsProtoBuf {
} }
} }
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this; return this;
} }
@@ -380,7 +400,6 @@ public final class JsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated int32 class_name = 1 [packed = true];
private java.util.List<java.lang.Integer> className_ = java.util.Collections.emptyList(); private java.util.List<java.lang.Integer> className_ = java.util.Collections.emptyList();
private void ensureClassNameIsMutable() { private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) { if (!((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -456,7 +475,8 @@ public final class JsProtoBuf {
public Builder addAllClassName( public Builder addAllClassName(
java.lang.Iterable<? extends java.lang.Integer> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureClassNameIsMutable(); ensureClassNameIsMutable();
super.addAll(values, className_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, className_);
return this; return this;
} }
@@ -485,10 +505,10 @@ public final class JsProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
} }
public interface LibraryOrBuilder public interface LibraryOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
/** /**
* <code>repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;</code> * <code>repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;</code>
*/ */
@@ -503,7 +523,6 @@ public final class JsProtoBuf {
*/ */
int getEntryCount(); int getEntryCount();
// optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code> * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
*/ */
@@ -513,12 +532,11 @@ public final class JsProtoBuf {
*/ */
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind(); org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind();
// repeated string importedModules = 3;
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
java.util.List<java.lang.String> org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList(); getImportedModulesList();
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
@@ -537,14 +555,15 @@ public final class JsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
*/ */
public static final class Library extends public static final class Library extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
implements LibraryOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
LibraryOrBuilder {
// Use Library.newBuilder() to construct. // Use Library.newBuilder() to construct.
private Library(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private Library(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields();
} }
private Library(boolean noInit) {} private Library(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Library defaultInstance; private static final Library defaultInstance;
public static Library getDefaultInstance() { public static Library getDefaultInstance() {
@@ -555,12 +574,18 @@ public final class JsProtoBuf {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Library( private Library(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields(); initFields();
int mutable_bitField0_ = 0; int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try { try {
boolean done = false; boolean done = false;
while (!done) { while (!done) {
@@ -570,7 +595,7 @@ public final class JsProtoBuf {
done = true; done = true;
break; break;
default: { default: {
if (!parseUnknownField(input, if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) { extensionRegistry, tag)) {
done = true; done = true;
} }
@@ -587,18 +612,22 @@ public final class JsProtoBuf {
case 16: { case 16: {
int rawValue = input.readEnum(); int rawValue = input.readEnum();
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind value = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.valueOf(rawValue); org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind value = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.valueOf(rawValue);
if (value != null) { if (value == null) {
unknownFieldsCodedOutput.writeRawVarint32(tag);
unknownFieldsCodedOutput.writeRawVarint32(rawValue);
} else {
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
kind_ = value; kind_ = value;
} }
break; break;
} }
case 26: { case 26: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(); importedModules_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000004; mutable_bitField0_ |= 0x00000004;
} }
importedModules_.add(input.readBytes()); importedModules_.add(bs);
break; break;
} }
} }
@@ -613,7 +642,14 @@ public final class JsProtoBuf {
entry_ = java.util.Collections.unmodifiableList(entry_); entry_ = java.util.Collections.unmodifiableList(entry_);
} }
if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(importedModules_); importedModules_ = importedModules_.getUnmodifiableView();
}
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
} }
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
@@ -707,10 +743,10 @@ public final class JsProtoBuf {
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind) // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
} }
public interface FileEntryOrBuilder public interface FileEntryOrBuilder extends
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// required string path = 1;
/** /**
* <code>required string path = 1;</code> * <code>required string path = 1;</code>
*/ */
@@ -725,7 +761,6 @@ public final class JsProtoBuf {
org.jetbrains.kotlin.protobuf.ByteString org.jetbrains.kotlin.protobuf.ByteString
getPathBytes(); getPathBytes();
// required bytes content = 2;
/** /**
* <code>required bytes content = 2;</code> * <code>required bytes content = 2;</code>
*/ */
@@ -739,14 +774,15 @@ public final class JsProtoBuf {
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library.FileEntry}
*/ */
public static final class FileEntry extends public static final class FileEntry extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
implements FileEntryOrBuilder { // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
FileEntryOrBuilder {
// Use FileEntry.newBuilder() to construct. // Use FileEntry.newBuilder() to construct.
private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private FileEntry(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields();
} }
private FileEntry(boolean noInit) {} private FileEntry(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final FileEntry defaultInstance; private static final FileEntry defaultInstance;
public static FileEntry getDefaultInstance() { public static FileEntry getDefaultInstance() {
@@ -757,12 +793,18 @@ public final class JsProtoBuf {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private FileEntry( private FileEntry(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields(); initFields();
int mutable_bitField0_ = 0; int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try { try {
boolean done = false; boolean done = false;
while (!done) { while (!done) {
@@ -772,15 +814,16 @@ public final class JsProtoBuf {
done = true; done = true;
break; break;
default: { default: {
if (!parseUnknownField(input, if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) { extensionRegistry, tag)) {
done = true; done = true;
} }
break; break;
} }
case 10: { case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
path_ = input.readBytes(); path_ = bs;
break; break;
} }
case 18: { case 18: {
@@ -796,6 +839,13 @@ public final class JsProtoBuf {
throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this); e.getMessage()).setUnfinishedMessage(this);
} finally { } finally {
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
} }
@@ -815,7 +865,6 @@ public final class JsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// required string path = 1;
public static final int PATH_FIELD_NUMBER = 1; public static final int PATH_FIELD_NUMBER = 1;
private java.lang.Object path_; private java.lang.Object path_;
/** /**
@@ -858,7 +907,6 @@ public final class JsProtoBuf {
} }
} }
// required bytes content = 2;
public static final int CONTENT_FIELD_NUMBER = 2; public static final int CONTENT_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.ByteString content_; private org.jetbrains.kotlin.protobuf.ByteString content_;
/** /**
@@ -881,7 +929,8 @@ public final class JsProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (!hasPath()) { if (!hasPath()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -904,6 +953,7 @@ public final class JsProtoBuf {
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeBytes(2, content_); output.writeBytes(2, content_);
} }
output.writeRawBytes(unknownFields);
} }
private int memoizedSerializedSize = -1; private int memoizedSerializedSize = -1;
@@ -920,6 +970,7 @@ public final class JsProtoBuf {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBytesSize(2, content_); .computeBytesSize(2, content_);
} }
size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
} }
@@ -997,7 +1048,9 @@ public final class JsProtoBuf {
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry, Builder> org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry, Builder>
implements org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntryOrBuilder { implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library.FileEntry)
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntryOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry.newBuilder() // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
@@ -1060,6 +1113,8 @@ public final class JsProtoBuf {
if (other.hasContent()) { if (other.hasContent()) {
setContent(other.getContent()); setContent(other.getContent());
} }
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this; return this;
} }
@@ -1094,7 +1149,6 @@ public final class JsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// required string path = 1;
private java.lang.Object path_ = ""; private java.lang.Object path_ = "";
/** /**
* <code>required string path = 1;</code> * <code>required string path = 1;</code>
@@ -1108,9 +1162,12 @@ public final class JsProtoBuf {
public java.lang.String getPath() { public java.lang.String getPath() {
java.lang.Object ref = path_; java.lang.Object ref = path_;
if (!(ref instanceof java.lang.String)) { if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref) org.jetbrains.kotlin.protobuf.ByteString bs =
.toStringUtf8(); (org.jetbrains.kotlin.protobuf.ByteString) ref;
path_ = s; java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
path_ = s;
}
return s; return s;
} else { } else {
return (java.lang.String) ref; return (java.lang.String) ref;
@@ -1168,7 +1225,6 @@ public final class JsProtoBuf {
return this; return this;
} }
// required bytes content = 2;
private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY; private org.jetbrains.kotlin.protobuf.ByteString content_ = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;
/** /**
* <code>required bytes content = 2;</code> * <code>required bytes content = 2;</code>
@@ -1216,7 +1272,6 @@ public final class JsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
public static final int ENTRY_FIELD_NUMBER = 1; public static final int ENTRY_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> entry_; private java.util.List<org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> entry_;
/** /**
@@ -1252,7 +1307,6 @@ public final class JsProtoBuf {
return entry_.get(index); return entry_.get(index);
} }
// optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
public static final int KIND_FIELD_NUMBER = 2; public static final int KIND_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_; private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_;
/** /**
@@ -1268,13 +1322,12 @@ public final class JsProtoBuf {
return kind_; return kind_;
} }
// repeated string importedModules = 3;
public static final int IMPORTEDMODULES_FIELD_NUMBER = 3; public static final int IMPORTEDMODULES_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_; private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_;
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() { getImportedModulesList() {
return importedModules_; return importedModules_;
} }
@@ -1306,7 +1359,8 @@ public final class JsProtoBuf {
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
for (int i = 0; i < getEntryCount(); i++) { for (int i = 0; i < getEntryCount(); i++) {
if (!getEntry(i).isInitialized()) { if (!getEntry(i).isInitialized()) {
@@ -1330,6 +1384,7 @@ public final class JsProtoBuf {
for (int i = 0; i < importedModules_.size(); i++) { for (int i = 0; i < importedModules_.size(); i++) {
output.writeBytes(3, importedModules_.getByteString(i)); output.writeBytes(3, importedModules_.getByteString(i));
} }
output.writeRawBytes(unknownFields);
} }
private int memoizedSerializedSize = -1; private int memoizedSerializedSize = -1;
@@ -1355,6 +1410,7 @@ public final class JsProtoBuf {
size += dataSize; size += dataSize;
size += 1 * getImportedModulesList().size(); size += 1 * getImportedModulesList().size();
} }
size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
} }
@@ -1432,7 +1488,9 @@ public final class JsProtoBuf {
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library, Builder> org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library, Builder>
implements org.jetbrains.kotlin.serialization.js.JsProtoBuf.LibraryOrBuilder { implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
org.jetbrains.kotlin.serialization.js.JsProtoBuf.LibraryOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.newBuilder() // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
@@ -1485,8 +1543,7 @@ public final class JsProtoBuf {
} }
result.kind_ = kind_; result.kind_ = kind_;
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
importedModules_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList( importedModules_ = importedModules_.getUnmodifiableView();
importedModules_);
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
} }
result.importedModules_ = importedModules_; result.importedModules_ = importedModules_;
@@ -1519,6 +1576,8 @@ public final class JsProtoBuf {
} }
} }
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this; return this;
} }
@@ -1551,7 +1610,6 @@ public final class JsProtoBuf {
} }
private int bitField0_; private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.js.Library.FileEntry entry = 1;
private java.util.List<org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> entry_ = private java.util.List<org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> entry_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureEntryIsMutable() { private void ensureEntryIsMutable() {
@@ -1653,7 +1711,8 @@ public final class JsProtoBuf {
public Builder addAllEntry( public Builder addAllEntry(
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> values) { java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.FileEntry> values) {
ensureEntryIsMutable(); ensureEntryIsMutable();
super.addAll(values, entry_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, entry_);
return this; return this;
} }
@@ -1676,7 +1735,6 @@ public final class JsProtoBuf {
return this; return this;
} }
// optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];
private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN; private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
/** /**
* <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code> * <code>optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 2 [default = PLAIN];</code>
@@ -1712,7 +1770,6 @@ public final class JsProtoBuf {
return this; return this;
} }
// repeated string importedModules = 3;
private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY; private org.jetbrains.kotlin.protobuf.LazyStringList importedModules_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureImportedModulesIsMutable() { private void ensureImportedModulesIsMutable() {
if (!((bitField0_ & 0x00000004) == 0x00000004)) { if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -1723,9 +1780,9 @@ public final class JsProtoBuf {
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
*/ */
public java.util.List<java.lang.String> public org.jetbrains.kotlin.protobuf.ProtocolStringList
getImportedModulesList() { getImportedModulesList() {
return java.util.Collections.unmodifiableList(importedModules_); return importedModules_.getUnmodifiableView();
} }
/** /**
* <code>repeated string importedModules = 3;</code> * <code>repeated string importedModules = 3;</code>
@@ -1778,7 +1835,8 @@ public final class JsProtoBuf {
public Builder addAllImportedModules( public Builder addAllImportedModules(
java.lang.Iterable<java.lang.String> values) { java.lang.Iterable<java.lang.String> values) {
ensureImportedModulesIsMutable(); ensureImportedModulesIsMutable();
super.addAll(values, importedModules_); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, importedModules_);
return this; return this;
} }
@@ -1830,7 +1888,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130; public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Constructor { ... }</code>
@@ -1845,7 +1904,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 130; public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Function { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Function { ... }</code>
@@ -1860,7 +1920,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 130; public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -1875,7 +1936,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 131; public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Property { ... }</code>
@@ -1890,7 +1952,8 @@ public final class JsProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(), org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
null, null,
131, 131,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE); org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.class);
public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 130; public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }</code>
@@ -1905,7 +1968,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130; public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }</code>
@@ -1920,7 +1984,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int TYPE_ANNOTATION_FIELD_NUMBER = 130; public static final int TYPE_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.Type { ... }</code>
@@ -1935,7 +2000,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 130; public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
/** /**
* <code>extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }</code> * <code>extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }</code>
@@ -1950,7 +2016,8 @@ public final class JsProtoBuf {
null, null,
130, 130,
org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE, org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
false); false,
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
static { static {
} }
ultimate/.idea/libraries/protobuf.xml
Generated
+2 -2
View File
@@ -1,11 +1,11 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="protobuf"> <library name="protobuf">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.5.0.jar!/" /> <root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.6.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.5.0-sources.jar!/" /> <root url="jar://$PROJECT_DIR$/../dependencies/protobuf-2.6.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>
update_dependencies.xml
+11 -9
View File
@@ -435,27 +435,29 @@
</sequential> </sequential>
</macrodef> </macrodef>
<property name="protobuf.version" value="2.6.1"/>
<!-- Download protobuf and rename packages --> <!-- Download protobuf and rename packages -->
<get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="2.5.0"/> <get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="${protobuf.version}"/>
<delete file="${dependencies}/protobuf-java-2.5.0.jar"/> <delete file="${dependencies}/protobuf-java-${protobuf.version}.jar"/>
<delete file="${dependencies}/protobuf-java-2.5.0-sources.jar"/> <delete file="${dependencies}/protobuf-java-${protobuf.version}-sources.jar"/>
<rename-packages-in-binaries <rename-packages-in-binaries
source.jar="${dependencies}/download/protobuf-java-2.5.0.jar" source.jar="${dependencies}/download/protobuf-java-${protobuf.version}.jar"
target.jar="${dependencies}/protobuf-2.5.0.jar" target.jar="${dependencies}/protobuf-${protobuf.version}.jar"
/> />
<rename-packages-in-sources <rename-packages-in-sources
source.jar="${dependencies}/download/protobuf-java-2.5.0-sources.jar" source.jar="${dependencies}/download/protobuf-java-${protobuf.version}-sources.jar"
target.jar="${dependencies}/protobuf-2.5.0-sources.jar" target.jar="${dependencies}/protobuf-${protobuf.version}-sources.jar"
/> />
<!-- Build protobuf lite jar --> <!-- Build protobuf lite jar -->
<exec executable="${dependencies}/bootstrap-compiler/Kotlin/kotlinc/bin/${kotlinc.executable.path}" failonerror="true"> <exec executable="${dependencies}/bootstrap-compiler/Kotlin/kotlinc/bin/${kotlinc.executable.path}" failonerror="true">
<arg value="-script"/> <arg value="-script"/>
<arg value="${generators}/infrastructure/build-protobuf-lite.kts"/> <arg value="${generators}/infrastructure/build-protobuf-lite.kts"/>
<arg value="${dependencies}/protobuf-2.5.0.jar"/> <arg value="${dependencies}/protobuf-${protobuf.version}.jar"/>
<arg value="${dependencies}/protobuf-2.5.0-lite.jar"/> <arg value="${dependencies}/protobuf-${protobuf.version}-lite.jar"/>
</exec> </exec>
</sequential> </sequential>
</macrodef> </macrodef>