" + desc
}
- fun getJvmFieldSignature(proto: ProtoBuf.Property, nameResolver: NameResolver): PropertySignature? {
+ fun getJvmFieldSignature(
+ proto: ProtoBuf.Property,
+ nameResolver: NameResolver,
+ typeTable: TypeTable
+ ): PropertySignature? {
val signature =
if (proto.hasExtension(JvmProtoBuf.propertySignature)) proto.getExtension(JvmProtoBuf.propertySignature) else return null
val field =
@@ -102,7 +114,7 @@ public object JvmProtoBufUtil {
val name = if (field != null && field.hasName()) field.name else proto.name
val desc =
if (field != null && field.hasDesc()) nameResolver.getString(field.desc)
- else mapTypeDefault(proto.returnType, nameResolver) ?: return null
+ else mapTypeDefault(proto.returnType(typeTable), nameResolver) ?: return null
return PropertySignature(nameResolver.getString(name), desc)
}
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index e2b5cc73a4d..875cc4540ce 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -105,7 +105,10 @@ message Type {
}
optional Projection projection = 1 [default = INV];
- optional Type type = 2; // when projection is STAR, no type is written, otherwise type must be specified
+
+ // When projection is STAR, no type is written, otherwise type must be specified
+ optional Type type = 2;
+ optional int32 type_id = 3;
}
repeated Argument argument = 2;
@@ -117,6 +120,7 @@ message Type {
optional int32 flexible_type_capabilities_id = 4 [(string_id_in_table) = true];
optional Type flexible_upper_bound = 5;
+ optional int32 flexible_upper_bound_id = 8;
// Only one of the following values should be present
@@ -141,6 +145,7 @@ message TypeParameter {
optional Variance variance = 4 [default = INV];
repeated Type upper_bound = 5;
+ repeated int32 upper_bound_id = 6;
}
message Class {
@@ -169,7 +174,9 @@ message Class {
optional int32 companion_object_name = 4 [(name_id_in_table) = true];
repeated TypeParameter type_parameter = 5;
+
repeated Type supertype = 6;
+ repeated int32 supertype_id = 2 [packed = true];
repeated int32 nested_class_name = 7 [packed = true, (name_id_in_table) = true];
@@ -179,6 +186,8 @@ message Class {
repeated int32 enum_entry = 12 [packed = true, (name_id_in_table) = true];
+ optional TypeTable type_table = 30;
+
extensions 100 to 199;
}
@@ -186,9 +195,19 @@ message Package {
repeated Function function = 3;
repeated Property property = 4;
+ optional TypeTable type_table = 30;
+
extensions 100 to 199;
}
+message TypeTable {
+ repeated Type type = 1;
+
+ // Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ // Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ optional int32 first_nullable = 2 [default = -1];
+}
+
message Constructor {
/*
hasAnnotations
@@ -215,14 +234,18 @@ message Function {
required int32 name = 2 [(name_id_in_table) = true];
- required Type return_type = 3;
+ optional Type return_type = 3;
+ optional int32 return_type_id = 7;
repeated TypeParameter type_parameter = 4;
optional Type receiver_type = 5;
+ optional int32 receiver_type_id = 8;
repeated ValueParameter value_parameter = 6;
+ optional TypeTable type_table = 30;
+
extensions 100 to 199;
}
@@ -243,11 +266,13 @@ message Property {
required int32 name = 2 [(name_id_in_table) = true];
- required Type return_type = 3;
+ optional Type return_type = 3;
+ optional int32 return_type_id = 9;
repeated TypeParameter type_parameter = 4;
optional Type receiver_type = 5;
+ optional int32 receiver_type_id = 10;
optional ValueParameter setter_value_parameter = 6;
@@ -272,9 +297,11 @@ message ValueParameter {
required int32 name = 2 [(name_id_in_table) = true];
- required Type type = 3;
+ optional Type type = 3;
+ optional int32 type_id = 5;
optional Type vararg_element_type = 4;
+ optional int32 vararg_element_type_id = 6;
extensions 100 to 199;
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index 49d709a179d..4d904b47f06 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -4298,6 +4298,16 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound();
+ // optional int32 flexible_upper_bound_id = 8;
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ boolean hasFlexibleUpperBoundId();
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ int getFlexibleUpperBoundId();
+
// optional int32 class_name = 6;
/**
* optional int32 class_name = 6;
@@ -4401,15 +4411,20 @@ public final class ProtoBuf {
break;
}
case 48: {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
className_ = input.readInt32();
break;
}
case 56: {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
typeParameter_ = input.readInt32();
break;
}
+ case 64: {
+ bitField0_ |= 0x00000008;
+ flexibleUpperBoundId_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4457,7 +4472,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
boolean hasType();
@@ -4465,10 +4480,20 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
+
+ // optional int32 type_id = 3;
+ /**
+ * optional int32 type_id = 3;
+ */
+ boolean hasTypeId();
+ /**
+ * optional int32 type_id = 3;
+ */
+ int getTypeId();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
@@ -4535,6 +4560,11 @@ public final class ProtoBuf {
bitField0_ |= 0x00000002;
break;
}
+ case 24: {
+ bitField0_ |= 0x00000004;
+ typeId_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4659,7 +4689,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public boolean hasType() {
@@ -4669,16 +4699,33 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
return type_;
}
+ // optional int32 type_id = 3;
+ public static final int TYPE_ID_FIELD_NUMBER = 3;
+ private int typeId_;
+ /**
+ * optional int32 type_id = 3;
+ */
+ public boolean hasTypeId() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional int32 type_id = 3;
+ */
+ public int getTypeId() {
+ return typeId_;
+ }
+
private void initFields() {
projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ typeId_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -4704,6 +4751,9 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, type_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeInt32(3, typeId_);
+ }
}
private int memoizedSerializedSize = -1;
@@ -4720,6 +4770,10 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, type_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, typeId_);
+ }
memoizedSerializedSize = size;
return size;
}
@@ -4815,6 +4869,8 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001);
type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002);
+ typeId_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -4846,6 +4902,10 @@ public final class ProtoBuf {
to_bitField0_ |= 0x00000002;
}
result.type_ = type_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.typeId_ = typeId_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -4858,6 +4918,9 @@ public final class ProtoBuf {
if (other.hasType()) {
mergeType(other.getType());
}
+ if (other.hasTypeId()) {
+ setTypeId(other.getTypeId());
+ }
return this;
}
@@ -4932,7 +4995,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public boolean hasType() {
@@ -4942,7 +5005,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
@@ -4952,7 +5015,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
@@ -4968,7 +5031,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public Builder setType(
@@ -4982,7 +5045,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
@@ -5001,7 +5064,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type type = 2;
*
*
- * when projection is STAR, no type is written, otherwise type must be specified
+ * When projection is STAR, no type is written, otherwise type must be specified
*
*/
public Builder clearType() {
@@ -5011,6 +5074,39 @@ public final class ProtoBuf {
return this;
}
+ // optional int32 type_id = 3;
+ private int typeId_ ;
+ /**
+ * optional int32 type_id = 3;
+ */
+ public boolean hasTypeId() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional int32 type_id = 3;
+ */
+ public int getTypeId() {
+ return typeId_;
+ }
+ /**
+ * optional int32 type_id = 3;
+ */
+ public Builder setTypeId(int value) {
+ bitField0_ |= 0x00000004;
+ typeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 type_id = 3;
+ */
+ public Builder clearTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ typeId_ = 0;
+
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Argument)
}
@@ -5117,6 +5213,22 @@ public final class ProtoBuf {
return flexibleUpperBound_;
}
+ // optional int32 flexible_upper_bound_id = 8;
+ public static final int FLEXIBLE_UPPER_BOUND_ID_FIELD_NUMBER = 8;
+ private int flexibleUpperBoundId_;
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ public boolean hasFlexibleUpperBoundId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ public int getFlexibleUpperBoundId() {
+ return flexibleUpperBoundId_;
+ }
+
// optional int32 class_name = 6;
public static final int CLASS_NAME_FIELD_NUMBER = 6;
private int className_;
@@ -5124,7 +5236,7 @@ public final class ProtoBuf {
* optional int32 class_name = 6;
*/
public boolean hasClassName() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional int32 class_name = 6;
@@ -5144,7 +5256,7 @@ public final class ProtoBuf {
*
*/
public boolean hasTypeParameter() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* optional int32 type_parameter = 7;
@@ -5162,6 +5274,7 @@ public final class ProtoBuf {
nullable_ = false;
flexibleTypeCapabilitiesId_ = 0;
flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ flexibleUpperBoundId_ = 0;
className_ = 0;
typeParameter_ = 0;
}
@@ -5208,12 +5321,15 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(5, flexibleUpperBound_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeInt32(6, className_);
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeInt32(7, typeParameter_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeInt32(8, flexibleUpperBoundId_);
+ }
extensionWriter.writeUntil(200, output);
}
@@ -5239,14 +5355,18 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, flexibleUpperBound_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(6, className_);
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, typeParameter_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(8, flexibleUpperBoundId_);
+ }
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -5346,10 +5466,12 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000004);
flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008);
- className_ = 0;
+ flexibleUpperBoundId_ = 0;
bitField0_ = (bitField0_ & ~0x00000010);
- typeParameter_ = 0;
+ className_ = 0;
bitField0_ = (bitField0_ & ~0x00000020);
+ typeParameter_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
@@ -5393,10 +5515,14 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000008;
}
- result.className_ = className_;
+ result.flexibleUpperBoundId_ = flexibleUpperBoundId_;
if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000010;
}
+ result.className_ = className_;
+ if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+ to_bitField0_ |= 0x00000020;
+ }
result.typeParameter_ = typeParameter_;
result.bitField0_ = to_bitField0_;
return result;
@@ -5423,6 +5549,9 @@ public final class ProtoBuf {
if (other.hasFlexibleUpperBound()) {
mergeFlexibleUpperBound(other.getFlexibleUpperBound());
}
+ if (other.hasFlexibleUpperBoundId()) {
+ setFlexibleUpperBoundId(other.getFlexibleUpperBoundId());
+ }
if (other.hasClassName()) {
setClassName(other.getClassName());
}
@@ -5744,13 +5873,46 @@ public final class ProtoBuf {
return this;
}
+ // optional int32 flexible_upper_bound_id = 8;
+ private int flexibleUpperBoundId_ ;
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ public boolean hasFlexibleUpperBoundId() {
+ return ((bitField0_ & 0x00000010) == 0x00000010);
+ }
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ public int getFlexibleUpperBoundId() {
+ return flexibleUpperBoundId_;
+ }
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ public Builder setFlexibleUpperBoundId(int value) {
+ bitField0_ |= 0x00000010;
+ flexibleUpperBoundId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 flexible_upper_bound_id = 8;
+ */
+ public Builder clearFlexibleUpperBoundId() {
+ bitField0_ = (bitField0_ & ~0x00000010);
+ flexibleUpperBoundId_ = 0;
+
+ return this;
+ }
+
// optional int32 class_name = 6;
private int className_ ;
/**
* optional int32 class_name = 6;
*/
public boolean hasClassName() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* optional int32 class_name = 6;
@@ -5762,7 +5924,7 @@ public final class ProtoBuf {
* optional int32 class_name = 6;
*/
public Builder setClassName(int value) {
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
className_ = value;
return this;
@@ -5771,7 +5933,7 @@ public final class ProtoBuf {
* optional int32 class_name = 6;
*/
public Builder clearClassName() {
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000020);
className_ = 0;
return this;
@@ -5787,7 +5949,7 @@ public final class ProtoBuf {
*
*/
public boolean hasTypeParameter() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000040) == 0x00000040);
}
/**
* optional int32 type_parameter = 7;
@@ -5807,7 +5969,7 @@ public final class ProtoBuf {
*
*/
public Builder setTypeParameter(int value) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
typeParameter_ = value;
return this;
@@ -5820,7 +5982,7 @@ public final class ProtoBuf {
*
*/
public Builder clearTypeParameter() {
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000040);
typeParameter_ = 0;
return this;
@@ -5894,6 +6056,20 @@ public final class ProtoBuf {
* repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
*/
int getUpperBoundCount();
+
+ // repeated int32 upper_bound_id = 6;
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ java.util.List getUpperBoundIdList();
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ int getUpperBoundIdCount();
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ int getUpperBoundId(int index);
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
@@ -5970,6 +6146,27 @@ public final class ProtoBuf {
upperBound_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
break;
}
+ case 48: {
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ upperBoundId_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000020;
+ }
+ upperBoundId_.add(input.readInt32());
+ break;
+ }
+ case 50: {
+ int length = input.readRawVarint32();
+ int limit = input.pushLimit(length);
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
+ upperBoundId_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000020;
+ }
+ while (input.getBytesUntilLimit() > 0) {
+ upperBoundId_.add(input.readInt32());
+ }
+ input.popLimit(limit);
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5981,6 +6178,9 @@ public final class ProtoBuf {
if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
upperBound_ = java.util.Collections.unmodifiableList(upperBound_);
}
+ if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ upperBoundId_ = java.util.Collections.unmodifiableList(upperBoundId_);
+ }
makeExtensionsImmutable();
}
}
@@ -6165,12 +6365,36 @@ public final class ProtoBuf {
return upperBound_.get(index);
}
+ // repeated int32 upper_bound_id = 6;
+ public static final int UPPER_BOUND_ID_FIELD_NUMBER = 6;
+ private java.util.List upperBoundId_;
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public java.util.List
+ getUpperBoundIdList() {
+ return upperBoundId_;
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public int getUpperBoundIdCount() {
+ return upperBoundId_.size();
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public int getUpperBoundId(int index) {
+ return upperBoundId_.get(index);
+ }
+
private void initFields() {
id_ = 0;
name_ = 0;
reified_ = false;
variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
upperBound_ = java.util.Collections.emptyList();
+ upperBoundId_ = java.util.Collections.emptyList();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -6213,6 +6437,9 @@ public final class ProtoBuf {
for (int i = 0; i < upperBound_.size(); i++) {
output.writeMessage(5, upperBound_.get(i));
}
+ for (int i = 0; i < upperBoundId_.size(); i++) {
+ output.writeInt32(6, upperBoundId_.get(i));
+ }
}
private int memoizedSerializedSize = -1;
@@ -6241,6 +6468,15 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, upperBound_.get(i));
}
+ {
+ int dataSize = 0;
+ for (int i = 0; i < upperBoundId_.size(); i++) {
+ dataSize += com.google.protobuf.CodedOutputStream
+ .computeInt32SizeNoTag(upperBoundId_.get(i));
+ }
+ size += dataSize;
+ size += 1 * getUpperBoundIdList().size();
+ }
memoizedSerializedSize = size;
return size;
}
@@ -6342,6 +6578,8 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000008);
upperBound_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010);
+ upperBoundId_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000020);
return this;
}
@@ -6386,6 +6624,11 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000010);
}
result.upperBound_ = upperBound_;
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ upperBoundId_ = java.util.Collections.unmodifiableList(upperBoundId_);
+ bitField0_ = (bitField0_ & ~0x00000020);
+ }
+ result.upperBoundId_ = upperBoundId_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -6413,6 +6656,16 @@ public final class ProtoBuf {
upperBound_.addAll(other.upperBound_);
}
+ }
+ if (!other.upperBoundId_.isEmpty()) {
+ if (upperBoundId_.isEmpty()) {
+ upperBoundId_ = other.upperBoundId_;
+ bitField0_ = (bitField0_ & ~0x00000020);
+ } else {
+ ensureUpperBoundIdIsMutable();
+ upperBoundId_.addAll(other.upperBoundId_);
+ }
+
}
return this;
}
@@ -6714,6 +6967,72 @@ public final class ProtoBuf {
return this;
}
+ // repeated int32 upper_bound_id = 6;
+ private java.util.List upperBoundId_ = java.util.Collections.emptyList();
+ private void ensureUpperBoundIdIsMutable() {
+ if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ upperBoundId_ = new java.util.ArrayList(upperBoundId_);
+ bitField0_ |= 0x00000020;
+ }
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public java.util.List
+ getUpperBoundIdList() {
+ return java.util.Collections.unmodifiableList(upperBoundId_);
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public int getUpperBoundIdCount() {
+ return upperBoundId_.size();
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public int getUpperBoundId(int index) {
+ return upperBoundId_.get(index);
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public Builder setUpperBoundId(
+ int index, int value) {
+ ensureUpperBoundIdIsMutable();
+ upperBoundId_.set(index, value);
+
+ return this;
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public Builder addUpperBoundId(int value) {
+ ensureUpperBoundIdIsMutable();
+ upperBoundId_.add(value);
+
+ return this;
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public Builder addAllUpperBoundId(
+ java.lang.Iterable values) {
+ ensureUpperBoundIdIsMutable();
+ super.addAll(values, upperBoundId_);
+
+ return this;
+ }
+ /**
+ * repeated int32 upper_bound_id = 6;
+ */
+ public Builder clearUpperBoundId() {
+ upperBoundId_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000020);
+
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeParameter)
}
@@ -6807,6 +7126,20 @@ public final class ProtoBuf {
*/
int getSupertypeCount();
+ // repeated int32 supertype_id = 2 [packed = true];
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ java.util.List getSupertypeIdList();
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ int getSupertypeIdCount();
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ int getSupertypeId(int index);
+
// repeated int32 nested_class_name = 7 [packed = true];
/**
* repeated int32 nested_class_name = 7 [packed = true];
@@ -6879,6 +7212,16 @@ public final class ProtoBuf {
* repeated int32 enum_entry = 12 [packed = true];
*/
int getEnumEntry(int index);
+
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ boolean hasTypeTable();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
@@ -6928,6 +7271,27 @@ public final class ProtoBuf {
flags_ = input.readInt32();
break;
}
+ case 16: {
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ supertypeId_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000020;
+ }
+ supertypeId_.add(input.readInt32());
+ break;
+ }
+ case 18: {
+ int length = input.readRawVarint32();
+ int limit = input.pushLimit(length);
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
+ supertypeId_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000020;
+ }
+ while (input.getBytesUntilLimit() > 0) {
+ supertypeId_.add(input.readInt32());
+ }
+ input.popLimit(limit);
+ break;
+ }
case 24: {
bitField0_ |= 0x00000002;
fqName_ = input.readInt32();
@@ -6955,9 +7319,9 @@ public final class ProtoBuf {
break;
}
case 56: {
- if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
nestedClassName_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000020;
+ mutable_bitField0_ |= 0x00000040;
}
nestedClassName_.add(input.readInt32());
break;
@@ -6965,9 +7329,9 @@ public final class ProtoBuf {
case 58: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
- if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
+ if (!((mutable_bitField0_ & 0x00000040) == 0x00000040) && input.getBytesUntilLimit() > 0) {
nestedClassName_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000020;
+ mutable_bitField0_ |= 0x00000040;
}
while (input.getBytesUntilLimit() > 0) {
nestedClassName_.add(input.readInt32());
@@ -6976,33 +7340,33 @@ public final class ProtoBuf {
break;
}
case 66: {
- if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+ if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
constructor_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000040;
+ mutable_bitField0_ |= 0x00000080;
}
constructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.PARSER, extensionRegistry));
break;
}
case 74: {
- if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
function_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000080;
+ mutable_bitField0_ |= 0x00000100;
}
function_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Function.PARSER, extensionRegistry));
break;
}
case 82: {
- if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+ if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
property_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000100;
+ mutable_bitField0_ |= 0x00000200;
}
property_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Property.PARSER, extensionRegistry));
break;
}
case 96: {
- if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+ if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
enumEntry_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000200;
+ mutable_bitField0_ |= 0x00000400;
}
enumEntry_.add(input.readInt32());
break;
@@ -7010,9 +7374,9 @@ public final class ProtoBuf {
case 98: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
- if (!((mutable_bitField0_ & 0x00000200) == 0x00000200) && input.getBytesUntilLimit() > 0) {
+ if (!((mutable_bitField0_ & 0x00000400) == 0x00000400) && input.getBytesUntilLimit() > 0) {
enumEntry_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000200;
+ mutable_bitField0_ |= 0x00000400;
}
while (input.getBytesUntilLimit() > 0) {
enumEntry_.add(input.readInt32());
@@ -7020,6 +7384,19 @@ public final class ProtoBuf {
input.popLimit(limit);
break;
}
+ case 242: {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = typeTable_.toBuilder();
+ }
+ typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(typeTable_);
+ typeTable_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000008;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -7028,25 +7405,28 @@ public final class ProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
+ if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ supertypeId_ = java.util.Collections.unmodifiableList(supertypeId_);
+ }
if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
supertype_ = java.util.Collections.unmodifiableList(supertype_);
}
- if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
}
- if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
constructor_ = java.util.Collections.unmodifiableList(constructor_);
}
- if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
function_ = java.util.Collections.unmodifiableList(function_);
}
- if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+ if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
property_ = java.util.Collections.unmodifiableList(property_);
}
- if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+ if (((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
}
makeExtensionsImmutable();
@@ -7315,6 +7695,30 @@ public final class ProtoBuf {
return supertype_.get(index);
}
+ // repeated int32 supertype_id = 2 [packed = true];
+ public static final int SUPERTYPE_ID_FIELD_NUMBER = 2;
+ private java.util.List supertypeId_;
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public java.util.List
+ getSupertypeIdList() {
+ return supertypeId_;
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public int getSupertypeIdCount() {
+ return supertypeId_.size();
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public int getSupertypeId(int index) {
+ return supertypeId_.get(index);
+ }
+ private int supertypeIdMemoizedSerializedSize = -1;
+
// repeated int32 nested_class_name = 7 [packed = true];
public static final int NESTED_CLASS_NAME_FIELD_NUMBER = 7;
private java.util.List nestedClassName_;
@@ -7471,17 +7875,35 @@ public final class ProtoBuf {
}
private int enumEntryMemoizedSerializedSize = -1;
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ public static final int TYPE_TABLE_FIELD_NUMBER = 30;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public boolean hasTypeTable() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+ return typeTable_;
+ }
+
private void initFields() {
flags_ = 6;
fqName_ = 0;
companionObjectName_ = 0;
typeParameter_ = java.util.Collections.emptyList();
supertype_ = java.util.Collections.emptyList();
+ supertypeId_ = java.util.Collections.emptyList();
nestedClassName_ = java.util.Collections.emptyList();
constructor_ = java.util.Collections.emptyList();
function_ = java.util.Collections.emptyList();
property_ = java.util.Collections.emptyList();
enumEntry_ = java.util.Collections.emptyList();
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -7522,6 +7944,12 @@ public final class ProtoBuf {
return false;
}
}
+ if (hasTypeTable()) {
+ if (!getTypeTable().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
if (!extensionsAreInitialized()) {
memoizedIsInitialized = 0;
return false;
@@ -7539,6 +7967,13 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt32(1, flags_);
}
+ if (getSupertypeIdList().size() > 0) {
+ output.writeRawVarint32(18);
+ output.writeRawVarint32(supertypeIdMemoizedSerializedSize);
+ }
+ for (int i = 0; i < supertypeId_.size(); i++) {
+ output.writeInt32NoTag(supertypeId_.get(i));
+ }
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(3, fqName_);
}
@@ -7574,6 +8009,9 @@ public final class ProtoBuf {
for (int i = 0; i < enumEntry_.size(); i++) {
output.writeInt32NoTag(enumEntry_.get(i));
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(30, typeTable_);
+ }
extensionWriter.writeUntil(200, output);
}
@@ -7587,6 +8025,20 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, flags_);
}
+ {
+ int dataSize = 0;
+ for (int i = 0; i < supertypeId_.size(); i++) {
+ dataSize += com.google.protobuf.CodedOutputStream
+ .computeInt32SizeNoTag(supertypeId_.get(i));
+ }
+ size += dataSize;
+ if (!getSupertypeIdList().isEmpty()) {
+ size += 1;
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32SizeNoTag(dataSize);
+ }
+ supertypeIdMemoizedSerializedSize = dataSize;
+ }
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, fqName_);
@@ -7643,6 +8095,10 @@ public final class ProtoBuf {
}
enumEntryMemoizedSerializedSize = dataSize;
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(30, typeTable_);
+ }
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -7744,16 +8200,20 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000008);
supertype_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010);
- nestedClassName_ = java.util.Collections.emptyList();
+ supertypeId_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000020);
- constructor_ = java.util.Collections.emptyList();
+ nestedClassName_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000040);
- function_ = java.util.Collections.emptyList();
+ constructor_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000080);
- property_ = java.util.Collections.emptyList();
+ function_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000100);
- enumEntry_ = java.util.Collections.emptyList();
+ property_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000200);
+ enumEntry_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000400);
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ bitField0_ = (bitField0_ & ~0x00000800);
return this;
}
@@ -7800,30 +8260,39 @@ public final class ProtoBuf {
}
result.supertype_ = supertype_;
if (((bitField0_ & 0x00000020) == 0x00000020)) {
- nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
+ supertypeId_ = java.util.Collections.unmodifiableList(supertypeId_);
bitField0_ = (bitField0_ & ~0x00000020);
}
- result.nestedClassName_ = nestedClassName_;
+ result.supertypeId_ = supertypeId_;
if (((bitField0_ & 0x00000040) == 0x00000040)) {
- constructor_ = java.util.Collections.unmodifiableList(constructor_);
+ nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_);
bitField0_ = (bitField0_ & ~0x00000040);
}
- result.constructor_ = constructor_;
+ result.nestedClassName_ = nestedClassName_;
if (((bitField0_ & 0x00000080) == 0x00000080)) {
- function_ = java.util.Collections.unmodifiableList(function_);
+ constructor_ = java.util.Collections.unmodifiableList(constructor_);
bitField0_ = (bitField0_ & ~0x00000080);
}
- result.function_ = function_;
+ result.constructor_ = constructor_;
if (((bitField0_ & 0x00000100) == 0x00000100)) {
- property_ = java.util.Collections.unmodifiableList(property_);
+ function_ = java.util.Collections.unmodifiableList(function_);
bitField0_ = (bitField0_ & ~0x00000100);
}
- result.property_ = property_;
+ result.function_ = function_;
if (((bitField0_ & 0x00000200) == 0x00000200)) {
- enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
+ property_ = java.util.Collections.unmodifiableList(property_);
bitField0_ = (bitField0_ & ~0x00000200);
}
+ result.property_ = property_;
+ if (((bitField0_ & 0x00000400) == 0x00000400)) {
+ enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_);
+ bitField0_ = (bitField0_ & ~0x00000400);
+ }
result.enumEntry_ = enumEntry_;
+ if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.typeTable_ = typeTable_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -7858,11 +8327,21 @@ public final class ProtoBuf {
supertype_.addAll(other.supertype_);
}
+ }
+ if (!other.supertypeId_.isEmpty()) {
+ if (supertypeId_.isEmpty()) {
+ supertypeId_ = other.supertypeId_;
+ bitField0_ = (bitField0_ & ~0x00000020);
+ } else {
+ ensureSupertypeIdIsMutable();
+ supertypeId_.addAll(other.supertypeId_);
+ }
+
}
if (!other.nestedClassName_.isEmpty()) {
if (nestedClassName_.isEmpty()) {
nestedClassName_ = other.nestedClassName_;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000040);
} else {
ensureNestedClassNameIsMutable();
nestedClassName_.addAll(other.nestedClassName_);
@@ -7872,7 +8351,7 @@ public final class ProtoBuf {
if (!other.constructor_.isEmpty()) {
if (constructor_.isEmpty()) {
constructor_ = other.constructor_;
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000080);
} else {
ensureConstructorIsMutable();
constructor_.addAll(other.constructor_);
@@ -7882,7 +8361,7 @@ public final class ProtoBuf {
if (!other.function_.isEmpty()) {
if (function_.isEmpty()) {
function_ = other.function_;
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000100);
} else {
ensureFunctionIsMutable();
function_.addAll(other.function_);
@@ -7892,7 +8371,7 @@ public final class ProtoBuf {
if (!other.property_.isEmpty()) {
if (property_.isEmpty()) {
property_ = other.property_;
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000200);
} else {
ensurePropertyIsMutable();
property_.addAll(other.property_);
@@ -7902,13 +8381,16 @@ public final class ProtoBuf {
if (!other.enumEntry_.isEmpty()) {
if (enumEntry_.isEmpty()) {
enumEntry_ = other.enumEntry_;
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000400);
} else {
ensureEnumEntryIsMutable();
enumEntry_.addAll(other.enumEntry_);
}
}
+ if (other.hasTypeTable()) {
+ mergeTypeTable(other.getTypeTable());
+ }
this.mergeExtensionFields(other);
return this;
}
@@ -7948,6 +8430,12 @@ public final class ProtoBuf {
return false;
}
}
+ if (hasTypeTable()) {
+ if (!getTypeTable().isInitialized()) {
+
+ return false;
+ }
+ }
if (!extensionsAreInitialized()) {
return false;
@@ -8359,12 +8847,78 @@ public final class ProtoBuf {
return this;
}
+ // repeated int32 supertype_id = 2 [packed = true];
+ private java.util.List supertypeId_ = java.util.Collections.emptyList();
+ private void ensureSupertypeIdIsMutable() {
+ if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ supertypeId_ = new java.util.ArrayList(supertypeId_);
+ bitField0_ |= 0x00000020;
+ }
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public java.util.List
+ getSupertypeIdList() {
+ return java.util.Collections.unmodifiableList(supertypeId_);
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public int getSupertypeIdCount() {
+ return supertypeId_.size();
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public int getSupertypeId(int index) {
+ return supertypeId_.get(index);
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public Builder setSupertypeId(
+ int index, int value) {
+ ensureSupertypeIdIsMutable();
+ supertypeId_.set(index, value);
+
+ return this;
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public Builder addSupertypeId(int value) {
+ ensureSupertypeIdIsMutable();
+ supertypeId_.add(value);
+
+ return this;
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public Builder addAllSupertypeId(
+ java.lang.Iterable values) {
+ ensureSupertypeIdIsMutable();
+ super.addAll(values, supertypeId_);
+
+ return this;
+ }
+ /**
+ * repeated int32 supertype_id = 2 [packed = true];
+ */
+ public Builder clearSupertypeId() {
+ supertypeId_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000020);
+
+ return this;
+ }
+
// repeated int32 nested_class_name = 7 [packed = true];
private java.util.List nestedClassName_ = java.util.Collections.emptyList();
private void ensureNestedClassNameIsMutable() {
- if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((bitField0_ & 0x00000040) == 0x00000040)) {
nestedClassName_ = new java.util.ArrayList(nestedClassName_);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
}
}
/**
@@ -8420,7 +8974,7 @@ public final class ProtoBuf {
*/
public Builder clearNestedClassName() {
nestedClassName_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
@@ -8429,9 +8983,9 @@ public final class ProtoBuf {
private java.util.List constructor_ =
java.util.Collections.emptyList();
private void ensureConstructorIsMutable() {
- if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (!((bitField0_ & 0x00000080) == 0x00000080)) {
constructor_ = new java.util.ArrayList(constructor_);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000080;
}
}
@@ -8536,7 +9090,7 @@ public final class ProtoBuf {
*/
public Builder clearConstructor() {
constructor_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -8554,9 +9108,9 @@ public final class ProtoBuf {
private java.util.List function_ =
java.util.Collections.emptyList();
private void ensureFunctionIsMutable() {
- if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+ if (!((bitField0_ & 0x00000100) == 0x00000100)) {
function_ = new java.util.ArrayList(function_);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000100;
}
}
@@ -8661,7 +9215,7 @@ public final class ProtoBuf {
*/
public Builder clearFunction() {
function_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@@ -8679,9 +9233,9 @@ public final class ProtoBuf {
private java.util.List property_ =
java.util.Collections.emptyList();
private void ensurePropertyIsMutable() {
- if (!((bitField0_ & 0x00000100) == 0x00000100)) {
+ if (!((bitField0_ & 0x00000200) == 0x00000200)) {
property_ = new java.util.ArrayList(property_);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000200;
}
}
@@ -8786,7 +9340,7 @@ public final class ProtoBuf {
*/
public Builder clearProperty() {
property_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000200);
return this;
}
@@ -8803,9 +9357,9 @@ public final class ProtoBuf {
// repeated int32 enum_entry = 12 [packed = true];
private java.util.List enumEntry_ = java.util.Collections.emptyList();
private void ensureEnumEntryIsMutable() {
- if (!((bitField0_ & 0x00000200) == 0x00000200)) {
+ if (!((bitField0_ & 0x00000400) == 0x00000400)) {
enumEntry_ = new java.util.ArrayList(enumEntry_);
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000400;
}
}
/**
@@ -8861,11 +9415,72 @@ public final class ProtoBuf {
*/
public Builder clearEnumEntry() {
enumEntry_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000400);
return this;
}
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public boolean hasTypeTable() {
+ return ((bitField0_ & 0x00000800) == 0x00000800);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+ return typeTable_;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder setTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ typeTable_ = value;
+
+ bitField0_ |= 0x00000800;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder setTypeTable(
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) {
+ typeTable_ = builderForValue.build();
+
+ bitField0_ |= 0x00000800;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+ if (((bitField0_ & 0x00000800) == 0x00000800) &&
+ typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) {
+ typeTable_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+ } else {
+ typeTable_ = value;
+ }
+
+ bitField0_ |= 0x00000800;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder clearTypeTable() {
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+
+ bitField0_ = (bitField0_ & ~0x00000800);
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
}
@@ -8910,6 +9525,16 @@ public final class ProtoBuf {
* repeated .org.jetbrains.kotlin.serialization.Property property = 4;
*/
int getPropertyCount();
+
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ boolean hasTypeTable();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
@@ -8970,6 +9595,19 @@ public final class ProtoBuf {
property_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Property.PARSER, extensionRegistry));
break;
}
+ case 242: {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ subBuilder = typeTable_.toBuilder();
+ }
+ typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(typeTable_);
+ typeTable_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000001;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -9002,6 +9640,7 @@ public final class ProtoBuf {
return PARSER;
}
+ private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.Function function = 3;
public static final int FUNCTION_FIELD_NUMBER = 3;
private java.util.List function_;
@@ -9074,9 +9713,26 @@ public final class ProtoBuf {
return property_.get(index);
}
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ public static final int TYPE_TABLE_FIELD_NUMBER = 30;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public boolean hasTypeTable() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+ return typeTable_;
+ }
+
private void initFields() {
function_ = java.util.Collections.emptyList();
property_ = java.util.Collections.emptyList();
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -9095,6 +9751,12 @@ public final class ProtoBuf {
return false;
}
}
+ if (hasTypeTable()) {
+ if (!getTypeTable().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
if (!extensionsAreInitialized()) {
memoizedIsInitialized = 0;
return false;
@@ -9115,6 +9777,9 @@ public final class ProtoBuf {
for (int i = 0; i < property_.size(); i++) {
output.writeMessage(4, property_.get(i));
}
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(30, typeTable_);
+ }
extensionWriter.writeUntil(200, output);
}
@@ -9132,6 +9797,10 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, property_.get(i));
}
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(30, typeTable_);
+ }
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -9227,6 +9896,8 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001);
property_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -9249,6 +9920,7 @@ public final class ProtoBuf {
public org.jetbrains.kotlin.serialization.ProtoBuf.Package buildPartial() {
org.jetbrains.kotlin.serialization.ProtoBuf.Package result = new org.jetbrains.kotlin.serialization.ProtoBuf.Package(this);
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
function_ = java.util.Collections.unmodifiableList(function_);
bitField0_ = (bitField0_ & ~0x00000001);
@@ -9259,6 +9931,11 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002);
}
result.property_ = property_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.typeTable_ = typeTable_;
+ result.bitField0_ = to_bitField0_;
return result;
}
@@ -9284,6 +9961,9 @@ public final class ProtoBuf {
}
}
+ if (other.hasTypeTable()) {
+ mergeTypeTable(other.getTypeTable());
+ }
this.mergeExtensionFields(other);
return this;
}
@@ -9301,6 +9981,12 @@ public final class ProtoBuf {
return false;
}
}
+ if (hasTypeTable()) {
+ if (!getTypeTable().isInitialized()) {
+
+ return false;
+ }
+ }
if (!extensionsAreInitialized()) {
return false;
@@ -9577,6 +10263,67 @@ public final class ProtoBuf {
return this;
}
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public boolean hasTypeTable() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+ return typeTable_;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder setTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ typeTable_ = value;
+
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder setTypeTable(
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) {
+ typeTable_ = builderForValue.build();
+
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+ if (((bitField0_ & 0x00000004) == 0x00000004) &&
+ typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) {
+ typeTable_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+ } else {
+ typeTable_ = value;
+ }
+
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder clearTypeTable() {
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+
+ bitField0_ = (bitField0_ & ~0x00000004);
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Package)
}
@@ -9588,6 +10335,603 @@ public final class ProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Package)
}
+ public interface TypeTableOrBuilder
+ extends com.google.protobuf.MessageLiteOrBuilder {
+
+ // repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ java.util.List
+ getTypeList();
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type getType(int index);
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ int getTypeCount();
+
+ // optional int32 first_nullable = 2 [default = -1];
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ boolean hasFirstNullable();
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ int getFirstNullable();
+ }
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
+ */
+ public static final class TypeTable extends
+ com.google.protobuf.GeneratedMessageLite
+ implements TypeTableOrBuilder {
+ // Use TypeTable.newBuilder() to construct.
+ private TypeTable(com.google.protobuf.GeneratedMessageLite.Builder builder) {
+ super(builder);
+
+ }
+ private TypeTable(boolean noInit) {}
+
+ private static final TypeTable defaultInstance;
+ public static TypeTable getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public TypeTable getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private TypeTable(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 10: {
+ if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ type_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000001;
+ }
+ type_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
+ break;
+ }
+ case 16: {
+ bitField0_ |= 0x00000001;
+ firstNullable_ = input.readInt32();
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ type_ = java.util.Collections.unmodifiableList(type_);
+ }
+ makeExtensionsImmutable();
+ }
+ }
+ public static com.google.protobuf.Parser PARSER =
+ new com.google.protobuf.AbstractParser() {
+ public TypeTable parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new TypeTable(input, extensionRegistry);
+ }
+ };
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ private int bitField0_;
+ // repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ public static final int TYPE_FIELD_NUMBER = 1;
+ private java.util.List type_;
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public java.util.List getTypeList() {
+ return type_;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public java.util.List
+ getTypeOrBuilderList() {
+ return type_;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public int getTypeCount() {
+ return type_.size();
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType(int index) {
+ return type_.get(index);
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder getTypeOrBuilder(
+ int index) {
+ return type_.get(index);
+ }
+
+ // optional int32 first_nullable = 2 [default = -1];
+ public static final int FIRST_NULLABLE_FIELD_NUMBER = 2;
+ private int firstNullable_;
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ public boolean hasFirstNullable() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ public int getFirstNullable() {
+ return firstNullable_;
+ }
+
+ private void initFields() {
+ type_ = java.util.Collections.emptyList();
+ firstNullable_ = -1;
+ }
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ for (int i = 0; i < getTypeCount(); i++) {
+ if (!getType(i).isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ getSerializedSize();
+ for (int i = 0; i < type_.size(); i++) {
+ output.writeMessage(1, type_.get(i));
+ }
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeInt32(2, firstNullable_);
+ }
+ }
+
+ private int memoizedSerializedSize = -1;
+ public int getSerializedSize() {
+ int size = memoizedSerializedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ for (int i = 0; i < type_.size(); i++) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(1, type_.get(i));
+ }
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(2, firstNullable_);
+ }
+ memoizedSerializedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
+ return super.writeReplace();
+ }
+
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageLite.Builder<
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable, Builder>
+ implements org.jetbrains.kotlin.serialization.ProtoBuf.TypeTableOrBuilder {
+ // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ type_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ firstNullable_ = -1;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ }
+
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable build() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable buildPartial() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ type_ = java.util.Collections.unmodifiableList(type_);
+ bitField0_ = (bitField0_ & ~0x00000001);
+ }
+ result.type_ = type_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.firstNullable_ = firstNullable_;
+ result.bitField0_ = to_bitField0_;
+ return result;
+ }
+
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable other) {
+ if (other == org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) return this;
+ if (!other.type_.isEmpty()) {
+ if (type_.isEmpty()) {
+ type_ = other.type_;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ } else {
+ ensureTypeIsMutable();
+ type_.addAll(other.type_);
+ }
+
+ }
+ if (other.hasFirstNullable()) {
+ setFirstNullable(other.getFirstNullable());
+ }
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ for (int i = 0; i < getTypeCount(); i++) {
+ if (!getType(i).isInitialized()) {
+
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable) e.getUnfinishedMessage();
+ throw e;
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ // repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ private java.util.List type_ =
+ java.util.Collections.emptyList();
+ private void ensureTypeIsMutable() {
+ if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+ type_ = new java.util.ArrayList(type_);
+ bitField0_ |= 0x00000001;
+ }
+ }
+
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public java.util.List getTypeList() {
+ return java.util.Collections.unmodifiableList(type_);
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public int getTypeCount() {
+ return type_.size();
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType(int index) {
+ return type_.get(index);
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder setType(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureTypeIsMutable();
+ type_.set(index, value);
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder setType(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+ ensureTypeIsMutable();
+ type_.set(index, builderForValue.build());
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder addType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureTypeIsMutable();
+ type_.add(value);
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder addType(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureTypeIsMutable();
+ type_.add(index, value);
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder addType(
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+ ensureTypeIsMutable();
+ type_.add(builderForValue.build());
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder addType(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+ ensureTypeIsMutable();
+ type_.add(index, builderForValue.build());
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder addAllType(
+ java.lang.Iterable values) {
+ ensureTypeIsMutable();
+ super.addAll(values, type_);
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder clearType() {
+ type_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000001);
+
+ return this;
+ }
+ /**
+ * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+ */
+ public Builder removeType(int index) {
+ ensureTypeIsMutable();
+ type_.remove(index);
+
+ return this;
+ }
+
+ // optional int32 first_nullable = 2 [default = -1];
+ private int firstNullable_ = -1;
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ public boolean hasFirstNullable() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ public int getFirstNullable() {
+ return firstNullable_;
+ }
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ public Builder setFirstNullable(int value) {
+ bitField0_ |= 0x00000002;
+ firstNullable_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 first_nullable = 2 [default = -1];
+ *
+ *
+ * Index starting from which all types are nullable, or nothing if all types in this table are non-null.
+ * Note that the 'nullable' field of Type messages is ignored and shouldn't be written because it wastes too much space
+ *
+ */
+ public Builder clearFirstNullable() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ firstNullable_ = -1;
+
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeTable)
+ }
+
+ static {
+ defaultInstance = new TypeTable(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeTable)
+ }
+
public interface ConstructorOrBuilder extends
com.google.protobuf.GeneratedMessageLite.
ExtendableMessageOrBuilder {
@@ -10259,16 +11603,26 @@ public final class ProtoBuf {
*/
int getName();
- // required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
boolean hasReturnType();
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType();
+ // optional int32 return_type_id = 7;
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ boolean hasReturnTypeId();
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ int getReturnTypeId();
+
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
@@ -10294,6 +11648,16 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType();
+ // optional int32 receiver_type_id = 8;
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ boolean hasReceiverTypeId();
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ int getReceiverTypeId();
+
// repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
/**
* repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
@@ -10308,6 +11672,16 @@ public final class ProtoBuf {
* repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
*/
int getValueParameterCount();
+
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ boolean hasTypeTable();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Function}
@@ -10376,16 +11750,16 @@ public final class ProtoBuf {
break;
}
case 34: {
- if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+ if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
typeParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000008;
+ mutable_bitField0_ |= 0x00000010;
}
typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
break;
}
case 42: {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = receiverType_.toBuilder();
}
receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
@@ -10393,17 +11767,40 @@ public final class ProtoBuf {
subBuilder.mergeFrom(receiverType_);
receiverType_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
break;
}
case 50: {
- if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
valueParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000020;
+ mutable_bitField0_ |= 0x00000080;
}
valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
break;
}
+ case 56: {
+ bitField0_ |= 0x00000008;
+ returnTypeId_ = input.readInt32();
+ break;
+ }
+ case 64: {
+ bitField0_ |= 0x00000020;
+ receiverTypeId_ = input.readInt32();
+ break;
+ }
+ case 242: {
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ subBuilder = typeTable_.toBuilder();
+ }
+ typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(typeTable_);
+ typeTable_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000040;
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -10412,10 +11809,10 @@ public final class ProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
- if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
}
makeExtensionsImmutable();
@@ -10489,22 +11886,38 @@ public final class ProtoBuf {
return name_;
}
- // required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
public static final int RETURN_TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_;
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public boolean hasReturnType() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
return returnType_;
}
+ // optional int32 return_type_id = 7;
+ public static final int RETURN_TYPE_ID_FIELD_NUMBER = 7;
+ private int returnTypeId_;
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ public boolean hasReturnTypeId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ public int getReturnTypeId() {
+ return returnTypeId_;
+ }
+
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
private java.util.List typeParameter_;
@@ -10548,7 +11961,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -10557,6 +11970,22 @@ public final class ProtoBuf {
return receiverType_;
}
+ // optional int32 receiver_type_id = 8;
+ public static final int RECEIVER_TYPE_ID_FIELD_NUMBER = 8;
+ private int receiverTypeId_;
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ public boolean hasReceiverTypeId() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ public int getReceiverTypeId() {
+ return receiverTypeId_;
+ }
+
// repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
public static final int VALUE_PARAMETER_FIELD_NUMBER = 6;
private java.util.List valueParameter_;
@@ -10593,13 +12022,32 @@ public final class ProtoBuf {
return valueParameter_.get(index);
}
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ public static final int TYPE_TABLE_FIELD_NUMBER = 30;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public boolean hasTypeTable() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+ return typeTable_;
+ }
+
private void initFields() {
flags_ = 6;
name_ = 0;
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ returnTypeId_ = 0;
typeParameter_ = java.util.Collections.emptyList();
receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ receiverTypeId_ = 0;
valueParameter_ = java.util.Collections.emptyList();
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -10610,13 +12058,11 @@ public final class ProtoBuf {
memoizedIsInitialized = 0;
return false;
}
- if (!hasReturnType()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!getReturnType().isInitialized()) {
- memoizedIsInitialized = 0;
- return false;
+ if (hasReturnType()) {
+ if (!getReturnType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
for (int i = 0; i < getTypeParameterCount(); i++) {
if (!getTypeParameter(i).isInitialized()) {
@@ -10636,6 +12082,12 @@ public final class ProtoBuf {
return false;
}
}
+ if (hasTypeTable()) {
+ if (!getTypeTable().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
if (!extensionsAreInitialized()) {
memoizedIsInitialized = 0;
return false;
@@ -10662,12 +12114,21 @@ public final class ProtoBuf {
for (int i = 0; i < typeParameter_.size(); i++) {
output.writeMessage(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(5, receiverType_);
}
for (int i = 0; i < valueParameter_.size(); i++) {
output.writeMessage(6, valueParameter_.get(i));
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeInt32(7, returnTypeId_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeInt32(8, receiverTypeId_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ output.writeMessage(30, typeTable_);
+ }
extensionWriter.writeUntil(200, output);
}
@@ -10693,7 +12154,7 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, receiverType_);
}
@@ -10701,6 +12162,18 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, valueParameter_.get(i));
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(7, returnTypeId_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(8, receiverTypeId_);
+ }
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(30, typeTable_);
+ }
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -10798,12 +12271,18 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002);
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004);
- typeParameter_ = java.util.Collections.emptyList();
+ returnTypeId_ = 0;
bitField0_ = (bitField0_ & ~0x00000008);
- receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ typeParameter_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010);
- valueParameter_ = java.util.Collections.emptyList();
+ receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000020);
+ receiverTypeId_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000040);
+ valueParameter_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000080);
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@@ -10839,20 +12318,32 @@ public final class ProtoBuf {
to_bitField0_ |= 0x00000004;
}
result.returnType_ = returnType_;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
- typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
- bitField0_ = (bitField0_ & ~0x00000008);
- }
- result.typeParameter_ = typeParameter_;
- if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008;
}
+ result.returnTypeId_ = returnTypeId_;
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
+ bitField0_ = (bitField0_ & ~0x00000010);
+ }
+ result.typeParameter_ = typeParameter_;
+ if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ to_bitField0_ |= 0x00000010;
+ }
result.receiverType_ = receiverType_;
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+ to_bitField0_ |= 0x00000020;
+ }
+ result.receiverTypeId_ = receiverTypeId_;
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_);
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000080);
}
result.valueParameter_ = valueParameter_;
+ if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
+ to_bitField0_ |= 0x00000040;
+ }
+ result.typeTable_ = typeTable_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -10868,10 +12359,13 @@ public final class ProtoBuf {
if (other.hasReturnType()) {
mergeReturnType(other.getReturnType());
}
+ if (other.hasReturnTypeId()) {
+ setReturnTypeId(other.getReturnTypeId());
+ }
if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) {
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
} else {
ensureTypeParameterIsMutable();
typeParameter_.addAll(other.typeParameter_);
@@ -10881,16 +12375,22 @@ public final class ProtoBuf {
if (other.hasReceiverType()) {
mergeReceiverType(other.getReceiverType());
}
+ if (other.hasReceiverTypeId()) {
+ setReceiverTypeId(other.getReceiverTypeId());
+ }
if (!other.valueParameter_.isEmpty()) {
if (valueParameter_.isEmpty()) {
valueParameter_ = other.valueParameter_;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000080);
} else {
ensureValueParameterIsMutable();
valueParameter_.addAll(other.valueParameter_);
}
}
+ if (other.hasTypeTable()) {
+ mergeTypeTable(other.getTypeTable());
+ }
this.mergeExtensionFields(other);
return this;
}
@@ -10900,13 +12400,11 @@ public final class ProtoBuf {
return false;
}
- if (!hasReturnType()) {
-
- return false;
- }
- if (!getReturnType().isInitialized()) {
-
- return false;
+ if (hasReturnType()) {
+ if (!getReturnType().isInitialized()) {
+
+ return false;
+ }
}
for (int i = 0; i < getTypeParameterCount(); i++) {
if (!getTypeParameter(i).isInitialized()) {
@@ -10926,6 +12424,12 @@ public final class ProtoBuf {
return false;
}
}
+ if (hasTypeTable()) {
+ if (!getTypeTable().isInitialized()) {
+
+ return false;
+ }
+ }
if (!extensionsAreInitialized()) {
return false;
@@ -11058,22 +12562,22 @@ public final class ProtoBuf {
return this;
}
- // required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public boolean hasReturnType() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
return returnType_;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder setReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (value == null) {
@@ -11085,7 +12589,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder setReturnType(
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
@@ -11095,7 +12599,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -11110,7 +12614,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder clearReturnType() {
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
@@ -11119,13 +12623,46 @@ public final class ProtoBuf {
return this;
}
+ // optional int32 return_type_id = 7;
+ private int returnTypeId_ ;
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ public boolean hasReturnTypeId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ public int getReturnTypeId() {
+ return returnTypeId_;
+ }
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ public Builder setReturnTypeId(int value) {
+ bitField0_ |= 0x00000008;
+ returnTypeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 return_type_id = 7;
+ */
+ public Builder clearReturnTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ returnTypeId_ = 0;
+
+ return this;
+ }
+
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
- if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (!((bitField0_ & 0x00000010) == 0x00000010)) {
typeParameter_ = new java.util.ArrayList(typeParameter_);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
}
}
@@ -11230,7 +12767,7 @@ public final class ProtoBuf {
*/
public Builder clearTypeParameter() {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -11250,7 +12787,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -11267,7 +12804,7 @@ public final class ProtoBuf {
}
receiverType_ = value;
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
return this;
}
/**
@@ -11277,14 +12814,14 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
receiverType_ = builderForValue.build();
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
return this;
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000010) == 0x00000010) &&
+ if (((bitField0_ & 0x00000020) == 0x00000020) &&
receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
receiverType_ =
org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
@@ -11292,7 +12829,7 @@ public final class ProtoBuf {
receiverType_ = value;
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
return this;
}
/**
@@ -11301,7 +12838,40 @@ public final class ProtoBuf {
public Builder clearReceiverType() {
receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000020);
+ return this;
+ }
+
+ // optional int32 receiver_type_id = 8;
+ private int receiverTypeId_ ;
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ public boolean hasReceiverTypeId() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ public int getReceiverTypeId() {
+ return receiverTypeId_;
+ }
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ public Builder setReceiverTypeId(int value) {
+ bitField0_ |= 0x00000040;
+ receiverTypeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 receiver_type_id = 8;
+ */
+ public Builder clearReceiverTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000040);
+ receiverTypeId_ = 0;
+
return this;
}
@@ -11309,9 +12879,9 @@ public final class ProtoBuf {
private java.util.List valueParameter_ =
java.util.Collections.emptyList();
private void ensureValueParameterIsMutable() {
- if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (!((bitField0_ & 0x00000080) == 0x00000080)) {
valueParameter_ = new java.util.ArrayList(valueParameter_);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
}
}
@@ -11416,7 +12986,7 @@ public final class ProtoBuf {
*/
public Builder clearValueParameter() {
valueParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -11430,6 +13000,67 @@ public final class ProtoBuf {
return this;
}
+ // optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public boolean hasTypeTable() {
+ return ((bitField0_ & 0x00000100) == 0x00000100);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+ return typeTable_;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder setTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ typeTable_ = value;
+
+ bitField0_ |= 0x00000100;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder setTypeTable(
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) {
+ typeTable_ = builderForValue.build();
+
+ bitField0_ |= 0x00000100;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+ if (((bitField0_ & 0x00000100) == 0x00000100) &&
+ typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) {
+ typeTable_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+ } else {
+ typeTable_ = value;
+ }
+
+ bitField0_ |= 0x00000100;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+ */
+ public Builder clearTypeTable() {
+ typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+
+ bitField0_ = (bitField0_ & ~0x00000100);
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Function)
}
@@ -11493,16 +13124,26 @@ public final class ProtoBuf {
*/
int getName();
- // required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
boolean hasReturnType();
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType();
+ // optional int32 return_type_id = 9;
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ boolean hasReturnTypeId();
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ int getReturnTypeId();
+
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
/**
* repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
@@ -11528,6 +13169,16 @@ public final class ProtoBuf {
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType();
+ // optional int32 receiver_type_id = 10;
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ boolean hasReceiverTypeId();
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ int getReceiverTypeId();
+
// optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
/**
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
@@ -11641,16 +13292,16 @@ public final class ProtoBuf {
break;
}
case 34: {
- if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+ if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
typeParameter_ = new java.util.ArrayList();
- mutable_bitField0_ |= 0x00000008;
+ mutable_bitField0_ |= 0x00000010;
}
typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
break;
}
case 42: {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = receiverType_.toBuilder();
}
receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
@@ -11658,12 +13309,12 @@ public final class ProtoBuf {
subBuilder.mergeFrom(receiverType_);
receiverType_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
break;
}
case 50: {
org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder subBuilder = null;
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
subBuilder = setterValueParameter_.toBuilder();
}
setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry);
@@ -11671,19 +13322,29 @@ public final class ProtoBuf {
subBuilder.mergeFrom(setterValueParameter_);
setterValueParameter_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000040;
break;
}
case 56: {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
getterFlags_ = input.readInt32();
break;
}
case 64: {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
setterFlags_ = input.readInt32();
break;
}
+ case 72: {
+ bitField0_ |= 0x00000008;
+ returnTypeId_ = input.readInt32();
+ break;
+ }
+ case 80: {
+ bitField0_ |= 0x00000020;
+ receiverTypeId_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -11692,7 +13353,7 @@ public final class ProtoBuf {
throw new com.google.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
}
makeExtensionsImmutable();
@@ -11774,22 +13435,38 @@ public final class ProtoBuf {
return name_;
}
- // required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
public static final int RETURN_TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_;
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public boolean hasReturnType() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
return returnType_;
}
+ // optional int32 return_type_id = 9;
+ public static final int RETURN_TYPE_ID_FIELD_NUMBER = 9;
+ private int returnTypeId_;
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ public boolean hasReturnTypeId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ public int getReturnTypeId() {
+ return returnTypeId_;
+ }
+
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
private java.util.List typeParameter_;
@@ -11833,7 +13510,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -11842,6 +13519,22 @@ public final class ProtoBuf {
return receiverType_;
}
+ // optional int32 receiver_type_id = 10;
+ public static final int RECEIVER_TYPE_ID_FIELD_NUMBER = 10;
+ private int receiverTypeId_;
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ public boolean hasReceiverTypeId() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ public int getReceiverTypeId() {
+ return receiverTypeId_;
+ }
+
// optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
public static final int SETTER_VALUE_PARAMETER_FIELD_NUMBER = 6;
private org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter setterValueParameter_;
@@ -11849,7 +13542,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
*/
public boolean hasSetterValueParameter() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000040) == 0x00000040);
}
/**
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
@@ -11873,7 +13566,7 @@ public final class ProtoBuf {
*
*/
public boolean hasGetterFlags() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* optional int32 getter_flags = 7;
@@ -11897,7 +13590,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 8;
*/
public boolean hasSetterFlags() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
* optional int32 setter_flags = 8;
@@ -11910,8 +13603,10 @@ public final class ProtoBuf {
flags_ = 262;
name_ = 0;
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ returnTypeId_ = 0;
typeParameter_ = java.util.Collections.emptyList();
receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ receiverTypeId_ = 0;
setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
getterFlags_ = 0;
setterFlags_ = 0;
@@ -11925,13 +13620,11 @@ public final class ProtoBuf {
memoizedIsInitialized = 0;
return false;
}
- if (!hasReturnType()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!getReturnType().isInitialized()) {
- memoizedIsInitialized = 0;
- return false;
+ if (hasReturnType()) {
+ if (!getReturnType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
for (int i = 0; i < getTypeParameterCount(); i++) {
if (!getTypeParameter(i).isInitialized()) {
@@ -11977,18 +13670,24 @@ public final class ProtoBuf {
for (int i = 0; i < typeParameter_.size(); i++) {
output.writeMessage(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(5, receiverType_);
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
output.writeMessage(6, setterValueParameter_);
}
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
output.writeInt32(7, getterFlags_);
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
output.writeInt32(8, setterFlags_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeInt32(9, returnTypeId_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeInt32(10, receiverTypeId_);
+ }
extensionWriter.writeUntil(200, output);
}
@@ -12014,22 +13713,30 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, typeParameter_.get(i));
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, receiverType_);
}
- if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, setterValueParameter_);
}
- if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, getterFlags_);
}
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, setterFlags_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(9, returnTypeId_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(10, receiverTypeId_);
+ }
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -12127,16 +13834,20 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002);
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004);
- typeParameter_ = java.util.Collections.emptyList();
+ returnTypeId_ = 0;
bitField0_ = (bitField0_ & ~0x00000008);
- receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ typeParameter_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010);
- setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+ receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000020);
- getterFlags_ = 0;
+ receiverTypeId_ = 0;
bitField0_ = (bitField0_ & ~0x00000040);
- setterFlags_ = 0;
+ setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000080);
+ getterFlags_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000100);
+ setterFlags_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000200);
return this;
}
@@ -12172,26 +13883,34 @@ public final class ProtoBuf {
to_bitField0_ |= 0x00000004;
}
result.returnType_ = returnType_;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
- typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
- bitField0_ = (bitField0_ & ~0x00000008);
- }
- result.typeParameter_ = typeParameter_;
- if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008;
}
- result.receiverType_ = receiverType_;
+ result.returnTypeId_ = returnTypeId_;
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
+ bitField0_ = (bitField0_ & ~0x00000010);
+ }
+ result.typeParameter_ = typeParameter_;
if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000010;
}
- result.setterValueParameter_ = setterValueParameter_;
+ result.receiverType_ = receiverType_;
if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
to_bitField0_ |= 0x00000020;
}
- result.getterFlags_ = getterFlags_;
+ result.receiverTypeId_ = receiverTypeId_;
if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
to_bitField0_ |= 0x00000040;
}
+ result.setterValueParameter_ = setterValueParameter_;
+ if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
+ to_bitField0_ |= 0x00000080;
+ }
+ result.getterFlags_ = getterFlags_;
+ if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
+ to_bitField0_ |= 0x00000100;
+ }
result.setterFlags_ = setterFlags_;
result.bitField0_ = to_bitField0_;
return result;
@@ -12208,10 +13927,13 @@ public final class ProtoBuf {
if (other.hasReturnType()) {
mergeReturnType(other.getReturnType());
}
+ if (other.hasReturnTypeId()) {
+ setReturnTypeId(other.getReturnTypeId());
+ }
if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) {
typeParameter_ = other.typeParameter_;
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
} else {
ensureTypeParameterIsMutable();
typeParameter_.addAll(other.typeParameter_);
@@ -12221,6 +13943,9 @@ public final class ProtoBuf {
if (other.hasReceiverType()) {
mergeReceiverType(other.getReceiverType());
}
+ if (other.hasReceiverTypeId()) {
+ setReceiverTypeId(other.getReceiverTypeId());
+ }
if (other.hasSetterValueParameter()) {
mergeSetterValueParameter(other.getSetterValueParameter());
}
@@ -12239,13 +13964,11 @@ public final class ProtoBuf {
return false;
}
- if (!hasReturnType()) {
-
- return false;
- }
- if (!getReturnType().isInitialized()) {
-
- return false;
+ if (hasReturnType()) {
+ if (!getReturnType().isInitialized()) {
+
+ return false;
+ }
}
for (int i = 0; i < getTypeParameterCount(); i++) {
if (!getTypeParameter(i).isInitialized()) {
@@ -12413,22 +14136,22 @@ public final class ProtoBuf {
return this;
}
- // required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public boolean hasReturnType() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
return returnType_;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder setReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (value == null) {
@@ -12440,7 +14163,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder setReturnType(
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
@@ -12450,7 +14173,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -12465,7 +14188,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type return_type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
*/
public Builder clearReturnType() {
returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
@@ -12474,13 +14197,46 @@ public final class ProtoBuf {
return this;
}
+ // optional int32 return_type_id = 9;
+ private int returnTypeId_ ;
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ public boolean hasReturnTypeId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ public int getReturnTypeId() {
+ return returnTypeId_;
+ }
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ public Builder setReturnTypeId(int value) {
+ bitField0_ |= 0x00000008;
+ returnTypeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 return_type_id = 9;
+ */
+ public Builder clearReturnTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ returnTypeId_ = 0;
+
+ return this;
+ }
+
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
private java.util.List typeParameter_ =
java.util.Collections.emptyList();
private void ensureTypeParameterIsMutable() {
- if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (!((bitField0_ & 0x00000010) == 0x00000010)) {
typeParameter_ = new java.util.ArrayList(typeParameter_);
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
}
}
@@ -12585,7 +14341,7 @@ public final class ProtoBuf {
*/
public Builder clearTypeParameter() {
typeParameter_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -12605,7 +14361,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public boolean hasReceiverType() {
- return ((bitField0_ & 0x00000010) == 0x00000010);
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
@@ -12622,7 +14378,7 @@ public final class ProtoBuf {
}
receiverType_ = value;
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
return this;
}
/**
@@ -12632,14 +14388,14 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
receiverType_ = builderForValue.build();
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
return this;
}
/**
* optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
*/
public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000010) == 0x00000010) &&
+ if (((bitField0_ & 0x00000020) == 0x00000020) &&
receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
receiverType_ =
org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
@@ -12647,7 +14403,7 @@ public final class ProtoBuf {
receiverType_ = value;
}
- bitField0_ |= 0x00000010;
+ bitField0_ |= 0x00000020;
return this;
}
/**
@@ -12656,7 +14412,40 @@ public final class ProtoBuf {
public Builder clearReceiverType() {
receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000020);
+ return this;
+ }
+
+ // optional int32 receiver_type_id = 10;
+ private int receiverTypeId_ ;
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ public boolean hasReceiverTypeId() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ public int getReceiverTypeId() {
+ return receiverTypeId_;
+ }
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ public Builder setReceiverTypeId(int value) {
+ bitField0_ |= 0x00000040;
+ receiverTypeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 receiver_type_id = 10;
+ */
+ public Builder clearReceiverTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000040);
+ receiverTypeId_ = 0;
+
return this;
}
@@ -12666,7 +14455,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
*/
public boolean hasSetterValueParameter() {
- return ((bitField0_ & 0x00000020) == 0x00000020);
+ return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
@@ -12683,7 +14472,7 @@ public final class ProtoBuf {
}
setterValueParameter_ = value;
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -12693,14 +14482,14 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
setterValueParameter_ = builderForValue.build();
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
return this;
}
/**
* optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
*/
public Builder mergeSetterValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
- if (((bitField0_ & 0x00000020) == 0x00000020) &&
+ if (((bitField0_ & 0x00000080) == 0x00000080) &&
setterValueParameter_ != org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance()) {
setterValueParameter_ =
org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial();
@@ -12708,7 +14497,7 @@ public final class ProtoBuf {
setterValueParameter_ = value;
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000080;
return this;
}
/**
@@ -12717,7 +14506,7 @@ public final class ProtoBuf {
public Builder clearSetterValueParameter() {
setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
@@ -12735,7 +14524,7 @@ public final class ProtoBuf {
*
*/
public boolean hasGetterFlags() {
- return ((bitField0_ & 0x00000040) == 0x00000040);
+ return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
* optional int32 getter_flags = 7;
@@ -12763,7 +14552,7 @@ public final class ProtoBuf {
*
*/
public Builder setGetterFlags(int value) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
getterFlags_ = value;
return this;
@@ -12780,7 +14569,7 @@ public final class ProtoBuf {
*
*/
public Builder clearGetterFlags() {
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000100);
getterFlags_ = 0;
return this;
@@ -12792,7 +14581,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 8;
*/
public boolean hasSetterFlags() {
- return ((bitField0_ & 0x00000080) == 0x00000080);
+ return ((bitField0_ & 0x00000200) == 0x00000200);
}
/**
* optional int32 setter_flags = 8;
@@ -12804,7 +14593,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 8;
*/
public Builder setSetterFlags(int value) {
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
setterFlags_ = value;
return this;
@@ -12813,7 +14602,7 @@ public final class ProtoBuf {
* optional int32 setter_flags = 8;
*/
public Builder clearSetterFlags() {
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000200);
setterFlags_ = 0;
return this;
@@ -12866,16 +14655,26 @@ public final class ProtoBuf {
*/
int getName();
- // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type type = 3;
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
boolean hasType();
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
+ // optional int32 type_id = 5;
+ /**
+ * optional int32 type_id = 5;
+ */
+ boolean hasTypeId();
+ /**
+ * optional int32 type_id = 5;
+ */
+ int getTypeId();
+
// optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
/**
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
@@ -12885,6 +14684,16 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType();
+
+ // optional int32 vararg_element_type_id = 6;
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ boolean hasVarargElementTypeId();
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ int getVarargElementTypeId();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
@@ -12954,7 +14763,7 @@ public final class ProtoBuf {
}
case 34: {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = varargElementType_.toBuilder();
}
varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
@@ -12962,7 +14771,17 @@ public final class ProtoBuf {
subBuilder.mergeFrom(varargElementType_);
varargElementType_ = subBuilder.buildPartial();
}
+ bitField0_ |= 0x00000010;
+ break;
+ }
+ case 40: {
bitField0_ |= 0x00000008;
+ typeId_ = input.readInt32();
+ break;
+ }
+ case 48: {
+ bitField0_ |= 0x00000020;
+ varargElementTypeId_ = input.readInt32();
break;
}
}
@@ -13036,22 +14855,38 @@ public final class ProtoBuf {
return name_;
}
- // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type type = 3;
public static final int TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public boolean hasType() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
return type_;
}
+ // optional int32 type_id = 5;
+ public static final int TYPE_ID_FIELD_NUMBER = 5;
+ private int typeId_;
+ /**
+ * optional int32 type_id = 5;
+ */
+ public boolean hasTypeId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 type_id = 5;
+ */
+ public int getTypeId() {
+ return typeId_;
+ }
+
// optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_;
@@ -13059,7 +14894,7 @@ public final class ProtoBuf {
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
*/
public boolean hasVarargElementType() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
@@ -13068,11 +14903,29 @@ public final class ProtoBuf {
return varargElementType_;
}
+ // optional int32 vararg_element_type_id = 6;
+ public static final int VARARG_ELEMENT_TYPE_ID_FIELD_NUMBER = 6;
+ private int varargElementTypeId_;
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ public boolean hasVarargElementTypeId() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ public int getVarargElementTypeId() {
+ return varargElementTypeId_;
+ }
+
private void initFields() {
flags_ = 0;
name_ = 0;
type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ typeId_ = 0;
varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ varargElementTypeId_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -13083,13 +14936,11 @@ public final class ProtoBuf {
memoizedIsInitialized = 0;
return false;
}
- if (!hasType()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!getType().isInitialized()) {
- memoizedIsInitialized = 0;
- return false;
+ if (hasType()) {
+ if (!getType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
if (hasVarargElementType()) {
if (!getVarargElementType().isInitialized()) {
@@ -13120,9 +14971,15 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, type_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(4, varargElementType_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeInt32(5, typeId_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeInt32(6, varargElementTypeId_);
+ }
extensionWriter.writeUntil(200, output);
}
@@ -13144,10 +15001,18 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(3, type_);
}
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, varargElementType_);
}
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(5, typeId_);
+ }
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(6, varargElementTypeId_);
+ }
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -13245,8 +15110,12 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000002);
type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004);
- varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ typeId_ = 0;
bitField0_ = (bitField0_ & ~0x00000008);
+ varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ bitField0_ = (bitField0_ & ~0x00000010);
+ varargElementTypeId_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000020);
return this;
}
@@ -13285,7 +15154,15 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008;
}
+ result.typeId_ = typeId_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000010;
+ }
result.varargElementType_ = varargElementType_;
+ if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+ to_bitField0_ |= 0x00000020;
+ }
+ result.varargElementTypeId_ = varargElementTypeId_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -13301,9 +15178,15 @@ public final class ProtoBuf {
if (other.hasType()) {
mergeType(other.getType());
}
+ if (other.hasTypeId()) {
+ setTypeId(other.getTypeId());
+ }
if (other.hasVarargElementType()) {
mergeVarargElementType(other.getVarargElementType());
}
+ if (other.hasVarargElementTypeId()) {
+ setVarargElementTypeId(other.getVarargElementTypeId());
+ }
this.mergeExtensionFields(other);
return this;
}
@@ -13313,13 +15196,11 @@ public final class ProtoBuf {
return false;
}
- if (!hasType()) {
-
- return false;
- }
- if (!getType().isInitialized()) {
-
- return false;
+ if (hasType()) {
+ if (!getType().isInitialized()) {
+
+ return false;
+ }
}
if (hasVarargElementType()) {
if (!getVarargElementType().isInitialized()) {
@@ -13443,22 +15324,22 @@ public final class ProtoBuf {
return this;
}
- // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ // optional .org.jetbrains.kotlin.serialization.Type type = 3;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public boolean hasType() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
return type_;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (value == null) {
@@ -13470,7 +15351,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public Builder setType(
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
@@ -13480,7 +15361,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
@@ -13495,7 +15376,7 @@ public final class ProtoBuf {
return this;
}
/**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ * optional .org.jetbrains.kotlin.serialization.Type type = 3;
*/
public Builder clearType() {
type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
@@ -13504,13 +15385,46 @@ public final class ProtoBuf {
return this;
}
+ // optional int32 type_id = 5;
+ private int typeId_ ;
+ /**
+ * optional int32 type_id = 5;
+ */
+ public boolean hasTypeId() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional int32 type_id = 5;
+ */
+ public int getTypeId() {
+ return typeId_;
+ }
+ /**
+ * optional int32 type_id = 5;
+ */
+ public Builder setTypeId(int value) {
+ bitField0_ |= 0x00000008;
+ typeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 type_id = 5;
+ */
+ public Builder clearTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ typeId_ = 0;
+
+ return this;
+ }
+
// optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
*/
public boolean hasVarargElementType() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
@@ -13527,7 +15441,7 @@ public final class ProtoBuf {
}
varargElementType_ = value;
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -13537,14 +15451,14 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
varargElementType_ = builderForValue.build();
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return this;
}
/**
* optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
*/
public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ if (((bitField0_ & 0x00000010) == 0x00000010) &&
varargElementType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
varargElementType_ =
org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
@@ -13552,7 +15466,7 @@ public final class ProtoBuf {
varargElementType_ = value;
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -13561,7 +15475,40 @@ public final class ProtoBuf {
public Builder clearVarargElementType() {
varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
+ return this;
+ }
+
+ // optional int32 vararg_element_type_id = 6;
+ private int varargElementTypeId_ ;
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ public boolean hasVarargElementTypeId() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ public int getVarargElementTypeId() {
+ return varargElementTypeId_;
+ }
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ public Builder setVarargElementTypeId(int value) {
+ bitField0_ |= 0x00000020;
+ varargElementTypeId_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 vararg_element_type_id = 6;
+ */
+ public Builder clearVarargElementTypeId() {
+ bitField0_ = (bitField0_ & ~0x00000020);
+ varargElementTypeId_ = 0;
+
return this;
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
index 42925ba0155..73cbe9ba1f8 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
@@ -56,7 +56,7 @@ public class ClassDeserializer(private val components: DeserializationComponents
if (!fragment.hasTopLevelClass(classId.shortClassName)) return null
}
- components.createContext(fragment, nameResolver)
+ components.createContext(fragment, nameResolver, TypeTable(classProto.typeTable))
}
return DeserializedClassDescriptor(outerContext, classProto, nameResolver, sourceElement)
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index 14bc31e7148..4a4134d37ee 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -42,25 +42,26 @@ public class MemberDeserializer(private val c: DeserializationContext) {
Flags.IS_VAR.get(flags),
c.nameResolver.getName(proto.getName()),
Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)),
+ Flags.IS_LATEINIT.get(flags),
+ Flags.IS_CONST.get(flags),
proto,
c.nameResolver,
- Flags.IS_LATEINIT.get(flags),
- Flags.IS_CONST.get(flags)
+ c.typeTable
)
val local = c.childContext(property, proto.getTypeParameterList())
val hasGetter = Flags.HAS_GETTER.get(flags)
- val receiverAnnotations = if (hasGetter && proto.hasReceiverType())
+ val receiverAnnotations = if (hasGetter && (proto.hasReceiverType() || proto.hasReceiverTypeId()))
getReceiverParameterAnnotations(proto, AnnotatedCallableKind.PROPERTY_GETTER)
else
Annotations.EMPTY
property.setType(
- local.typeDeserializer.type(proto.getReturnType()),
+ local.typeDeserializer.type(proto.returnType(c.typeTable)),
local.typeDeserializer.ownTypeParameters,
getDispatchReceiverParameter(),
- if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType(), receiverAnnotations) else null
+ proto.receiverType(c.typeTable)?.let { local.typeDeserializer.type(it, receiverAnnotations) }
)
val getter = if (hasGetter) {
@@ -130,18 +131,18 @@ public class MemberDeserializer(private val c: DeserializationContext) {
}
public fun loadFunction(proto: ProtoBuf.Function): FunctionDescriptor {
- val annotations = getAnnotations(proto, proto.getFlags(), AnnotatedCallableKind.FUNCTION)
- val receiverAnnotations = if (proto.hasReceiverType())
+ val annotations = getAnnotations(proto, proto.flags, AnnotatedCallableKind.FUNCTION)
+ val receiverAnnotations = if (proto.hasReceiverType() || proto.hasReceiverTypeId())
getReceiverParameterAnnotations(proto, AnnotatedCallableKind.FUNCTION)
else Annotations.EMPTY
- val function = DeserializedSimpleFunctionDescriptor.create(c.containingDeclaration, proto, c.nameResolver, annotations)
- val local = c.childContext(function, proto.getTypeParameterList())
+ val function = DeserializedSimpleFunctionDescriptor.create(c.containingDeclaration, annotations, proto, c.nameResolver, c.typeTable)
+ val local = c.childContext(function, proto.typeParameterList)
function.initialize(
- if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType(), receiverAnnotations) else null,
+ proto.receiverType(c.typeTable)?.let { local.typeDeserializer.type(it, receiverAnnotations) },
getDispatchReceiverParameter(),
local.typeDeserializer.ownTypeParameters,
local.memberDeserializer.valueParameters(proto.valueParameterList, proto, AnnotatedCallableKind.FUNCTION),
- local.typeDeserializer.type(proto.returnType),
+ local.typeDeserializer.type(proto.returnType(c.typeTable)),
Deserialization.modality(Flags.MODALITY.get(proto.flags)),
Deserialization.visibility(Flags.VISIBILITY.get(proto.flags))
)
@@ -158,7 +159,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
val classDescriptor = c.containingDeclaration as ClassDescriptor
val descriptor = DeserializedConstructorDescriptor(
classDescriptor, null, getAnnotations(proto, proto.flags, AnnotatedCallableKind.FUNCTION),
- isPrimary, CallableMemberDescriptor.Kind.DECLARATION, proto, c.nameResolver
+ isPrimary, CallableMemberDescriptor.Kind.DECLARATION, proto, c.nameResolver, c.typeTable
)
val local = c.childContext(descriptor, listOf())
descriptor.initialize(
@@ -209,9 +210,9 @@ public class MemberDeserializer(private val c: DeserializationContext) {
callableDescriptor, null, i,
containerOfCallable?.let { getParameterAnnotations(it, callable, kind, i, proto) } ?: Annotations.EMPTY,
c.nameResolver.getName(proto.name),
- c.typeDeserializer.type(proto.type),
+ c.typeDeserializer.type(proto.type(c.typeTable)),
Flags.DECLARES_DEFAULT_VALUE.get(flags),
- if (proto.hasVarargElementType()) c.typeDeserializer.type(proto.varargElementType) else null,
+ proto.varargElementType(c.typeTable)?.let { c.typeDeserializer.type(it) },
SourceElement.NO_SOURCE
)
}.toReadOnlyList()
@@ -230,8 +231,8 @@ public class MemberDeserializer(private val c: DeserializationContext) {
}
private fun DeclarationDescriptor.asProtoContainer(): ProtoContainer? = when(this) {
- is PackageFragmentDescriptor -> ProtoContainer(null, fqName, c.nameResolver)
- is DeserializedClassDescriptor -> ProtoContainer(classProto, null, c.nameResolver)
+ is PackageFragmentDescriptor -> ProtoContainer(null, fqName, c.nameResolver, c.typeTable)
+ is DeserializedClassDescriptor -> ProtoContainer(classProto, null, c.nameResolver, c.typeTable)
else -> null // TODO: support annotations on lambdas and their parameters
}
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
index 4c73b386468..e06990c1a77 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
@@ -22,7 +22,8 @@ import org.jetbrains.kotlin.serialization.ProtoBuf
public data class ProtoContainer(
val classProto: ProtoBuf.Class?,
val packageFqName: FqName?,
- val nameResolver: NameResolver
+ val nameResolver: NameResolver,
+ val typeTable: TypeTable
) {
init {
assert((classProto != null) xor (packageFqName != null))
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
index d3e762b6165..e5d34b4811d 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
@@ -42,7 +42,7 @@ public class TypeDeserializer(
else {
val result = LinkedHashMap()
for ((index, proto) in typeParameterProtos.withIndex()) {
- result[proto.getId()] = DeserializedTypeParameterDescriptor(c, proto, index)
+ result[proto.id] = DeserializedTypeParameterDescriptor(c, proto, index)
}
result
}
@@ -51,18 +51,16 @@ public class TypeDeserializer(
val ownTypeParameters: List
get() = typeParameterDescriptors().values().toReadOnlyList()
+ // TODO: don't load identical types from TypeTable more than once
fun type(proto: ProtoBuf.Type, additionalAnnotations: Annotations = Annotations.EMPTY): JetType {
if (proto.hasFlexibleTypeCapabilitiesId()) {
- val id = c.nameResolver.getString(proto.getFlexibleTypeCapabilitiesId())
- val capabilities = c.components.flexibleTypeCapabilitiesDeserializer.capabilitiesById(id)
-
- if (capabilities == null) {
- return ErrorUtils.createErrorType("${DeserializedType(c, proto)}: Capabilities not found for id $id")
- }
+ val id = c.nameResolver.getString(proto.flexibleTypeCapabilitiesId)
+ val capabilities = c.components.flexibleTypeCapabilitiesDeserializer.capabilitiesById(id) ?:
+ return ErrorUtils.createErrorType("${DeserializedType(c, proto)}: Capabilities not found for id $id")
return DelegatingFlexibleType.create(
DeserializedType(c, proto),
- DeserializedType(c, proto.getFlexibleUpperBound()),
+ DeserializedType(c, proto.flexibleUpperBound(c.typeTable)!!),
capabilities
)
}
@@ -95,7 +93,7 @@ public class TypeDeserializer(
private fun computeClassDescriptor(fqNameIndex: Int): ClassDescriptor? {
val id = c.nameResolver.getClassId(fqNameIndex)
- if (id.isLocal()) {
+ if (id.isLocal) {
// Local classes can't be found in scopes
return c.components.localClassResolver.resolveLocalClass(id)
}
@@ -103,12 +101,18 @@ public class TypeDeserializer(
}
fun typeArgument(parameter: TypeParameterDescriptor?, typeArgumentProto: ProtoBuf.Type.Argument): TypeProjection {
- return if (typeArgumentProto.getProjection() == ProtoBuf.Type.Argument.Projection.STAR)
- if (parameter == null)
- TypeBasedStarProjectionImpl(c.components.moduleDescriptor.builtIns.getNullableAnyType())
+ if (typeArgumentProto.projection == ProtoBuf.Type.Argument.Projection.STAR) {
+ return if (parameter == null)
+ TypeBasedStarProjectionImpl(c.components.moduleDescriptor.builtIns.nullableAnyType)
else
StarProjectionImpl(parameter)
- else TypeProjectionImpl(Deserialization.variance(typeArgumentProto.getProjection()), type(typeArgumentProto.getType()))
+ }
+
+ val variance = Deserialization.variance(typeArgumentProto.projection)
+ val type = typeArgumentProto.type(c.typeTable) ?:
+ return TypeProjectionImpl(ErrorUtils.createErrorType("No type recorded"))
+
+ return TypeProjectionImpl(variance, type(type))
}
override fun toString() = debugName + (if (parent == null) "" else ". Child of ${parent.debugName}")
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt
new file mode 100644
index 00000000000..90790723a24
--- /dev/null
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.serialization.deserialization
+
+import org.jetbrains.kotlin.serialization.ProtoBuf
+
+class TypeTable(typeTable: ProtoBuf.TypeTable) {
+ val types: List = run {
+ val originalTypes = typeTable.typeList
+ if (typeTable.hasFirstNullable()) {
+ val firstNullable = typeTable.firstNullable
+ typeTable.typeList.mapIndexed { i, type ->
+ if (i >= firstNullable) {
+ type.toBuilder().setNullable(true).build()
+ }
+ else type
+ }
+ }
+ else originalTypes
+ }
+
+ operator fun get(index: Int) = types[index]
+}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
index d8931332998..e6bc696ee66 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.constants.ConstantValue
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.storage.StorageManager
-public class DeserializationComponents(
+class DeserializationComponents(
val storageManager: StorageManager,
val moduleDescriptor: ModuleDescriptor,
val classDataFinder: ClassDataFinder,
@@ -37,19 +37,24 @@ public class DeserializationComponents(
val typeCapabilitiesLoader: TypeCapabilitiesLoader = TypeCapabilitiesLoader.NONE,
val additionalSupertypes: AdditionalSupertypes = AdditionalSupertypes.None
) {
- public val classDeserializer: ClassDeserializer = ClassDeserializer(this)
+ val classDeserializer: ClassDeserializer = ClassDeserializer(this)
- public fun deserializeClass(classId: ClassId): ClassDescriptor? = classDeserializer.deserializeClass(classId)
+ fun deserializeClass(classId: ClassId): ClassDescriptor? = classDeserializer.deserializeClass(classId)
- public fun createContext(descriptor: PackageFragmentDescriptor, nameResolver: NameResolver): DeserializationContext =
- DeserializationContext(this, nameResolver, descriptor, parentTypeDeserializer = null, typeParameters = listOf())
+ fun createContext(
+ descriptor: PackageFragmentDescriptor,
+ nameResolver: NameResolver,
+ typeTable: TypeTable
+ ): DeserializationContext =
+ DeserializationContext(this, nameResolver, descriptor, typeTable, parentTypeDeserializer = null, typeParameters = listOf())
}
-public class DeserializationContext(
- public val components: DeserializationComponents,
- public val nameResolver: NameResolver,
- public val containingDeclaration: DeclarationDescriptor,
+class DeserializationContext(
+ val components: DeserializationComponents,
+ val nameResolver: NameResolver,
+ val containingDeclaration: DeclarationDescriptor,
+ val typeTable: TypeTable,
parentTypeDeserializer: TypeDeserializer?,
typeParameters: List
) {
@@ -63,8 +68,11 @@ public class DeserializationContext(
fun childContext(
descriptor: DeclarationDescriptor,
typeParameterProtos: List,
- nameResolver: NameResolver = this.nameResolver
+ nameResolver: NameResolver = this.nameResolver,
+ typeTable: TypeTable = this.typeTable
) = DeserializationContext(
- components, nameResolver, descriptor, parentTypeDeserializer = this.typeDeserializer, typeParameters = typeParameterProtos
+ components, nameResolver, descriptor, typeTable,
+ parentTypeDeserializer = this.typeDeserializer,
+ typeParameters = typeParameterProtos
)
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
index 7227f828271..5bd2cdf5366 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
@@ -19,9 +19,12 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors
import com.google.protobuf.MessageLite
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
interface DeserializedCallableMemberDescriptor : CallableMemberDescriptor {
val proto: MessageLite
val nameResolver: NameResolver
+
+ val typeTable: TypeTable
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index 24b9f6db4a3..43e2abbcd56 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -30,10 +30,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.Deserialization
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
-import org.jetbrains.kotlin.serialization.deserialization.DeserializedType
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.*
import org.jetbrains.kotlin.types.AbstractClassTypeConstructor
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.upperIfFlexible
@@ -58,7 +55,7 @@ public class DeserializedClassDescriptor(
private val isCompanion = kindFromProto == ProtoBuf.Class.Kind.COMPANION_OBJECT
private val isInner = Flags.IS_INNER.get(classProto.getFlags())
- val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)
+ val c = outerContext.childContext(this, classProto.typeParameterList, nameResolver, TypeTable(classProto.typeTable))
private val classId = nameResolver.getClassId(classProto.getFqName())
@@ -138,7 +135,7 @@ public class DeserializedClassDescriptor(
val result = ArrayList(classProto.supertypeCount)
val unresolved = ArrayList(0)
- for (supertypeProto in classProto.supertypeList) {
+ for (supertypeProto in classProto.supertypes(c.typeTable)) {
val supertype = c.typeDeserializer.type(supertypeProto)
if (supertype.isError) {
unresolved.add(supertype.upperIfFlexible() as? DeserializedType ?: error("Not a deserialized type: $supertype"))
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedConstructorDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedConstructorDescriptor.kt
index 4ad18017aae..eddbe6b539c 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedConstructorDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedConstructorDescriptor.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
public class DeserializedConstructorDescriptor(
containingDeclaration: ClassDescriptor,
@@ -29,7 +30,8 @@ public class DeserializedConstructorDescriptor(
isPrimary: Boolean,
kind: CallableMemberDescriptor.Kind,
override val proto: ProtoBuf.Constructor,
- override val nameResolver: NameResolver
+ override val nameResolver: NameResolver,
+ override val typeTable: TypeTable
) : ConstructorDescriptorImpl(containingDeclaration, original, annotations, isPrimary, kind, SourceElement.NO_SOURCE),
DeserializedCallableMemberDescriptor {
@@ -39,7 +41,8 @@ public class DeserializedConstructorDescriptor(
kind: CallableMemberDescriptor.Kind
): DeserializedConstructorDescriptor {
return DeserializedConstructorDescriptor(
- newOwner as ClassDescriptor, original as ConstructorDescriptor?, getAnnotations(), isPrimary, kind, proto, nameResolver
+ newOwner as ClassDescriptor, original as ConstructorDescriptor?,
+ annotations, isPrimary, kind, proto, nameResolver, typeTable
)
}
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
index d872cf70393..cd1cefee520 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
+import org.jetbrains.kotlin.serialization.deserialization.receiverType
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.toReadOnlyList
import java.util.*
@@ -38,11 +39,11 @@ public abstract class DeserializedMemberScope protected constructor(
private val functionProtos =
c.storageManager.createLazyValue {
- groupByKey(filteredFunctionProtos(functionList), { it.name }) { it.hasReceiverType() }
+ groupByKey(filteredFunctionProtos(functionList), { it.name }) { it.receiverType(c.typeTable) != null }
}
private val propertyProtos =
c.storageManager.createLazyValue {
- groupByKey(filteredPropertyProtos(propertyList), { it.name }) { it.hasReceiverType() }
+ groupByKey(filteredPropertyProtos(propertyList), { it.name }) { it.receiverType(c.typeTable) != null }
}
private val functions =
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
index 7eb19fb524e..68057cefc2e 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.utils.addIfNotNull
@@ -38,7 +39,10 @@ public open class DeserializedPackageMemberScope(
nameResolver: NameResolver,
components: DeserializationComponents,
classNames: () -> Collection
-) : DeserializedMemberScope(components.createContext(packageDescriptor, nameResolver), proto.functionList, proto.propertyList) {
+) : DeserializedMemberScope(
+ components.createContext(packageDescriptor, nameResolver, TypeTable(proto.typeTable)),
+ proto.functionList, proto.propertyList
+) {
private val packageFqName = packageDescriptor.fqName
internal val classNames by c.storageManager.createLazyValue { classNames().toSet() }
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
index ae10825bd86..6dec77ca309 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
class DeserializedPropertyDescriptor(
containingDeclaration: DeclarationDescriptor,
@@ -33,10 +34,11 @@ class DeserializedPropertyDescriptor(
isVar: Boolean,
name: Name,
kind: Kind,
+ lateInit: Boolean,
+ isConst: Boolean,
override val proto: ProtoBuf.Property,
override val nameResolver: NameResolver,
- lateInit: Boolean,
- isConst: Boolean
+ override val typeTable: TypeTable
) : DeserializedCallableMemberDescriptor,
PropertyDescriptorImpl(containingDeclaration, original, annotations,
modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE, lateInit, isConst) {
@@ -49,6 +51,8 @@ class DeserializedPropertyDescriptor(
kind: Kind
): PropertyDescriptorImpl {
return DeserializedPropertyDescriptor(
- newOwner, original, annotations, newModality, newVisibility, isVar, name, kind, proto, nameResolver, isLateInit, isConst)
+ newOwner, original, annotations, newModality, newVisibility, isVar, name, kind, isLateInit, isConst,
+ proto, nameResolver, typeTable
+ )
}
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
index a905f265d22..cdcaf5a4d05 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
@@ -30,11 +30,13 @@ import org.jetbrains.kotlin.serialization.Flags;
import org.jetbrains.kotlin.serialization.ProtoBuf;
import org.jetbrains.kotlin.serialization.deserialization.Deserialization;
import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable;
public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescriptorImpl implements DeserializedCallableMemberDescriptor {
private final ProtoBuf.Function proto;
private final NameResolver nameResolver;
+ private final TypeTable typeTable;
private DeserializedSimpleFunctionDescriptor(
@NotNull DeclarationDescriptor containingDeclaration,
@@ -43,11 +45,13 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
@NotNull Name name,
@NotNull Kind kind,
@NotNull ProtoBuf.Function proto,
- @NotNull NameResolver nameResolver
+ @NotNull NameResolver nameResolver,
+ @NotNull TypeTable typeTable
) {
super(containingDeclaration, original, annotations, name, kind, SourceElement.NO_SOURCE);
this.proto = proto;
this.nameResolver = nameResolver;
+ this.typeTable = typeTable;
}
@NotNull
@@ -64,7 +68,8 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
getName(),
kind,
proto,
- nameResolver
+ nameResolver,
+ typeTable
);
}
@@ -86,12 +91,19 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
return nameResolver;
}
+ @NotNull
+ @Override
+ public TypeTable getTypeTable() {
+ return typeTable;
+ }
+
@NotNull
public static DeserializedSimpleFunctionDescriptor create(
@NotNull DeclarationDescriptor containingDeclaration,
+ @NotNull Annotations annotations,
@NotNull ProtoBuf.Function proto,
@NotNull NameResolver nameResolver,
- @NotNull Annotations annotations
+ @NotNull TypeTable typeTable
) {
return new DeserializedSimpleFunctionDescriptor(
containingDeclaration,
@@ -100,7 +112,8 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
nameResolver.getName(proto.getName()),
Deserialization.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
proto,
- nameResolver
+ nameResolver,
+ typeTable
);
}
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
index 6fdc650f38e..aaa5f1b0f98 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
@@ -21,13 +21,12 @@ import org.jetbrains.kotlin.descriptors.SourceElement;
import org.jetbrains.kotlin.descriptors.annotations.Annotations;
import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor;
import org.jetbrains.kotlin.serialization.ProtoBuf;
-import org.jetbrains.kotlin.serialization.deserialization.Deserialization;
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext;
-import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer;
+import org.jetbrains.kotlin.serialization.deserialization.*;
import org.jetbrains.kotlin.types.JetType;
import java.util.Collections;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Set;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns;
@@ -35,6 +34,7 @@ import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getB
public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor {
private final ProtoBuf.TypeParameter proto;
private final TypeDeserializer typeDeserializer;
+ private final TypeTable typeTable;
public DeserializedTypeParameterDescriptor(@NotNull DeserializationContext c, @NotNull ProtoBuf.TypeParameter proto, int index) {
super(c.getStorageManager(),
@@ -46,16 +46,18 @@ public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParamet
SourceElement.NO_SOURCE);
this.proto = proto;
this.typeDeserializer = c.getTypeDeserializer();
+ this.typeTable = c.getTypeTable();
}
@NotNull
@Override
protected Set resolveUpperBounds() {
- if (proto.getUpperBoundCount() == 0) {
+ List upperBounds = ProtoTypeTableUtilKt.upperBounds(proto, typeTable);
+ if (upperBounds.isEmpty()) {
return Collections.singleton(getBuiltIns(this).getDefaultBound());
}
- Set result = new LinkedHashSet(proto.getUpperBoundCount());
- for (ProtoBuf.Type upperBound : proto.getUpperBoundList()) {
+ Set result = new LinkedHashSet(upperBounds.size());
+ for (ProtoBuf.Type upperBound : upperBounds) {
result.add(typeDeserializer.type(upperBound, Annotations.Companion.getEMPTY()));
}
return result;
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt
new file mode 100644
index 00000000000..45c6960baa0
--- /dev/null
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.serialization.deserialization
+
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.utils.ifEmpty
+
+fun ProtoBuf.Class.supertypes(typeTable: TypeTable): List {
+ return supertypeList.ifEmpty { supertypeIdList.map { typeTable[it] } }
+}
+
+fun ProtoBuf.Type.Argument.type(typeTable: TypeTable): ProtoBuf.Type? {
+ return when {
+ hasType() -> type
+ hasTypeId() -> typeTable[typeId]
+ else -> null
+ }
+}
+
+fun ProtoBuf.Type.flexibleUpperBound(typeTable: TypeTable): ProtoBuf.Type? {
+ return when {
+ hasFlexibleUpperBound() -> flexibleUpperBound
+ hasFlexibleUpperBoundId() -> typeTable[flexibleUpperBoundId]
+ else -> null
+ }
+}
+
+fun ProtoBuf.TypeParameter.upperBounds(typeTable: TypeTable): List {
+ return upperBoundList.ifEmpty { upperBoundIdList.map { typeTable[it] } }
+}
+
+fun ProtoBuf.Function.returnType(typeTable: TypeTable): ProtoBuf.Type {
+ return if (hasReturnType()) returnType else typeTable[returnTypeId]
+}
+
+fun ProtoBuf.Function.receiverType(typeTable: TypeTable): ProtoBuf.Type? {
+ return when {
+ hasReceiverType() -> receiverType
+ hasReceiverTypeId() -> typeTable[receiverTypeId]
+ else -> null
+ }
+}
+
+fun ProtoBuf.Property.returnType(typeTable: TypeTable): ProtoBuf.Type {
+ return if (hasReturnType()) returnType else typeTable[returnTypeId]
+}
+
+fun ProtoBuf.Property.receiverType(typeTable: TypeTable): ProtoBuf.Type? {
+ return when {
+ hasReceiverType() -> receiverType
+ hasReceiverTypeId() -> typeTable[receiverTypeId]
+ else -> null
+ }
+}
+
+fun ProtoBuf.ValueParameter.type(typeTable: TypeTable): ProtoBuf.Type {
+ return if (hasType()) type else typeTable[typeId]
+}
+
+fun ProtoBuf.ValueParameter.varargElementType(typeTable: TypeTable): ProtoBuf.Type? {
+ return when {
+ hasVarargElementType() -> varargElementType
+ hasVarargElementTypeId() -> typeTable[varargElementTypeId]
+ else -> null
+ }
+}
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt
index dc9bdc1bd16..6460f046ee4 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt
@@ -47,7 +47,7 @@ internal abstract class DescriptorBasedProperty protected constructor(
val jvmSignature = RuntimeTypeMapper.mapPropertySignature(descriptor)
when (jvmSignature) {
is KotlinProperty -> {
- JvmProtoBufUtil.getJvmFieldSignature(jvmSignature.proto, jvmSignature.nameResolver)?.let {
+ JvmProtoBufUtil.getJvmFieldSignature(jvmSignature.proto, jvmSignature.nameResolver, jvmSignature.typeTable)?.let {
container.findFieldBySignature(jvmSignature.proto, jvmSignature.nameResolver, it.name)
}
}
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
index 14a3e190a7d..e0bb56d0c78 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.classId
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
@@ -100,7 +101,8 @@ internal sealed class JvmPropertySignature {
val descriptor: PropertyDescriptor,
val proto: ProtoBuf.Property,
val signature: JvmProtoBuf.JvmPropertySignature,
- val nameResolver: NameResolver
+ val nameResolver: NameResolver,
+ val typeTable: TypeTable
) : JvmPropertySignature() {
private val string: String
@@ -110,7 +112,7 @@ internal sealed class JvmPropertySignature {
}
else {
val (name, desc) =
- JvmProtoBufUtil.getJvmFieldSignature(proto, nameResolver) ?:
+ JvmProtoBufUtil.getJvmFieldSignature(proto, nameResolver, typeTable) ?:
throw KotlinReflectionInternalError("No field signature for property: $descriptor")
val moduleSuffix =
@@ -154,12 +156,12 @@ internal object RuntimeTypeMapper {
val proto = function.proto
if (proto is ProtoBuf.Function) {
- JvmProtoBufUtil.getJvmMethodSignature(proto, function.nameResolver)?.let { signature ->
+ JvmProtoBufUtil.getJvmMethodSignature(proto, function.nameResolver, function.typeTable)?.let { signature ->
return JvmFunctionSignature.KotlinFunction(signature)
}
}
if (proto is ProtoBuf.Constructor) {
- JvmProtoBufUtil.getJvmConstructorSignature(proto, function.nameResolver)?.let { signature ->
+ JvmProtoBufUtil.getJvmConstructorSignature(proto, function.nameResolver, function.typeTable)?.let { signature ->
return JvmFunctionSignature.KotlinConstructor(signature)
}
}
@@ -191,7 +193,7 @@ internal object RuntimeTypeMapper {
throw KotlinReflectionInternalError("No metadata found for $property")
}
return JvmPropertySignature.KotlinProperty(
- property, proto, proto.getExtension(JvmProtoBuf.propertySignature), property.nameResolver
+ property, proto, proto.getExtension(JvmProtoBuf.propertySignature), property.nameResolver, property.typeTable
)
}
else if (property is JavaPropertyDescriptor) {
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
index 10db32cdc9d..7b61e9de39f 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.load.kotlin.JvmNameResolver
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
import org.jetbrains.kotlin.serialization.jvm.BitEncoding
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
@@ -43,8 +44,10 @@ public fun Function.reflect(): KFunction? {
)
val proto = ProtoBuf.Function.parseFrom(input, JvmProtoBufUtil.EXTENSION_REGISTRY)
val moduleData = javaClass.getOrCreateModule()
- val context = DeserializationContext(moduleData.deserialization, nameResolver, moduleData.module,
- parentTypeDeserializer = null, typeParameters = listOf())
+ val context = DeserializationContext(
+ moduleData.deserialization, nameResolver, moduleData.module,
+ typeTable = TypeTable(proto.typeTable), parentTypeDeserializer = null, typeParameters = listOf()
+ )
val descriptor = MemberDeserializer(context).loadFunction(proto)
@Suppress("UNCHECKED_CAST")
return KFunctionImpl(EmptyContainerForLocal, descriptor) as KFunction
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
index 5635d76448d..3e2ce826333 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.MemberKind
import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.receiverType
+import org.jetbrains.kotlin.serialization.deserialization.returnType
fun createCallableStubs(
parentStub: StubElement,
@@ -118,10 +120,10 @@ private class FunctionClsStubBuilder(
private val functionProto: ProtoBuf.Function
) : CallableClsStubBuilder(parent, outerContext, protoContainer, functionProto.typeParameterList) {
override val receiverType: ProtoBuf.Type?
- get() = if (functionProto.hasReceiverType()) functionProto.receiverType else null
+ get() = functionProto.receiverType(c.typeTable)
override val returnType: ProtoBuf.Type?
- get() = if (functionProto.hasReturnType()) functionProto.returnType else null
+ get() = functionProto.returnType(c.typeTable)
override fun createValueParameterList() {
typeStubBuilder.createValueParameterListStub(callableStub, functionProto, functionProto.valueParameterList, protoContainer)
@@ -165,10 +167,10 @@ private class PropertyClsStubBuilder(
private val isVar = Flags.IS_VAR.get(propertyProto.flags)
override val receiverType: ProtoBuf.Type?
- get() = if (propertyProto.hasReceiverType()) propertyProto.receiverType else null
+ get() = propertyProto.receiverType(c.typeTable)
override val returnType: ProtoBuf.Type?
- get() = if (propertyProto.hasReturnType()) propertyProto.returnType else null
+ get() = propertyProto.returnType(c.typeTable)
override fun createValueParameterList() {
}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
index 6ddb7c866c4..e01afe87bf9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -37,6 +37,8 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
+import org.jetbrains.kotlin.serialization.deserialization.supertypes
fun createClassStub(parent: StubElement, classProto: ProtoBuf.Class, classId: ClassId, context: ClsStubBuilderContext) {
ClassClsStubBuilder(parent, classProto, classId, context).build()
@@ -48,11 +50,11 @@ private class ClassClsStubBuilder(
private val classId: ClassId,
private val outerContext: ClsStubBuilderContext
) {
- private val c = outerContext.child(classProto.getTypeParameterList(), classId.getShortClassName())
+ private val c = outerContext.child(classProto.typeParameterList, classId.shortClassName, TypeTable(classProto.typeTable))
private val typeStubBuilder = TypeClsStubBuilder(c)
- private val classKind = Flags.CLASS_KIND[classProto.getFlags()]
+ private val classKind = Flags.CLASS_KIND[classProto.flags]
private val supertypeIds = run {
- val supertypeIds = classProto.supertypeList.map { c.nameResolver.getClassId(it.className) }
+ val supertypeIds = classProto.supertypes(c.typeTable).map { c.nameResolver.getClassId(it.className) }
//empty supertype list if single supertype is Any
if (supertypeIds.singleOrNull()?.let { KotlinBuiltIns.isAny(it.asSingleFqName().toUnsafe()) } ?: false) {
listOf()
@@ -133,7 +135,7 @@ private class ClassClsStubBuilder(
val primaryConstructorProto = classProto.constructorList.find { !Flags.IS_SECONDARY.get(it.flags) } ?: return
- createConstructorStub(classOrObjectStub, primaryConstructorProto, c, ProtoContainer(classProto, null, c.nameResolver))
+ createConstructorStub(classOrObjectStub, primaryConstructorProto, c, ProtoContainer(classProto, null, c.nameResolver, c.typeTable))
}
private fun createDelegationSpecifierList() {
@@ -143,7 +145,7 @@ private class ClassClsStubBuilder(
val delegationSpecifierListStub =
KotlinPlaceHolderStubImpl(classOrObjectStub, JetStubElementTypes.DELEGATION_SPECIFIER_LIST)
- classProto.getSupertypeList().forEach { type ->
+ classProto.supertypes(c.typeTable).forEach { type ->
val superClassStub = KotlinPlaceHolderStubImpl(
delegationSpecifierListStub, JetStubElementTypes.DELEGATOR_SUPER_CLASS
)
@@ -186,7 +188,7 @@ private class ClassClsStubBuilder(
}
private fun createCallableMemberStubs(classBody: KotlinPlaceHolderStubImpl) {
- val container = ProtoContainer(classProto, null, c.nameResolver)
+ val container = ProtoContainer(classProto, null, c.nameResolver, c.typeTable)
for (secondaryConstructorProto in classProto.constructorList) {
if (Flags.IS_SECONDARY.get(secondaryConstructorProto.flags)) {
@@ -216,6 +218,6 @@ private class ClassClsStubBuilder(
private fun createNestedClassStub(classBody: StubElement, nestedClassId: ClassId) {
val classDataWithSource = c.components.classDataFinder.findClassData(nestedClassId)!!
val (nameResolver, classProto) = classDataWithSource.classData
- createClassStub(classBody, classProto, nestedClassId, c.child(nameResolver))
+ createClassStub(classBody, classProto, nestedClassId, c.child(nameResolver, TypeTable(classProto.typeTable)))
}
}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
index dc35164c688..22424991581 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
@@ -25,10 +25,7 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.*
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -40,9 +37,10 @@ class ClsStubBuilderComponents(
) {
fun createContext(
nameResolver: NameResolver,
- packageFqName: FqName
+ packageFqName: FqName,
+ typeTable: TypeTable
): ClsStubBuilderContext {
- return ClsStubBuilderContext(this, nameResolver, packageFqName, EmptyTypeParameters)
+ return ClsStubBuilderContext(this, nameResolver, packageFqName, EmptyTypeParameters, typeTable)
}
}
@@ -71,24 +69,31 @@ class ClsStubBuilderContext(
val components: ClsStubBuilderComponents,
val nameResolver: NameResolver,
val containerFqName: FqName,
- val typeParameters: TypeParameters
+ val typeParameters: TypeParameters,
+ val typeTable: TypeTable
)
-internal fun ClsStubBuilderContext.child(typeParameterList: List, name: Name? = null): ClsStubBuilderContext {
+internal fun ClsStubBuilderContext.child(
+ typeParameterList: List,
+ name: Name? = null,
+ typeTable: TypeTable = this.typeTable
+): ClsStubBuilderContext {
return ClsStubBuilderContext(
this.components,
this.nameResolver,
if (name != null) this.containerFqName.child(name) else this.containerFqName,
- this.typeParameters.child(nameResolver, typeParameterList)
+ this.typeParameters.child(nameResolver, typeParameterList),
+ typeTable
)
}
-internal fun ClsStubBuilderContext.child(nameResolver: NameResolver): ClsStubBuilderContext {
+internal fun ClsStubBuilderContext.child(nameResolver: NameResolver, typeTable: TypeTable): ClsStubBuilderContext {
return ClsStubBuilderContext(
this.components,
nameResolver,
this.containerFqName,
- this.typeParameters
+ this.typeParameters,
+ typeTable
)
}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt
index fc5cb8d7fd7..48c59ba2c92 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassKind
import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
public open class KotlinClsStubBuilder : ClsStubBuilder() {
@@ -77,18 +78,18 @@ public open class KotlinClsStubBuilder : ClsStubBuilder() {
return when {
header.isCompatiblePackageFacadeKind() -> {
val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(annotationData, strings)
- val context = components.createContext(nameResolver, packageFqName)
+ val context = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
createPackageFacadeStub(packageProto, packageFqName, context)
}
header.isCompatibleClassKind() -> {
if (header.isLocalClass) return null
val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(annotationData, strings)
- val context = components.createContext(nameResolver, packageFqName)
+ val context = components.createContext(nameResolver, packageFqName, TypeTable(classProto.typeTable))
createTopLevelClassStub(classId, classProto, context)
}
header.isCompatibleFileFacadeKind() -> {
val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(annotationData, strings)
- val context = components.createContext(nameResolver, packageFqName)
+ val context = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
createFileFacadeStub(packageProto, classId.asSingleFqName(), context)
}
else -> throw IllegalStateException("Should have processed " + file.getPath() + " with header $header")
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubBuilder.kt
index fb6360bb814..c4a87d7657b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubBuilder.kt
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializedResourcePaths
import org.jetbrains.kotlin.serialization.js.toClassData
import org.jetbrains.kotlin.serialization.js.toPackageData
@@ -63,12 +64,14 @@ public open class KotlinJavaScriptStubBuilder : ClsStubBuilder() {
if (isPackageHeader) {
val packageData = content.toPackageData(nameResolver)
- val context = components.createContext(packageData.nameResolver, packageFqName)
+ val context = components.createContext(
+ packageData.nameResolver, packageFqName, TypeTable(packageData.packageProto.typeTable)
+ )
return createPackageFacadeStub(packageData.packageProto, packageFqName, context)
}
else {
val classData = content.toClassData(nameResolver)
- val context = components.createContext(classData.nameResolver, packageFqName)
+ val context = components.createContext(classData.nameResolver, packageFqName, TypeTable(classData.classProto.typeTable))
val classId = JsMetaFileUtils.getClassId(file)
return createTopLevelClassStub(classId, classData.classProto, context)
}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
index 0b3c8926ee8..ea298d5f812 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -35,6 +35,9 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.type
+import org.jetbrains.kotlin.serialization.deserialization.upperBounds
+import org.jetbrains.kotlin.serialization.deserialization.varargElementType
import org.jetbrains.kotlin.types.DynamicTypeCapabilities
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import java.util.*
@@ -98,12 +101,12 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
}
val typeArgumentsListStub = KotlinPlaceHolderStubImpl(typeStub, JetStubElementTypes.TYPE_ARGUMENT_LIST)
typeArgumentProtoList.forEach { typeArgumentProto ->
- val projectionKind = typeArgumentProto.getProjection().toProjectionKind()
+ val projectionKind = typeArgumentProto.projection.toProjectionKind()
val typeProjection = KotlinTypeProjectionStubImpl(typeArgumentsListStub, projectionKind.ordinal())
if (projectionKind != JetProjectionKind.STAR) {
- val modifierKeywordToken = projectionKind.getToken() as? JetModifierKeywordToken
+ val modifierKeywordToken = projectionKind.token as? JetModifierKeywordToken
createModifierListStub(typeProjection, modifierKeywordToken.singletonOrEmptyList())
- createTypeReferenceStub(typeProjection, typeArgumentProto.getType())
+ createTypeReferenceStub(typeProjection, typeArgumentProto.type(c.typeTable)!!)
}
}
}
@@ -116,12 +119,12 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
}
private fun createFunctionTypeStub(parent: StubElement, type: Type, isExtensionFunctionType: Boolean) {
- val typeArgumentList = type.getArgumentList()
+ val typeArgumentList = type.argumentList
val functionType = KotlinPlaceHolderStubImpl(parent, JetStubElementTypes.FUNCTION_TYPE)
if (isExtensionFunctionType) {
val functionTypeReceiverStub
= KotlinPlaceHolderStubImpl(functionType, JetStubElementTypes.FUNCTION_TYPE_RECEIVER)
- val receiverTypeProto = typeArgumentList.first().getType()
+ val receiverTypeProto = typeArgumentList.first().type(c.typeTable)!!
createTypeReferenceStub(functionTypeReceiverStub, receiverTypeProto)
}
@@ -129,11 +132,13 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
val typeArgumentsWithoutReceiverAndReturnType
= typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size() - 1)
typeArgumentsWithoutReceiverAndReturnType.forEach { argument ->
- val parameter = KotlinParameterStubImpl(parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false)
- createTypeReferenceStub(parameter, argument.getType())
+ val parameter = KotlinParameterStubImpl(
+ parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false
+ )
+ createTypeReferenceStub(parameter, argument.type(c.typeTable)!!)
}
- val returnType = typeArgumentList.last().getType()
+ val returnType = typeArgumentList.last().type(c.typeTable)!!
createTypeReferenceStub(functionType, returnType)
}
@@ -154,8 +159,10 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
hasValOrVar = false,
isMutable = false
)
- val isVararg = valueParameterProto.hasVarargElementType()
- val modifierList = if (isVararg) createModifierListStub(parameterStub, listOf(JetTokens.VARARG_KEYWORD)) else null
+ val varargElementType = valueParameterProto.varargElementType(c.typeTable)
+ val typeProto = varargElementType ?: valueParameterProto.type(c.typeTable)
+ val modifierList =
+ if (varargElementType != null) createModifierListStub(parameterStub, listOf(JetTokens.VARARG_KEYWORD)) else null
val parameterAnnotations = c.components.annotationLoader.loadValueParameterAnnotations(
container, callableProto, callableProto.annotatedCallableKind, index, valueParameterProto
)
@@ -163,7 +170,6 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
createAnnotationStubs(parameterAnnotations, modifierList ?: createEmptyModifierList(parameterStub))
}
- val typeProto = if (isVararg) valueParameterProto.varargElementType else valueParameterProto.type
createTypeReferenceStub(parameterStub, typeProto)
}
}
@@ -185,21 +191,21 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
val typeParameterListStub = KotlinPlaceHolderStubImpl(parent, JetStubElementTypes.TYPE_PARAMETER_LIST)
val protosForTypeConstraintList = arrayListOf>()
for (proto in typeParameterProtoList) {
- val name = c.nameResolver.getName(proto.getName())
+ val name = c.nameResolver.getName(proto.name)
val typeParameterStub = KotlinTypeParameterStubImpl(
typeParameterListStub,
name = name.ref(),
- isInVariance = proto.getVariance() == Variance.IN,
- isOutVariance = proto.getVariance() == Variance.OUT
+ isInVariance = proto.variance == Variance.IN,
+ isOutVariance = proto.variance == Variance.OUT
)
createTypeParameterModifierListStub(typeParameterStub, proto)
- val upperBoundProtos = proto.getUpperBoundList()
+ val upperBoundProtos = proto.upperBounds(c.typeTable)
if (upperBoundProtos.isNotEmpty()) {
val upperBound = upperBoundProtos.first()
if (!upperBound.isDefaultUpperBound()) {
createTypeReferenceStub(typeParameterStub, upperBound)
}
- protosForTypeConstraintList addAll upperBoundProtos.drop(1).map { Pair(name, it) }
+ protosForTypeConstraintList.addAll(upperBoundProtos.drop(1).map { Pair(name, it) })
}
}
return protosForTypeConstraintList
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
index b9e2760c6e3..9356b65f25e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.TypeTable
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
fun createTopLevelClassStub(classId: ClassId, classProto: ProtoBuf.Class, context: ClsStubBuilderContext): KotlinFileStubImpl {
@@ -51,7 +52,7 @@ fun createPackageFacadeStub(
): KotlinFileStubImpl {
val fileStub = KotlinFileStubForIde.forFile(packageFqName, packageFqName.isRoot)
setupFileStub(fileStub, packageFqName)
- createCallableStubs(fileStub, c, ProtoContainer(null, packageFqName, c.nameResolver),
+ createCallableStubs(fileStub, c, ProtoContainer(null, packageFqName, c.nameResolver, c.typeTable),
packageProto.functionList, packageProto.propertyList)
return fileStub
}
@@ -64,7 +65,7 @@ fun createFileFacadeStub(
val packageFqName = facadeFqName.parent()
val fileStub = KotlinFileStubForIde.forFileFacadeStub(facadeFqName, packageFqName.isRoot)
setupFileStub(fileStub, packageFqName)
- createCallableStubs(fileStub, c, ProtoContainer(null, packageFqName, c.nameResolver),
+ createCallableStubs(fileStub, c, ProtoContainer(null, packageFqName, c.nameResolver, c.typeTable),
packageProto.functionList, packageProto.propertyList)
return fileStub
}
@@ -82,8 +83,8 @@ fun createMultifileClassStub(
for (partFile in partFiles) {
val partHeader = partFile.classHeader
val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(partHeader.annotationData!!, partHeader.strings!!)
- val partContext = components.createContext(nameResolver, packageFqName)
- createCallableStubs(fileStub, partContext, ProtoContainer(null, packageFqName, partContext.nameResolver),
+ val partContext = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
+ createCallableStubs(fileStub, partContext, ProtoContainer(null, packageFqName, partContext.nameResolver, partContext.typeTable),
packageProto.functionList, packageProto.propertyList)
}
return fileStub
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
index 597ba7dcbfb..4401a64b791 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
@@ -39,11 +39,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsPackageProperty(old, new)) return false
+ if (old.hasTypeTable() != new.hasTypeTable()) return false
+ if (old.hasTypeTable()) {
+ if (!checkEquals(old.typeTable, new.typeTable)) return false
+ }
+
return true
}
public enum class ProtoBufPackageKind {
FUNCTION_LIST,
- PROPERTY_LIST
+ PROPERTY_LIST,
+ TYPE_TABLE
}
public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet {
@@ -53,6 +59,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST)
+ if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufPackageKind.TYPE_TABLE)
+ if (old.hasTypeTable()) {
+ if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufPackageKind.TYPE_TABLE)
+ }
+
return result
}
@@ -73,6 +84,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsClassSupertype(old, new)) return false
+ if (!checkEqualsClassSupertypeId(old, new)) return false
+
if (!checkEqualsClassNestedClassName(old, new)) return false
if (!checkEqualsClassConstructor(old, new)) return false
@@ -83,6 +96,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsClassEnumEntry(old, new)) return false
+ if (old.hasTypeTable() != new.hasTypeTable()) return false
+ if (old.hasTypeTable()) {
+ if (!checkEquals(old.typeTable, new.typeTable)) return false
+ }
+
if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false
for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
@@ -97,11 +115,13 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
COMPANION_OBJECT_NAME,
TYPE_PARAMETER_LIST,
SUPERTYPE_LIST,
+ SUPERTYPE_ID_LIST,
NESTED_CLASS_NAME_LIST,
CONSTRUCTOR_LIST,
FUNCTION_LIST,
PROPERTY_LIST,
ENUM_ENTRY_LIST,
+ TYPE_TABLE,
CLASS_ANNOTATION_LIST
}
@@ -124,6 +144,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsClassSupertype(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_LIST)
+ if (!checkEqualsClassSupertypeId(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_ID_LIST)
+
if (!checkEqualsClassNestedClassName(old, new)) result.add(ProtoBufClassKind.NESTED_CLASS_NAME_LIST)
if (!checkEqualsClassConstructor(old, new)) result.add(ProtoBufClassKind.CONSTRUCTOR_LIST)
@@ -134,6 +156,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST)
+ if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE)
+ if (old.hasTypeTable()) {
+ if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE)
+ }
+
if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST)
for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
@@ -151,7 +178,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkStringEquals(old.name, new.name)) return false
- if (!checkEquals(old.returnType, new.returnType)) return false
+ if (old.hasReturnType() != new.hasReturnType()) return false
+ if (old.hasReturnType()) {
+ if (!checkEquals(old.returnType, new.returnType)) return false
+ }
+
+ if (old.hasReturnTypeId() != new.hasReturnTypeId()) return false
+ if (old.hasReturnTypeId()) {
+ if (old.returnTypeId != new.returnTypeId) return false
+ }
if (!checkEqualsFunctionTypeParameter(old, new)) return false
@@ -160,8 +195,18 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEquals(old.receiverType, new.receiverType)) return false
}
+ if (old.hasReceiverTypeId() != new.hasReceiverTypeId()) return false
+ if (old.hasReceiverTypeId()) {
+ if (old.receiverTypeId != new.receiverTypeId) return false
+ }
+
if (!checkEqualsFunctionValueParameter(old, new)) return false
+ if (old.hasTypeTable() != new.hasTypeTable()) return false
+ if (old.hasTypeTable()) {
+ if (!checkEquals(old.typeTable, new.typeTable)) return false
+ }
+
if (old.hasExtension(JvmProtoBuf.methodSignature) != new.hasExtension(JvmProtoBuf.methodSignature)) return false
if (old.hasExtension(JvmProtoBuf.methodSignature)) {
if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false
@@ -183,7 +228,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkStringEquals(old.name, new.name)) return false
- if (!checkEquals(old.returnType, new.returnType)) return false
+ if (old.hasReturnType() != new.hasReturnType()) return false
+ if (old.hasReturnType()) {
+ if (!checkEquals(old.returnType, new.returnType)) return false
+ }
+
+ if (old.hasReturnTypeId() != new.hasReturnTypeId()) return false
+ if (old.hasReturnTypeId()) {
+ if (old.returnTypeId != new.returnTypeId) return false
+ }
if (!checkEqualsPropertyTypeParameter(old, new)) return false
@@ -192,6 +245,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEquals(old.receiverType, new.receiverType)) return false
}
+ if (old.hasReceiverTypeId() != new.hasReceiverTypeId()) return false
+ if (old.hasReceiverTypeId()) {
+ if (old.receiverTypeId != new.receiverTypeId) return false
+ }
+
if (old.hasSetterValueParameter() != new.hasSetterValueParameter()) return false
if (old.hasSetterValueParameter()) {
if (!checkEquals(old.setterValueParameter, new.setterValueParameter)) return false
@@ -220,6 +278,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
return true
}
+ open fun checkEquals(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean {
+ if (!checkEqualsTypeTableType(old, new)) return false
+
+ if (old.hasFirstNullable() != new.hasFirstNullable()) return false
+ if (old.hasFirstNullable()) {
+ if (old.firstNullable != new.firstNullable) return false
+ }
+
+ return true
+ }
+
open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean {
if (old.id != new.id) return false
@@ -237,6 +306,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEqualsTypeParameterUpperBound(old, new)) return false
+ if (!checkEqualsTypeParameterUpperBoundId(old, new)) return false
+
return true
}
@@ -258,6 +329,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false
}
+ if (old.hasFlexibleUpperBoundId() != new.hasFlexibleUpperBoundId()) return false
+ if (old.hasFlexibleUpperBoundId()) {
+ if (old.flexibleUpperBoundId != new.flexibleUpperBoundId) return false
+ }
+
if (old.hasClassName() != new.hasClassName()) return false
if (old.hasClassName()) {
if (!checkClassIdEquals(old.className, new.className)) return false
@@ -314,13 +390,26 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkStringEquals(old.name, new.name)) return false
- if (!checkEquals(old.type, new.type)) return false
+ if (old.hasType() != new.hasType()) return false
+ if (old.hasType()) {
+ if (!checkEquals(old.type, new.type)) return false
+ }
+
+ if (old.hasTypeId() != new.hasTypeId()) return false
+ if (old.hasTypeId()) {
+ if (old.typeId != new.typeId) return false
+ }
if (old.hasVarargElementType() != new.hasVarargElementType()) return false
if (old.hasVarargElementType()) {
if (!checkEquals(old.varargElementType, new.varargElementType)) return false
}
+ if (old.hasVarargElementTypeId() != new.hasVarargElementTypeId()) return false
+ if (old.hasVarargElementTypeId()) {
+ if (old.varargElementTypeId != new.varargElementTypeId) return false
+ }
+
if (old.hasExtension(JvmProtoBuf.index) != new.hasExtension(JvmProtoBuf.index)) return false
if (old.hasExtension(JvmProtoBuf.index)) {
if (old.getExtension(JvmProtoBuf.index) != new.getExtension(JvmProtoBuf.index)) return false
@@ -378,6 +467,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
if (!checkEquals(old.type, new.type)) return false
}
+ if (old.hasTypeId() != new.hasTypeId()) return false
+ if (old.hasTypeId()) {
+ if (old.typeId != new.typeId) return false
+ }
+
return true
}
@@ -494,6 +588,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
return true
}
+ open fun checkEqualsClassSupertypeId(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
+ if (old.supertypeIdCount != new.supertypeIdCount) return false
+
+ for(i in 0..old.supertypeIdCount - 1) {
+ if (old.getSupertypeId(i) != new.getSupertypeId(i)) return false
+ }
+
+ return true
+ }
+
open fun checkEqualsClassNestedClassName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
if (old.nestedClassNameCount != new.nestedClassNameCount) return false
@@ -574,6 +678,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
return true
}
+ open fun checkEqualsTypeTableType(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean {
+ if (old.typeCount != new.typeCount) return false
+
+ for(i in 0..old.typeCount - 1) {
+ if (!checkEquals(old.getType(i), new.getType(i))) return false
+ }
+
+ return true
+ }
+
open fun checkEqualsTypeParameterUpperBound(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean {
if (old.upperBoundCount != new.upperBoundCount) return false
@@ -584,6 +698,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
return true
}
+ open fun checkEqualsTypeParameterUpperBoundId(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean {
+ if (old.upperBoundIdCount != new.upperBoundIdCount) return false
+
+ for(i in 0..old.upperBoundIdCount - 1) {
+ if (old.getUpperBoundId(i) != new.getUpperBoundId(i)) return false
+ }
+
+ return true
+ }
+
open fun checkEqualsTypeArgument(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean {
if (old.argumentCount != new.argumentCount) return false
@@ -666,6 +790,10 @@ public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes:
hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasTypeTable()) {
+ hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
+ }
+
return hashCode
}
@@ -690,6 +818,10 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (
hashCode = 31 * hashCode + getSupertype(i).hashCode(stringIndexes, fqNameIndexes)
}
+ for(i in 0..supertypeIdCount - 1) {
+ hashCode = 31 * hashCode + getSupertypeId(i)
+ }
+
for(i in 0..nestedClassNameCount - 1) {
hashCode = 31 * hashCode + stringIndexes(getNestedClassName(i))
}
@@ -710,6 +842,10 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (
hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i))
}
+ if (hasTypeTable()) {
+ hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
+ }
+
for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) {
hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
}
@@ -726,7 +862,13 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
hashCode = 31 * hashCode + stringIndexes(name)
- hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes)
+ if (hasReturnType()) {
+ hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes)
+ }
+
+ if (hasReturnTypeId()) {
+ hashCode = 31 * hashCode + returnTypeId
+ }
for(i in 0..typeParameterCount - 1) {
hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes)
@@ -736,10 +878,18 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasReceiverTypeId()) {
+ hashCode = 31 * hashCode + receiverTypeId
+ }
+
for(i in 0..valueParameterCount - 1) {
hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasTypeTable()) {
+ hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
+ }
+
if (hasExtension(JvmProtoBuf.methodSignature)) {
hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes)
}
@@ -760,7 +910,13 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
hashCode = 31 * hashCode + stringIndexes(name)
- hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes)
+ if (hasReturnType()) {
+ hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes)
+ }
+
+ if (hasReturnTypeId()) {
+ hashCode = 31 * hashCode + returnTypeId
+ }
for(i in 0..typeParameterCount - 1) {
hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes)
@@ -770,6 +926,10 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasReceiverTypeId()) {
+ hashCode = 31 * hashCode + receiverTypeId
+ }
+
if (hasSetterValueParameter()) {
hashCode = 31 * hashCode + setterValueParameter.hashCode(stringIndexes, fqNameIndexes)
}
@@ -793,6 +953,20 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes
return hashCode
}
+public fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+ var hashCode = 1
+
+ for(i in 0..typeCount - 1) {
+ hashCode = 31 * hashCode + getType(i).hashCode(stringIndexes, fqNameIndexes)
+ }
+
+ if (hasFirstNullable()) {
+ hashCode = 31 * hashCode + firstNullable
+ }
+
+ return hashCode
+}
+
public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
var hashCode = 1
@@ -812,6 +986,10 @@ public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIn
hashCode = 31 * hashCode + getUpperBound(i).hashCode(stringIndexes, fqNameIndexes)
}
+ for(i in 0..upperBoundIdCount - 1) {
+ hashCode = 31 * hashCode + getUpperBoundId(i)
+ }
+
return hashCode
}
@@ -834,6 +1012,10 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasFlexibleUpperBoundId()) {
+ hashCode = 31 * hashCode + flexibleUpperBoundId
+ }
+
if (hasClassName()) {
hashCode = 31 * hashCode + fqNameIndexes(className)
}
@@ -892,12 +1074,22 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI
hashCode = 31 * hashCode + stringIndexes(name)
- hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes)
+ if (hasType()) {
+ hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes)
+ }
+
+ if (hasTypeId()) {
+ hashCode = 31 * hashCode + typeId
+ }
if (hasVarargElementType()) {
hashCode = 31 * hashCode + varargElementType.hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasVarargElementTypeId()) {
+ hashCode = 31 * hashCode + varargElementTypeId
+ }
+
if (hasExtension(JvmProtoBuf.index)) {
hashCode = 31 * hashCode + getExtension(JvmProtoBuf.index)
}
@@ -952,6 +1144,10 @@ public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIn
hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes)
}
+ if (hasTypeId()) {
+ hashCode = 31 * hashCode + typeId
+ }
+
return hashCode
}
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt
index f80ba52a0cf..60954d7d26e 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt
@@ -210,6 +210,9 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot
names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList))
ProtoBufClassKind.ENUM_ENTRY_LIST ->
names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList))
+ ProtoBufClassKind.TYPE_TABLE -> {
+ // TODO
+ }
ProtoBufClassKind.FLAGS,
ProtoBufClassKind.FQ_NAME,
ProtoBufClassKind.TYPE_PARAMETER_LIST,
@@ -257,6 +260,9 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa
names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList))
ProtoBufPackageKind.PROPERTY_LIST ->
names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList))
+ ProtoBufPackageKind.TYPE_TABLE -> {
+ // TODO
+ }
else ->
throw IllegalArgumentException("Unsupported kind: $kind")
}