diff --git a/compiler/ir/serialization.common/src/KotlinIr.proto b/compiler/ir/serialization.common/src/KotlinIr.proto index b38849a7aa5..33bf6f0f5bc 100644 --- a/compiler/ir/serialization.common/src/KotlinIr.proto +++ b/compiler/ir/serialization.common/src/KotlinIr.proto @@ -40,6 +40,21 @@ message AccessorIdSignature { message FileLocalIdSignature { required int32 container = 1; required int64 local_id = 2; + optional int32 file = 3; +} + +message LoweredIdSignature { + required int32 parent_signature = 1; + required int32 stage = 2; + required int32 index = 3; +} + +message FileSignature { +} + +message ScopeLocalIdSignature { + required int32 id = 1; + optional int32 file = 2; } message IdSignature { @@ -48,6 +63,11 @@ message IdSignature { FileLocalIdSignature private_sig = 2; AccessorIdSignature accessor_sig = 3; int32 scoped_local_sig = 4; + + // JS IC related stuff below. Proto indices 100+ were chosen due to compatibility considerations. + LoweredIdSignature ic_sig = 105; + FileSignature file_sig = 106; + ScopeLocalIdSignature external_scoped_local_sig = 107; } } @@ -107,6 +127,12 @@ message IrBlock { optional int32 origin_name = 2; } +message IrReturnableBlock { + repeated IrStatement statement = 1; + optional int32 origin_name = 2; + optional int64 inline_function_symbol = 3; +} + message MemberAccessCommon { optional IrExpression dispatch_receiver = 1; optional IrExpression extension_receiver = 2; @@ -135,6 +161,10 @@ message IrFunctionReference { optional int64 reflection_target_symbol = 4; } +message IrRawFunctionReference { + required int64 symbol = 1; +} + message IrLocalDelegatedPropertyReference { required int64 delegate = 1; optional int64 getter = 2; @@ -241,6 +271,11 @@ message IrReturn { required IrExpression value = 2; } +message IrReturnableBlockReturn { + required uint32 upCnt = 1; + required IrExpression value = 2; +} + message IrSetField { required FieldAccessCommon field_access = 1; required IrExpression value = 2; @@ -402,6 +437,10 @@ message IrOperation { // Error code IrErrorExpression error_expression = 34; IrErrorCallExpression error_call_expression = 35; + + IrRawFunctionReference raw_function_reference = 36; + IrReturnableBlock returnable_block = 37; + IrReturnableBlockReturn returnable_block_return = 38; } } @@ -493,12 +532,15 @@ message IrValueParameter { required int64 name_type = 2; optional int32 vararg_element_type = 3; optional int32 default_value = 4; + optional int32 index = 5; } message IrTypeParameter { required IrDeclarationBase base = 1; required int32 name = 2; repeated int32 super_type = 3 [packed=true]; + optional int32 index = 4; + optional bool isGlobal = 5; } message IrClass { diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignature.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignature.java index 94dad12d38b..5ab0afc6c8b 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignature.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignature.java @@ -27,60 +27,7 @@ public final class FileLocalIdSignature extends } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private FileLocalIdSignature( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - container_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - localId_ = input.readInt64(); - break; - } - } - } - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - try { - unknownFieldsCodedOutput.flush(); - } catch (java.io.IOException e) { - // Should not happen - } finally { - unknownFields = unknownFieldsOutput.toByteString(); - } - makeExtensionsImmutable(); - } - } + public static final int FILE_FIELD_NUMBER = 3; public static org.jetbrains.kotlin.protobuf.Parser PARSER = new org.jetbrains.kotlin.protobuf.AbstractParser() { public FileLocalIdSignature parsePartialFrom( @@ -126,10 +73,84 @@ public final class FileLocalIdSignature extends public long getLocalId() { return localId_; } + private int file_; + private FileLocalIdSignature( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = + org.jetbrains.kotlin.protobuf.ByteString.newOutput(); + org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = + org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( + unknownFieldsOutput, 1); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFieldsCodedOutput, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + container_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + localId_ = input.readInt64(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + file_ = input.readInt32(); + break; + } + } + } + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + try { + unknownFieldsCodedOutput.flush(); + } catch (java.io.IOException e) { + // Should not happen + } finally { + unknownFields = unknownFieldsOutput.toByteString(); + } + makeExtensionsImmutable(); + } + } + + /** + * optional int32 file = 3; + */ + public boolean hasFile() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 file = 3; + */ + public int getFile() { + return file_; + } private void initFields() { container_ = 0; localId_ = 0L; + file_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -158,6 +179,9 @@ public final class FileLocalIdSignature extends if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeInt64(2, localId_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, file_); + } output.writeRawBytes(unknownFields); } @@ -175,6 +199,10 @@ public final class FileLocalIdSignature extends size += org.jetbrains.kotlin.protobuf.CodedOutputStream .computeInt64Size(2, localId_); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeInt32Size(3, file_); + } size += unknownFields.size(); memoizedSerializedSize = size; return size; @@ -267,14 +295,7 @@ public final class FileLocalIdSignature extends return new Builder(); } - public Builder clear() { - super.clear(); - container_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - localId_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } + private int file_ ; public Builder clone() { return create().mergeFrom(buildPartial()); @@ -292,6 +313,17 @@ public final class FileLocalIdSignature extends return result; } + public Builder clear() { + super.clear(); + container_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + localId_ = 0L; + bitField0_ = (bitField0_ & ~0x00000002); + file_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + public org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature buildPartial() { org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature result = new org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature(this); int from_bitField0_ = bitField0_; @@ -304,23 +336,14 @@ public final class FileLocalIdSignature extends to_bitField0_ |= 0x00000002; } result.localId_ = localId_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.file_ = file_; result.bitField0_ = to_bitField0_; return result; } - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance()) return this; - if (other.hasContainer()) { - setContainer(other.getContainer()); - } - if (other.hasLocalId()) { - setLocalId(other.getLocalId()); - } - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); - return this; - } - public final boolean isInitialized() { if (!hasContainer()) { @@ -406,12 +429,60 @@ public final class FileLocalIdSignature extends return this; } + + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance()) return this; + if (other.hasContainer()) { + setContainer(other.getContainer()); + } + if (other.hasLocalId()) { + setLocalId(other.getLocalId()); + } + if (other.hasFile()) { + setFile(other.getFile()); + } + setUnknownFields( + getUnknownFields().concat(other.unknownFields)); + return this; + } + /** * required int64 local_id = 2; */ public Builder clearLocalId() { bitField0_ = (bitField0_ & ~0x00000002); localId_ = 0L; + + return this; + } + + /** + * optional int32 file = 3; + */ + public boolean hasFile() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 file = 3; + */ + public int getFile() { + return file_; + } + /** + * optional int32 file = 3; + */ + public Builder setFile(int value) { + bitField0_ |= 0x00000004; + file_ = value; + + return this; + } + /** + * optional int32 file = 3; + */ + public Builder clearFile() { + bitField0_ = (bitField0_ & ~0x00000004); + file_ = 0; return this; } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignatureOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignatureOrBuilder.java index e15016e327e..aadb5c94c98 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignatureOrBuilder.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileLocalIdSignatureOrBuilder.java @@ -24,4 +24,13 @@ public interface FileLocalIdSignatureOrBuilder extends * required int64 local_id = 2; */ long getLocalId(); + + /** + * optional int32 file = 3; + */ + boolean hasFile(); + /** + * optional int32 file = 3; + */ + int getFile(); } \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignature.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignature.java index bfd82260698..4c809cda30c 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignature.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignature.java @@ -32,7 +32,6 @@ public final class FileSignature extends org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { initFields(); - int mutable_bitField0_ = 0; org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = @@ -53,12 +52,6 @@ public final class FileSignature extends } break; } - case 10: { - org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes(); - bitField0_ |= 0x00000001; - path_ = bs; - break; - } } } } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { @@ -92,51 +85,7 @@ public final class FileSignature extends return PARSER; } - private int bitField0_; - public static final int PATH_FIELD_NUMBER = 1; - private java.lang.Object path_; - /** - * required string path = 1; - */ - public boolean hasPath() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required string path = 1; - */ - public java.lang.String getPath() { - java.lang.Object ref = path_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - path_ = s; - } - return s; - } - } - /** - * required string path = 1; - */ - public org.jetbrains.kotlin.protobuf.ByteString - getPathBytes() { - java.lang.Object ref = path_; - if (ref instanceof java.lang.String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - path_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } - } - private void initFields() { - path_ = ""; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -144,10 +93,6 @@ public final class FileSignature extends if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasPath()) { - memoizedIsInitialized = 0; - return false; - } memoizedIsInitialized = 1; return true; } @@ -155,9 +100,6 @@ public final class FileSignature extends public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getPathBytes()); - } output.writeRawBytes(unknownFields); } @@ -167,10 +109,6 @@ public final class FileSignature extends if (size != -1) return size; size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBytesSize(1, getPathBytes()); - } size += unknownFields.size(); memoizedSerializedSize = size; return size; @@ -265,8 +203,6 @@ public final class FileSignature extends public Builder clear() { super.clear(); - path_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -288,33 +224,17 @@ public final class FileSignature extends public org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature buildPartial() { org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature result = new org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.path_ = path_; - result.bitField0_ = to_bitField0_; return result; } public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature other) { if (other == org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance()) return this; - if (other.hasPath()) { - bitField0_ |= 0x00000001; - path_ = other.path_; - - } setUnknownFields( getUnknownFields().concat(other.unknownFields)); return this; } public final boolean isInitialized() { - if (!hasPath()) { - - return false; - } return true; } @@ -335,83 +255,6 @@ public final class FileSignature extends } return this; } - private int bitField0_; - - private java.lang.Object path_ = ""; - /** - * required string path = 1; - */ - public boolean hasPath() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required string path = 1; - */ - public java.lang.String getPath() { - java.lang.Object ref = path_; - if (!(ref instanceof java.lang.String)) { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - path_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * required string path = 1; - */ - public org.jetbrains.kotlin.protobuf.ByteString - getPathBytes() { - java.lang.Object ref = path_; - if (ref instanceof String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - path_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } - } - /** - * required string path = 1; - */ - public Builder setPath( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - path_ = value; - - return this; - } - /** - * required string path = 1; - */ - public Builder clearPath() { - bitField0_ = (bitField0_ & ~0x00000001); - path_ = getDefaultInstance().getPath(); - - return this; - } - /** - * required string path = 1; - */ - public Builder setPathBytes( - org.jetbrains.kotlin.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - path_ = value; - - return this; - } // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignatureOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignatureOrBuilder.java index 476c5a13dbb..76037d22013 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignatureOrBuilder.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileSignatureOrBuilder.java @@ -6,18 +6,4 @@ package org.jetbrains.kotlin.backend.common.serialization.proto; public interface FileSignatureOrBuilder extends // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { - - /** - * required string path = 1; - */ - boolean hasPath(); - /** - * required string path = 1; - */ - java.lang.String getPath(); - /** - * required string path = 1; - */ - org.jetbrains.kotlin.protobuf.ByteString - getPathBytes(); } \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileWrappedIdSignature.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileWrappedIdSignature.java new file mode 100644 index 00000000000..b51e14b9bbb --- /dev/null +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileWrappedIdSignature.java @@ -0,0 +1,495 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compiler/ir/serialization.common/src/KotlinIr.proto + +package org.jetbrains.kotlin.backend.common.serialization.proto; + +/** + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature} + */ +public final class FileWrappedIdSignature extends + org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature) + FileWrappedIdSignatureOrBuilder { + public static final int DELEGATE_FIELD_NUMBER = 1; + public static final int FILE_FIELD_NUMBER = 2; + private static final FileWrappedIdSignature defaultInstance; + private static final long serialVersionUID = 0L; + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public FileWrappedIdSignature parsePartialFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return new FileWrappedIdSignature(input, extensionRegistry); + } + }; + + static { + defaultInstance = new FileWrappedIdSignature(true); + defaultInstance.initFields(); + } + + private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; + private int bitField0_; + private org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate_; + private int file_; + private byte memoizedIsInitialized = -1; + private int memoizedSerializedSize = -1; + // Use FileWrappedIdSignature.newBuilder() to construct. + private FileWrappedIdSignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private FileWrappedIdSignature(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + + private FileWrappedIdSignature( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = + org.jetbrains.kotlin.protobuf.ByteString.newOutput(); + org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = + org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( + unknownFieldsOutput, 1); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFieldsCodedOutput, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = delegate_.toBuilder(); + } + delegate_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(delegate_); + delegate_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 16: { + bitField0_ |= 0x00000002; + file_ = input.readInt32(); + break; + } + } + } + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + try { + unknownFieldsCodedOutput.flush(); + } catch (java.io.IOException e) { + // Should not happen + } finally { + unknownFields = unknownFieldsOutput.toByteString(); + } + makeExtensionsImmutable(); + } + } + + public static FileWrappedIdSignature getDefaultInstance() { + return defaultInstance; + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom( + org.jetbrains.kotlin.protobuf.ByteString data) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom( + org.jetbrains.kotlin.protobuf.ByteString data, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom(byte[] data) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom( + byte[] data, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom( + java.io.InputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseDelimitedFrom( + java.io.InputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parseFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + + public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature prototype) { + return newBuilder().mergeFrom(prototype); + } + + public FileWrappedIdSignature getDefaultInstanceForType() { + return defaultInstance; + } + + @java.lang.Override + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public boolean hasDelegate() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature getDelegate() { + return delegate_; + } + + /** + * required int32 file = 2; + */ + public boolean hasFile() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + + /** + * required int32 file = 2; + */ + public int getFile() { + return file_; + } + + private void initFields() { + delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.getDefaultInstance(); + file_ = 0; + } + + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + if (!hasDelegate()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasFile()) { + memoizedIsInitialized = 0; + return false; + } + if (!getDelegate().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, delegate_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, file_); + } + output.writeRawBytes(unknownFields); + } + + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(1, delegate_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeInt32Size(2, file_); + } + size += unknownFields.size(); + memoizedSerializedSize = size; + return size; + } + + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public Builder newBuilderForType() { return newBuilder(); } + + public Builder toBuilder() { return newBuilder(this); } + + /** + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature} + */ + public static final class Builder extends + org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< + org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature, Builder> + implements + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature) + org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignatureOrBuilder { + private int bitField0_; + private org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.getDefaultInstance(); + private int file_ ; + + // Construct using org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private static Builder create() { + return new Builder(); + } + + private void maybeForceBuilderInitialization() { + } + + public Builder clear() { + super.clear(); + delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000001); + file_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature getDefaultInstanceForType() { + return org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature.getDefaultInstance(); + } + + public org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature build() { + org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature buildPartial() { + org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature result = new org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.delegate_ = delegate_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.file_ = file_; + result.bitField0_ = to_bitField0_; + return result; + } + + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature.getDefaultInstance()) return this; + if (other.hasDelegate()) { + mergeDelegate(other.getDelegate()); + } + if (other.hasFile()) { + setFile(other.getFile()); + } + setUnknownFields( + getUnknownFields().concat(other.unknownFields)); + return this; + } + + public final boolean isInitialized() { + if (!hasDelegate()) { + + return false; + } + if (!hasFile()) { + + return false; + } + if (!getDelegate().isInitialized()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public boolean hasDelegate() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature getDelegate() { + return delegate_; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public Builder setDelegate(org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature value) { + if (value == null) { + throw new NullPointerException(); + } + delegate_ = value; + + bitField0_ |= 0x00000001; + return this; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public Builder setDelegate( + org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.Builder builderForValue) { + delegate_ = builderForValue.build(); + + bitField0_ |= 0x00000001; + return this; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public Builder mergeDelegate(org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature value) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + delegate_ != org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.getDefaultInstance()) { + delegate_ = + org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.newBuilder(delegate_).mergeFrom(value).buildPartial(); + } else { + delegate_ = value; + } + + bitField0_ |= 0x00000001; + return this; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + public Builder clearDelegate() { + delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + /** + * required int32 file = 2; + */ + public boolean hasFile() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 file = 2; + */ + public int getFile() { + return file_; + } + /** + * required int32 file = 2; + */ + public Builder setFile(int value) { + bitField0_ |= 0x00000002; + file_ = value; + + return this; + } + /** + * required int32 file = 2; + */ + public Builder clearFile() { + bitField0_ = (bitField0_ & ~0x00000002); + file_ = 0; + + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature) + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature) +} \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileWrappedIdSignatureOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileWrappedIdSignatureOrBuilder.java new file mode 100644 index 00000000000..fee68f24cfd --- /dev/null +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileWrappedIdSignatureOrBuilder.java @@ -0,0 +1,27 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compiler/ir/serialization.common/src/KotlinIr.proto + +package org.jetbrains.kotlin.backend.common.serialization.proto; + +public interface FileWrappedIdSignatureOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.proto.FileWrappedIdSignature) + org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + boolean hasDelegate(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature delegate = 1; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature getDelegate(); + + /** + * required int32 file = 2; + */ + boolean hasFile(); + /** + * required int32 file = 2; + */ + int getFile(); +} \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java index e353670485c..3c892d3af36 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignature.java @@ -27,6 +27,26 @@ public final class IdSignature extends } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; + public static final int FILE_SIG_FIELD_NUMBER = 106; +public static final int EXTERNAL_SCOPED_LOCAL_SIG_FIELD_NUMBER = 107; + public static final int PUBLIC_SIG_FIELD_NUMBER = 1; + public static final int PRIVATE_SIG_FIELD_NUMBER = 2; + public static final int ACCESSOR_SIG_FIELD_NUMBER = 3; + public static final int SCOPED_LOCAL_SIG_FIELD_NUMBER = 4; + public static final int IC_SIG_FIELD_NUMBER = 105;; + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public IdSignature parsePartialFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return new IdSignature(input, extensionRegistry); + } + }; + private int bitField0_; + private int idsigCase_ = 0; + private java.lang.Object idsig_; + private int memoizedSerializedSize = -1; private IdSignature( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) @@ -97,6 +117,45 @@ public final class IdSignature extends idsig_ = input.readInt32(); break; } + case 842: { + org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.Builder subBuilder = null; + if (idsigCase_ == 105) { + subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_).toBuilder(); + } + idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_); + idsig_ = subBuilder.buildPartial(); + } + idsigCase_ = 105; + break; + } + case 850: { + org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.Builder subBuilder = null; + if (idsigCase_ == 106) { + subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_).toBuilder(); + } + idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_); + idsig_ = subBuilder.buildPartial(); + } + idsigCase_ = 106; + break; + } + case 858: { + org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.Builder subBuilder = null; + if (idsigCase_ == 107) { + subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_).toBuilder(); + } + idsig_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_); + idsig_ = subBuilder.buildPartial(); + } + idsigCase_ = 107; + break; + } } } } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { @@ -115,64 +174,25 @@ public final class IdSignature extends makeExtensionsImmutable(); } } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public IdSignature parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new IdSignature(input, extensionRegistry); - } - }; @java.lang.Override public org.jetbrains.kotlin.protobuf.Parser getParserForType() { return PARSER; } - private int bitField0_; - private int idsigCase_ = 0; - private java.lang.Object idsig_; - public enum IdsigCase - implements org.jetbrains.kotlin.protobuf.Internal.EnumLite { - PUBLIC_SIG(1), - PRIVATE_SIG(2), - ACCESSOR_SIG(3), - SCOPED_LOCAL_SIG(4), - IDSIG_NOT_SET(0); - private int value = 0; - private IdsigCase(int value) { - this.value = value; - } - public static IdsigCase valueOf(int value) { - switch (value) { - case 1: return PUBLIC_SIG; - case 2: return PRIVATE_SIG; - case 3: return ACCESSOR_SIG; - case 4: return SCOPED_LOCAL_SIG; - case 0: return IDSIG_NOT_SET; - default: throw new java.lang.IllegalArgumentException( - "Value is undefined for this oneof enum."); - } - } - public int getNumber() { - return this.value; - } - }; - public IdsigCase getIdsigCase() { return IdsigCase.valueOf( idsigCase_); } - public static final int PUBLIC_SIG_FIELD_NUMBER = 1; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.PublicIdSignature public_sig = 1; */ public boolean hasPublicSig() { return idsigCase_ == 1; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.PublicIdSignature public_sig = 1; */ @@ -183,13 +203,13 @@ public final class IdSignature extends return org.jetbrains.kotlin.backend.common.serialization.proto.PublicIdSignature.getDefaultInstance(); } - public static final int PRIVATE_SIG_FIELD_NUMBER = 2; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2; */ public boolean hasPrivateSig() { return idsigCase_ == 2; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature private_sig = 2; */ @@ -200,13 +220,13 @@ public final class IdSignature extends return org.jetbrains.kotlin.backend.common.serialization.proto.FileLocalIdSignature.getDefaultInstance(); } - public static final int ACCESSOR_SIG_FIELD_NUMBER = 3; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3; */ public boolean hasAccessorSig() { return idsigCase_ == 3; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature accessor_sig = 3; */ @@ -217,13 +237,13 @@ public final class IdSignature extends return org.jetbrains.kotlin.backend.common.serialization.proto.AccessorIdSignature.getDefaultInstance(); } - public static final int SCOPED_LOCAL_SIG_FIELD_NUMBER = 4; /** * optional int32 scoped_local_sig = 4; */ public boolean hasScopedLocalSig() { return idsigCase_ == 4; } + /** * optional int32 scoped_local_sig = 4; */ @@ -234,29 +254,60 @@ public final class IdSignature extends return 0; } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public boolean hasIcSig() { + return idsigCase_ == 105; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature getIcSig() { + if (idsigCase_ == 105) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance(); + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public boolean hasFileSig() { + return idsigCase_ == 106; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature getFileSig() { + if (idsigCase_ == 106) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance(); + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public boolean hasExternalScopedLocalSig() { + return idsigCase_ == 107; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getExternalScopedLocalSig() { + if (idsigCase_ == 107) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance(); + } + private void initFields() { } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - if (hasPrivateSig()) { - if (!getPrivateSig().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasAccessorSig()) { - if (!getAccessorSig().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) throws java.io.IOException { @@ -274,10 +325,51 @@ public final class IdSignature extends output.writeInt32( 4, (int)((java.lang.Integer) idsig_)); } + if (idsigCase_ == 105) { + output.writeMessage(105, (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_); + } + if (idsigCase_ == 106) { + output.writeMessage(106, (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_); + } + if (idsigCase_ == 107) { + output.writeMessage(107, (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_); + } output.writeRawBytes(unknownFields); } - private int memoizedSerializedSize = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + if (hasPrivateSig()) { + if (!getPrivateSig().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasAccessorSig()) { + if (!getAccessorSig().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasIcSig()) { + if (!getIcSig().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasExternalScopedLocalSig()) { + if (!getExternalScopedLocalSig().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -300,10 +392,54 @@ public final class IdSignature extends .computeInt32Size( 4, (int)((java.lang.Integer) idsig_)); } + if (idsigCase_ == 105) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(105, (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_); + } + if (idsigCase_ == 106) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(106, (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_); + } + if (idsigCase_ == 107) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(107, (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_); + } size += unknownFields.size(); memoizedSerializedSize = size; return size; } +public enum IdsigCase + implements org.jetbrains.kotlin.protobuf.Internal.EnumLite { + PUBLIC_SIG(1), + PRIVATE_SIG(2), + ACCESSOR_SIG(3), + SCOPED_LOCAL_SIG(4), + IC_SIG(105), + FILE_SIG(106), + EXTERNAL_SCOPED_LOCAL_SIG(107), + IDSIG_NOT_SET(0); + private int value = 0; + private IdsigCase(int value) { + this.value = value; + } + public static IdsigCase valueOf(int value) { + switch (value) { + case 1: return PUBLIC_SIG; + case 2: return PRIVATE_SIG; + case 3: return ACCESSOR_SIG; + case 4: return SCOPED_LOCAL_SIG; + case 105: return IC_SIG; + case 106: return FILE_SIG; + case 107: return EXTERNAL_SCOPED_LOCAL_SIG; + case 0: return IDSIG_NOT_SET; + default: throw new java.lang.IllegalArgumentException( + "Value is undefined for this oneof enum."); + } + } + public int getNumber() { + return this.value; + } + } private static final long serialVersionUID = 0L; @java.lang.Override @@ -431,6 +567,15 @@ public final class IdSignature extends if (idsigCase_ == 4) { result.idsig_ = idsig_; } + if (idsigCase_ == 105) { + result.idsig_ = idsig_; + } + if (idsigCase_ == 106) { + result.idsig_ = idsig_; + } + if (idsigCase_ == 107) { + result.idsig_ = idsig_; + } result.bitField0_ = to_bitField0_; result.idsigCase_ = idsigCase_; return result; @@ -455,6 +600,18 @@ public final class IdSignature extends setScopedLocalSig(other.getScopedLocalSig()); break; } + case IC_SIG: { + mergeIcSig(other.getIcSig()); + break; + } + case FILE_SIG: { + mergeFileSig(other.getFileSig()); + break; + } + case EXTERNAL_SCOPED_LOCAL_SIG: { + mergeExternalScopedLocalSig(other.getExternalScopedLocalSig()); + break; + } case IDSIG_NOT_SET: { break; } @@ -477,6 +634,18 @@ public final class IdSignature extends return false; } } + if (hasIcSig()) { + if (!getIcSig().isInitialized()) { + + return false; + } + } + if (hasExternalScopedLocalSig()) { + if (!getExternalScopedLocalSig().isInitialized()) { + + return false; + } + } return true; } @@ -741,6 +910,198 @@ public final class IdSignature extends return this; } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public boolean hasIcSig() { + return idsigCase_ == 105; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature getIcSig() { + if (idsigCase_ == 105) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public Builder setIcSig(org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature value) { + if (value == null) { + throw new NullPointerException(); + } + idsig_ = value; + + idsigCase_ = 105; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public Builder setIcSig( + org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.Builder builderForValue) { + idsig_ = builderForValue.build(); + + idsigCase_ = 105; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public Builder mergeIcSig(org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature value) { + if (idsigCase_ == 105 && + idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.getDefaultInstance()) { + idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature) idsig_) + .mergeFrom(value).buildPartial(); + } else { + idsig_ = value; + } + + idsigCase_ = 105; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + public Builder clearIcSig() { + if (idsigCase_ == 105) { + idsigCase_ = 0; + idsig_ = null; + + } + return this; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public boolean hasFileSig() { + return idsigCase_ == 106; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature getFileSig() { + if (idsigCase_ == 106) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public Builder setFileSig(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature value) { + if (value == null) { + throw new NullPointerException(); + } + idsig_ = value; + + idsigCase_ = 106; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public Builder setFileSig( + org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.Builder builderForValue) { + idsig_ = builderForValue.build(); + + idsigCase_ = 106; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public Builder mergeFileSig(org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature value) { + if (idsigCase_ == 106 && + idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.getDefaultInstance()) { + idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature) idsig_) + .mergeFrom(value).buildPartial(); + } else { + idsig_ = value; + } + + idsigCase_ = 106; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + public Builder clearFileSig() { + if (idsigCase_ == 106) { + idsigCase_ = 0; + idsig_ = null; + + } + return this; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public boolean hasExternalScopedLocalSig() { + return idsigCase_ == 107; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getExternalScopedLocalSig() { + if (idsigCase_ == 107) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public Builder setExternalScopedLocalSig(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature value) { + if (value == null) { + throw new NullPointerException(); + } + idsig_ = value; + + idsigCase_ = 107; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public Builder setExternalScopedLocalSig( + org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.Builder builderForValue) { + idsig_ = builderForValue.build(); + + idsigCase_ = 107; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public Builder mergeExternalScopedLocalSig(org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature value) { + if (idsigCase_ == 107 && + idsig_ != org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.getDefaultInstance()) { + idsig_ = org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature) idsig_) + .mergeFrom(value).buildPartial(); + } else { + idsig_ = value; + } + + idsigCase_ = 107; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + public Builder clearExternalScopedLocalSig() { + if (idsigCase_ == 107) { + idsigCase_ = 0; + idsig_ = null; + + } + return this; + } + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.IdSignature) } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java index f5c37cb1b2d..bd4c269b808 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IdSignatureOrBuilder.java @@ -42,4 +42,31 @@ public interface IdSignatureOrBuilder extends * optional int32 scoped_local_sig = 4; */ int getScopedLocalSig(); + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + boolean hasIcSig(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature ic_sig = 105; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.LoweredIdSignature getIcSig(); + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + boolean hasFileSig(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature file_sig = 106; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.FileSignature getFileSig(); + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + boolean hasExternalScopedLocalSig(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature external_scoped_local_sig = 107; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.ScopeLocalIdSignature getExternalScopedLocalSig(); } \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperation.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperation.java index 08ecf265156..4798e8f007e 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperation.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperation.java @@ -32,6 +32,60 @@ public final class IrOperation extends } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; + public static final int RETURNABLE_BLOCK_RETURN_FIELD_NUMBER = 38; + public static final int BLOCK_FIELD_NUMBER = 1; + public static final int BREAK_FIELD_NUMBER = 2; + public static final int CALL_FIELD_NUMBER = 3; + public static final int CLASS_REFERENCE_FIELD_NUMBER = 4; + public static final int COMPOSITE_FIELD_NUMBER = 5; + public static final int CONST_FIELD_NUMBER = 6; + public static final int CONTINUE_FIELD_NUMBER = 7;; + public static final int DELEGATING_CONSTRUCTOR_CALL_FIELD_NUMBER = 8; + public static final int DO_WHILE_FIELD_NUMBER = 9; + public static final int ENUM_CONSTRUCTOR_CALL_FIELD_NUMBER = 10; + public static final int FUNCTION_REFERENCE_FIELD_NUMBER = 11; + public static final int GET_CLASS_FIELD_NUMBER = 12; + public static final int GET_ENUM_VALUE_FIELD_NUMBER = 13; + public static final int GET_FIELD_FIELD_NUMBER = 14; + public static final int GET_OBJECT_FIELD_NUMBER = 15; + public static final int GET_VALUE_FIELD_NUMBER = 16; + public static final int INSTANCE_INITIALIZER_CALL_FIELD_NUMBER = 17; + public static final int PROPERTY_REFERENCE_FIELD_NUMBER = 18; + public static final int RETURN_FIELD_NUMBER = 19; + public static final int SET_FIELD_FIELD_NUMBER = 20; + public static final int SET_VALUE_FIELD_NUMBER = 21; + public static final int STRING_CONCAT_FIELD_NUMBER = 22; + public static final int THROW_FIELD_NUMBER = 23; + public static final int TRY_FIELD_NUMBER = 24; + public static final int TYPE_OP_FIELD_NUMBER = 25; + public static final int VARARG_FIELD_NUMBER = 26; + public static final int WHEN_FIELD_NUMBER = 27; + public static final int WHILE_FIELD_NUMBER = 28; + public static final int DYNAMIC_MEMBER_FIELD_NUMBER = 29; + public static final int DYNAMIC_OPERATOR_FIELD_NUMBER = 30; + public static final int LOCAL_DELEGATED_PROPERTY_REFERENCE_FIELD_NUMBER = 31; + public static final int CONSTRUCTOR_CALL_FIELD_NUMBER = 32; + public static final int FUNCTION_EXPRESSION_FIELD_NUMBER = 33; + public static final int ERROR_EXPRESSION_FIELD_NUMBER = 34; + public static final int ERROR_CALL_EXPRESSION_FIELD_NUMBER = 35; + public static final int RAW_FUNCTION_REFERENCE_FIELD_NUMBER = 36; + public static final int RETURNABLE_BLOCK_FIELD_NUMBER = 37; + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public IrOperation parsePartialFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return new IrOperation(input, extensionRegistry); + } + }; + private int bitField0_; + private int bitField1_; + private int operationCase_ = 0; + private java.lang.Object operation_; + private byte memoizedIsInitialized = -1; +private int memoizedSerializedSize = -1; + private IrOperation( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) @@ -514,6 +568,45 @@ public final class IrOperation extends operationCase_ = 35; break; } + case 290: { + org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.Builder subBuilder = null; + if (operationCase_ == 36) { + subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_).toBuilder(); + } + operation_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 36; + break; + } + case 298: { + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.Builder subBuilder = null; + if (operationCase_ == 37) { + subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_).toBuilder(); + } + operation_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 37; + break; + } + case 306: { + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.Builder subBuilder = null; + if (operationCase_ == 38) { + subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_).toBuilder(); + } + operation_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_); + operation_ = subBuilder.buildPartial(); + } + operationCase_ = 38; + break; + } } } } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { @@ -532,113 +625,6 @@ public final class IrOperation extends makeExtensionsImmutable(); } } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public IrOperation parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new IrOperation(input, extensionRegistry); - } - }; - - @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - private int bitField1_; - private int operationCase_ = 0; - private java.lang.Object operation_; - public enum OperationCase - implements org.jetbrains.kotlin.protobuf.Internal.EnumLite { - BLOCK(1), - BREAK(2), - CALL(3), - CLASS_REFERENCE(4), - COMPOSITE(5), - CONST(6), - CONTINUE(7), - DELEGATING_CONSTRUCTOR_CALL(8), - DO_WHILE(9), - ENUM_CONSTRUCTOR_CALL(10), - FUNCTION_REFERENCE(11), - GET_CLASS(12), - GET_ENUM_VALUE(13), - GET_FIELD(14), - GET_OBJECT(15), - GET_VALUE(16), - INSTANCE_INITIALIZER_CALL(17), - PROPERTY_REFERENCE(18), - RETURN(19), - SET_FIELD(20), - SET_VALUE(21), - STRING_CONCAT(22), - THROW(23), - TRY(24), - TYPE_OP(25), - VARARG(26), - WHEN(27), - WHILE(28), - DYNAMIC_MEMBER(29), - DYNAMIC_OPERATOR(30), - LOCAL_DELEGATED_PROPERTY_REFERENCE(31), - CONSTRUCTOR_CALL(32), - FUNCTION_EXPRESSION(33), - ERROR_EXPRESSION(34), - ERROR_CALL_EXPRESSION(35), - OPERATION_NOT_SET(0); - private int value = 0; - private OperationCase(int value) { - this.value = value; - } - public static OperationCase valueOf(int value) { - switch (value) { - case 1: return BLOCK; - case 2: return BREAK; - case 3: return CALL; - case 4: return CLASS_REFERENCE; - case 5: return COMPOSITE; - case 6: return CONST; - case 7: return CONTINUE; - case 8: return DELEGATING_CONSTRUCTOR_CALL; - case 9: return DO_WHILE; - case 10: return ENUM_CONSTRUCTOR_CALL; - case 11: return FUNCTION_REFERENCE; - case 12: return GET_CLASS; - case 13: return GET_ENUM_VALUE; - case 14: return GET_FIELD; - case 15: return GET_OBJECT; - case 16: return GET_VALUE; - case 17: return INSTANCE_INITIALIZER_CALL; - case 18: return PROPERTY_REFERENCE; - case 19: return RETURN; - case 20: return SET_FIELD; - case 21: return SET_VALUE; - case 22: return STRING_CONCAT; - case 23: return THROW; - case 24: return TRY; - case 25: return TYPE_OP; - case 26: return VARARG; - case 27: return WHEN; - case 28: return WHILE; - case 29: return DYNAMIC_MEMBER; - case 30: return DYNAMIC_OPERATOR; - case 31: return LOCAL_DELEGATED_PROPERTY_REFERENCE; - case 32: return CONSTRUCTOR_CALL; - case 33: return FUNCTION_EXPRESSION; - case 34: return ERROR_EXPRESSION; - case 35: return ERROR_CALL_EXPRESSION; - case 0: return OPERATION_NOT_SET; - default: throw new java.lang.IllegalArgumentException( - "Value is undefined for this oneof enum."); - } - } - public int getNumber() { - return this.value; - } - }; public OperationCase getOperationCase() { @@ -646,13 +632,13 @@ public final class IrOperation extends operationCase_); } - public static final int BLOCK_FIELD_NUMBER = 1; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrBlock block = 1; */ public boolean hasBlock() { return operationCase_ == 1; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrBlock block = 1; */ @@ -663,13 +649,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrBlock.getDefaultInstance(); } - public static final int BREAK_FIELD_NUMBER = 2; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrBreak break = 2; */ public boolean hasBreak() { return operationCase_ == 2; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrBreak break = 2; */ @@ -680,13 +666,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrBreak.getDefaultInstance(); } - public static final int CALL_FIELD_NUMBER = 3; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrCall call = 3; */ public boolean hasCall() { return operationCase_ == 3; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrCall call = 3; */ @@ -697,13 +683,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrCall.getDefaultInstance(); } - public static final int CLASS_REFERENCE_FIELD_NUMBER = 4; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference class_reference = 4; */ public boolean hasClassReference() { return operationCase_ == 4; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference class_reference = 4; */ @@ -714,13 +700,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference.getDefaultInstance(); } - public static final int COMPOSITE_FIELD_NUMBER = 5; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrComposite composite = 5; */ public boolean hasComposite() { return operationCase_ == 5; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrComposite composite = 5; */ @@ -731,13 +717,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrComposite.getDefaultInstance(); } - public static final int CONST_FIELD_NUMBER = 6; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrConst const = 6; */ public boolean hasConst() { return operationCase_ == 6; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrConst const = 6; */ @@ -748,13 +734,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrConst.getDefaultInstance(); } - public static final int CONTINUE_FIELD_NUMBER = 7; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrContinue continue = 7; */ public boolean hasContinue() { return operationCase_ == 7; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrContinue continue = 7; */ @@ -765,13 +751,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrContinue.getDefaultInstance(); } - public static final int DELEGATING_CONSTRUCTOR_CALL_FIELD_NUMBER = 8; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall delegating_constructor_call = 8; */ public boolean hasDelegatingConstructorCall() { return operationCase_ == 8; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall delegating_constructor_call = 8; */ @@ -782,13 +768,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall.getDefaultInstance(); } - public static final int DO_WHILE_FIELD_NUMBER = 9; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDoWhile do_while = 9; */ public boolean hasDoWhile() { return operationCase_ == 9; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDoWhile do_while = 9; */ @@ -799,13 +785,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrDoWhile.getDefaultInstance(); } - public static final int ENUM_CONSTRUCTOR_CALL_FIELD_NUMBER = 10; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall enum_constructor_call = 10; */ public boolean hasEnumConstructorCall() { return operationCase_ == 10; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall enum_constructor_call = 10; */ @@ -816,13 +802,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall.getDefaultInstance(); } - public static final int FUNCTION_REFERENCE_FIELD_NUMBER = 11; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference function_reference = 11; */ public boolean hasFunctionReference() { return operationCase_ == 11; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference function_reference = 11; */ @@ -833,13 +819,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference.getDefaultInstance(); } - public static final int GET_CLASS_FIELD_NUMBER = 12; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetClass get_class = 12; */ public boolean hasGetClass() { return operationCase_ == 12; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetClass get_class = 12; */ @@ -850,13 +836,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrGetClass.getDefaultInstance(); } - public static final int GET_ENUM_VALUE_FIELD_NUMBER = 13; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue get_enum_value = 13; */ public boolean hasGetEnumValue() { return operationCase_ == 13; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue get_enum_value = 13; */ @@ -867,13 +853,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue.getDefaultInstance(); } - public static final int GET_FIELD_FIELD_NUMBER = 14; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetField get_field = 14; */ public boolean hasGetField() { return operationCase_ == 14; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetField get_field = 14; */ @@ -884,13 +870,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrGetField.getDefaultInstance(); } - public static final int GET_OBJECT_FIELD_NUMBER = 15; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject get_object = 15; */ public boolean hasGetObject() { return operationCase_ == 15; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject get_object = 15; */ @@ -901,13 +887,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject.getDefaultInstance(); } - public static final int GET_VALUE_FIELD_NUMBER = 16; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue get_value = 16; */ public boolean hasGetValue() { return operationCase_ == 16; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue get_value = 16; */ @@ -918,13 +904,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue.getDefaultInstance(); } - public static final int INSTANCE_INITIALIZER_CALL_FIELD_NUMBER = 17; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall instance_initializer_call = 17; */ public boolean hasInstanceInitializerCall() { return operationCase_ == 17; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall instance_initializer_call = 17; */ @@ -935,13 +921,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall.getDefaultInstance(); } - public static final int PROPERTY_REFERENCE_FIELD_NUMBER = 18; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference property_reference = 18; */ public boolean hasPropertyReference() { return operationCase_ == 18; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference property_reference = 18; */ @@ -952,13 +938,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference.getDefaultInstance(); } - public static final int RETURN_FIELD_NUMBER = 19; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn return = 19; */ public boolean hasReturn() { return operationCase_ == 19; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn return = 19; */ @@ -969,13 +955,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn.getDefaultInstance(); } - public static final int SET_FIELD_FIELD_NUMBER = 20; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrSetField set_field = 20; */ public boolean hasSetField() { return operationCase_ == 20; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrSetField set_field = 20; */ @@ -986,13 +972,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrSetField.getDefaultInstance(); } - public static final int SET_VALUE_FIELD_NUMBER = 21; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrSetValue set_value = 21; */ public boolean hasSetValue() { return operationCase_ == 21; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrSetValue set_value = 21; */ @@ -1003,13 +989,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrSetValue.getDefaultInstance(); } - public static final int STRING_CONCAT_FIELD_NUMBER = 22; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStringConcat string_concat = 22; */ public boolean hasStringConcat() { return operationCase_ == 22; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStringConcat string_concat = 22; */ @@ -1020,13 +1006,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrStringConcat.getDefaultInstance(); } - public static final int THROW_FIELD_NUMBER = 23; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrThrow throw = 23; */ public boolean hasThrow() { return operationCase_ == 23; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrThrow throw = 23; */ @@ -1037,13 +1023,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrThrow.getDefaultInstance(); } - public static final int TRY_FIELD_NUMBER = 24; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrTry try = 24; */ public boolean hasTry() { return operationCase_ == 24; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrTry try = 24; */ @@ -1054,13 +1040,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrTry.getDefaultInstance(); } - public static final int TYPE_OP_FIELD_NUMBER = 25; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOp type_op = 25; */ public boolean hasTypeOp() { return operationCase_ == 25; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOp type_op = 25; */ @@ -1071,13 +1057,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOp.getDefaultInstance(); } - public static final int VARARG_FIELD_NUMBER = 26; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg vararg = 26; */ public boolean hasVararg() { return operationCase_ == 26; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg vararg = 26; */ @@ -1088,13 +1074,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg.getDefaultInstance(); } - public static final int WHEN_FIELD_NUMBER = 27; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrWhen when = 27; */ public boolean hasWhen() { return operationCase_ == 27; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrWhen when = 27; */ @@ -1105,13 +1091,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrWhen.getDefaultInstance(); } - public static final int WHILE_FIELD_NUMBER = 28; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrWhile while = 28; */ public boolean hasWhile() { return operationCase_ == 28; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrWhile while = 28; */ @@ -1122,13 +1108,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrWhile.getDefaultInstance(); } - public static final int DYNAMIC_MEMBER_FIELD_NUMBER = 29; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression dynamic_member = 29; */ public boolean hasDynamicMember() { return operationCase_ == 29; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression dynamic_member = 29; */ @@ -1139,13 +1125,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression.getDefaultInstance(); } - public static final int DYNAMIC_OPERATOR_FIELD_NUMBER = 30; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicOperatorExpression dynamic_operator = 30; */ public boolean hasDynamicOperator() { return operationCase_ == 30; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicOperatorExpression dynamic_operator = 30; */ @@ -1156,13 +1142,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicOperatorExpression.getDefaultInstance(); } - public static final int LOCAL_DELEGATED_PROPERTY_REFERENCE_FIELD_NUMBER = 31; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference local_delegated_property_reference = 31; */ public boolean hasLocalDelegatedPropertyReference() { return operationCase_ == 31; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference local_delegated_property_reference = 31; */ @@ -1173,13 +1159,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference.getDefaultInstance(); } - public static final int CONSTRUCTOR_CALL_FIELD_NUMBER = 32; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall constructor_call = 32; */ public boolean hasConstructorCall() { return operationCase_ == 32; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall constructor_call = 32; */ @@ -1190,13 +1176,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall.getDefaultInstance(); } - public static final int FUNCTION_EXPRESSION_FIELD_NUMBER = 33; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionExpression function_expression = 33; */ public boolean hasFunctionExpression() { return operationCase_ == 33; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionExpression function_expression = 33; */ @@ -1207,7 +1193,6 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionExpression.getDefaultInstance(); } - public static final int ERROR_EXPRESSION_FIELD_NUMBER = 34; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorExpression error_expression = 34; * @@ -1218,6 +1203,7 @@ public final class IrOperation extends public boolean hasErrorExpression() { return operationCase_ == 34; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorExpression error_expression = 34; * @@ -1232,13 +1218,13 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorExpression.getDefaultInstance(); } - public static final int ERROR_CALL_EXPRESSION_FIELD_NUMBER = 35; /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression error_call_expression = 35; */ public boolean hasErrorCallExpression() { return operationCase_ == 35; } + /** * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression error_call_expression = 35; */ @@ -1249,9 +1235,63 @@ public final class IrOperation extends return org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression.getDefaultInstance(); } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public boolean hasRawFunctionReference() { + return operationCase_ == 36; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference getRawFunctionReference() { + if (operationCase_ == 36) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.getDefaultInstance(); + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public boolean hasReturnableBlock() { + return operationCase_ == 37; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock getReturnableBlock() { + if (operationCase_ == 37) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.getDefaultInstance(); + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public boolean hasReturnableBlockReturn() { + return operationCase_ == 38; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn getReturnableBlockReturn() { + if (operationCase_ == 38) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.getDefaultInstance(); + } + + @java.lang.Override + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + return PARSER; + } + private void initFields() { } - private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -1461,6 +1501,24 @@ public final class IrOperation extends return false; } } + if (hasRawFunctionReference()) { + if (!getRawFunctionReference().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasReturnableBlock()) { + if (!getReturnableBlock().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasReturnableBlockReturn()) { + if (!getReturnableBlockReturn().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } memoizedIsInitialized = 1; return true; } @@ -1573,10 +1631,18 @@ public final class IrOperation extends if (operationCase_ == 35) { output.writeMessage(35, (org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression) operation_); } + if (operationCase_ == 36) { + output.writeMessage(36, (org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_); + } + if (operationCase_ == 37) { + output.writeMessage(37, (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_); + } + if (operationCase_ == 38) { + output.writeMessage(38, (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_); + } output.writeRawBytes(unknownFields); } - private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -1722,10 +1788,116 @@ public final class IrOperation extends size += org.jetbrains.kotlin.protobuf.CodedOutputStream .computeMessageSize(35, (org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression) operation_); } + if (operationCase_ == 36) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(36, (org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_); + } + if (operationCase_ == 37) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(37, (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_); + } + if (operationCase_ == 38) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(38, (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_); + } size += unknownFields.size(); memoizedSerializedSize = size; return size; } +public enum OperationCase + implements org.jetbrains.kotlin.protobuf.Internal.EnumLite { + BLOCK(1), + BREAK(2), + CALL(3), + CLASS_REFERENCE(4), + COMPOSITE(5), + CONST(6), + CONTINUE(7), + DELEGATING_CONSTRUCTOR_CALL(8), + DO_WHILE(9), + ENUM_CONSTRUCTOR_CALL(10), + FUNCTION_REFERENCE(11), + GET_CLASS(12), + GET_ENUM_VALUE(13), + GET_FIELD(14), + GET_OBJECT(15), + GET_VALUE(16), + INSTANCE_INITIALIZER_CALL(17), + PROPERTY_REFERENCE(18), + RETURN(19), + SET_FIELD(20), + SET_VALUE(21), + STRING_CONCAT(22), + THROW(23), + TRY(24), + TYPE_OP(25), + VARARG(26), + WHEN(27), + WHILE(28), + DYNAMIC_MEMBER(29), + DYNAMIC_OPERATOR(30), + LOCAL_DELEGATED_PROPERTY_REFERENCE(31), + CONSTRUCTOR_CALL(32), + FUNCTION_EXPRESSION(33), + ERROR_EXPRESSION(34), + ERROR_CALL_EXPRESSION(35), + RAW_FUNCTION_REFERENCE(36), + RETURNABLE_BLOCK(37), + RETURNABLE_BLOCK_RETURN(38), + OPERATION_NOT_SET(0); + private int value = 0; + private OperationCase(int value) { + this.value = value; + } + public static OperationCase valueOf(int value) { + switch (value) { + case 1: return BLOCK; + case 2: return BREAK; + case 3: return CALL; + case 4: return CLASS_REFERENCE; + case 5: return COMPOSITE; + case 6: return CONST; + case 7: return CONTINUE; + case 8: return DELEGATING_CONSTRUCTOR_CALL; + case 9: return DO_WHILE; + case 10: return ENUM_CONSTRUCTOR_CALL; + case 11: return FUNCTION_REFERENCE; + case 12: return GET_CLASS; + case 13: return GET_ENUM_VALUE; + case 14: return GET_FIELD; + case 15: return GET_OBJECT; + case 16: return GET_VALUE; + case 17: return INSTANCE_INITIALIZER_CALL; + case 18: return PROPERTY_REFERENCE; + case 19: return RETURN; + case 20: return SET_FIELD; + case 21: return SET_VALUE; + case 22: return STRING_CONCAT; + case 23: return THROW; + case 24: return TRY; + case 25: return TYPE_OP; + case 26: return VARARG; + case 27: return WHEN; + case 28: return WHILE; + case 29: return DYNAMIC_MEMBER; + case 30: return DYNAMIC_OPERATOR; + case 31: return LOCAL_DELEGATED_PROPERTY_REFERENCE; + case 32: return CONSTRUCTOR_CALL; + case 33: return FUNCTION_EXPRESSION; + case 34: return ERROR_EXPRESSION; + case 35: return ERROR_CALL_EXPRESSION; + case 36: return RAW_FUNCTION_REFERENCE; + case 37: return RETURNABLE_BLOCK; + case 38: return RETURNABLE_BLOCK_RETURN; + case 0: return OPERATION_NOT_SET; + default: throw new java.lang.IllegalArgumentException( + "Value is undefined for this oneof enum."); + } + } + public int getNumber() { + return this.value; + } + } private static final long serialVersionUID = 0L; @java.lang.Override @@ -1953,6 +2125,15 @@ public final class IrOperation extends if (operationCase_ == 35) { result.operation_ = operation_; } + if (operationCase_ == 36) { + result.operation_ = operation_; + } + if (operationCase_ == 37) { + result.operation_ = operation_; + } + if (operationCase_ == 38) { + result.operation_ = operation_; + } result.bitField0_ = to_bitField0_; result.bitField1_ = to_bitField1_; result.operationCase_ = operationCase_; @@ -2102,6 +2283,18 @@ public final class IrOperation extends mergeErrorCallExpression(other.getErrorCallExpression()); break; } + case RAW_FUNCTION_REFERENCE: { + mergeRawFunctionReference(other.getRawFunctionReference()); + break; + } + case RETURNABLE_BLOCK: { + mergeReturnableBlock(other.getReturnableBlock()); + break; + } + case RETURNABLE_BLOCK_RETURN: { + mergeReturnableBlockReturn(other.getReturnableBlockReturn()); + break; + } case OPERATION_NOT_SET: { break; } @@ -2316,6 +2509,24 @@ public final class IrOperation extends return false; } } + if (hasRawFunctionReference()) { + if (!getRawFunctionReference().isInitialized()) { + + return false; + } + } + if (hasReturnableBlock()) { + if (!getReturnableBlock().isInitialized()) { + + return false; + } + } + if (hasReturnableBlockReturn()) { + if (!getReturnableBlockReturn().isInitialized()) { + + return false; + } + } return true; } @@ -4617,6 +4828,198 @@ public final class IrOperation extends return this; } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public boolean hasRawFunctionReference() { + return operationCase_ == 36; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference getRawFunctionReference() { + if (operationCase_ == 36) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public Builder setRawFunctionReference(org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference value) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + + operationCase_ = 36; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public Builder setRawFunctionReference( + org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.Builder builderForValue) { + operation_ = builderForValue.build(); + + operationCase_ = 36; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public Builder mergeRawFunctionReference(org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference value) { + if (operationCase_ == 36 && + operation_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.getDefaultInstance()) { + operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + + operationCase_ = 36; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + public Builder clearRawFunctionReference() { + if (operationCase_ == 36) { + operationCase_ = 0; + operation_ = null; + + } + return this; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public boolean hasReturnableBlock() { + return operationCase_ == 37; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock getReturnableBlock() { + if (operationCase_ == 37) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public Builder setReturnableBlock(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock value) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + + operationCase_ = 37; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public Builder setReturnableBlock( + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.Builder builderForValue) { + operation_ = builderForValue.build(); + + operationCase_ = 37; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public Builder mergeReturnableBlock(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock value) { + if (operationCase_ == 37 && + operation_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.getDefaultInstance()) { + operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + + operationCase_ = 37; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + public Builder clearReturnableBlock() { + if (operationCase_ == 37) { + operationCase_ = 0; + operation_ = null; + + } + return this; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public boolean hasReturnableBlockReturn() { + return operationCase_ == 38; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn getReturnableBlockReturn() { + if (operationCase_ == 38) { + return (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_; + } + return org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public Builder setReturnableBlockReturn(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn value) { + if (value == null) { + throw new NullPointerException(); + } + operation_ = value; + + operationCase_ = 38; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public Builder setReturnableBlockReturn( + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.Builder builderForValue) { + operation_ = builderForValue.build(); + + operationCase_ = 38; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public Builder mergeReturnableBlockReturn(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn value) { + if (operationCase_ == 38 && + operation_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.getDefaultInstance()) { + operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) operation_) + .mergeFrom(value).buildPartial(); + } else { + operation_ = value; + } + + operationCase_ = 38; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + public Builder clearReturnableBlockReturn() { + if (operationCase_ == 38) { + operationCase_ = 0; + operation_ = null; + + } + return this; + } + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation) } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperationOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperationOrBuilder.java index 9941ad75397..fcb07ef5efc 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperationOrBuilder.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperationOrBuilder.java @@ -329,4 +329,31 @@ public interface IrOperationOrBuilder extends * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression error_call_expression = 35; */ org.jetbrains.kotlin.backend.common.serialization.proto.IrErrorCallExpression getErrorCallExpression(); + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + boolean hasRawFunctionReference(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference raw_function_reference = 36; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.IrRawFunctionReference getRawFunctionReference(); + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + boolean hasReturnableBlock(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock returnable_block = 37; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlock getReturnableBlock(); + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + boolean hasReturnableBlockReturn(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn returnable_block_return = 38; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn getReturnableBlockReturn(); } \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnableBlockReturn.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnableBlockReturn.java new file mode 100644 index 00000000000..dbadde83c24 --- /dev/null +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnableBlockReturn.java @@ -0,0 +1,489 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compiler/ir/serialization.common/src/KotlinIr.proto + +package org.jetbrains.kotlin.backend.common.serialization.proto; + +/** + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn} + */ +public final class IrReturnableBlockReturn extends + org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) + IrReturnableBlockReturnOrBuilder { + public static final int UPCNT_FIELD_NUMBER = 1; + public static final int VALUE_FIELD_NUMBER = 2; + private static final IrReturnableBlockReturn defaultInstance; + private static final long serialVersionUID = 0L; + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public IrReturnableBlockReturn parsePartialFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return new IrReturnableBlockReturn(input, extensionRegistry); + } + }; + + static { + defaultInstance = new IrReturnableBlockReturn(true); + defaultInstance.initFields(); + } + + private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; + private int bitField0_; + private int upCnt_; + private org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value_; + private byte memoizedIsInitialized = -1; + private int memoizedSerializedSize = -1; + // Use IrReturnableBlockReturn.newBuilder() to construct. + private IrReturnableBlockReturn(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private IrReturnableBlockReturn(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + private IrReturnableBlockReturn( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = + org.jetbrains.kotlin.protobuf.ByteString.newOutput(); + org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = + org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( + unknownFieldsOutput, 1); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFieldsCodedOutput, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + upCnt_ = input.readUInt32(); + break; + } + case 18: { + org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = value_.toBuilder(); + } + value_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(value_); + value_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + } + } + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + try { + unknownFieldsCodedOutput.flush(); + } catch (java.io.IOException e) { + // Should not happen + } finally { + unknownFields = unknownFieldsOutput.toByteString(); + } + makeExtensionsImmutable(); + } + } + + public static IrReturnableBlockReturn getDefaultInstance() { + return defaultInstance; + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom( + org.jetbrains.kotlin.protobuf.ByteString data) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom( + org.jetbrains.kotlin.protobuf.ByteString data, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom(byte[] data) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom( + byte[] data, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom( + java.io.InputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseDelimitedFrom( + java.io.InputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + + public static org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parseFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + + public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn prototype) { + return newBuilder().mergeFrom(prototype); + } + + @java.lang.Override + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * required uint32 upCnt = 1; + */ + public boolean hasUpCnt() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + + /** + * required uint32 upCnt = 1; + */ + public int getUpCnt() { + return upCnt_; + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public boolean hasValue() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression getValue() { + return value_; + } + + private void initFields() { + upCnt_ = 0; + value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); + } + + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + if (!hasUpCnt()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasValue()) { + memoizedIsInitialized = 0; + return false; + } + if (!getValue().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeUInt32(1, upCnt_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, value_); + } + output.writeRawBytes(unknownFields); + } + + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeUInt32Size(1, upCnt_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(2, value_); + } + size += unknownFields.size(); + memoizedSerializedSize = size; + return size; + } + + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public Builder newBuilderForType() { return newBuilder(); } + + public Builder toBuilder() { return newBuilder(this); } + + public IrReturnableBlockReturn getDefaultInstanceForType() { + return defaultInstance; + } + + /** + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn} + */ + public static final class Builder extends + org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn, Builder> + implements + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturnOrBuilder { + private int bitField0_; + private int upCnt_ ; + private org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); + + // Construct using org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + upCnt_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn getDefaultInstanceForType() { + return org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.getDefaultInstance(); + } + + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn build() { + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn buildPartial() { + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn result = new org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.upCnt_ = upCnt_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.value_ = value_; + result.bitField0_ = to_bitField0_; + return result; + } + + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn.getDefaultInstance()) return this; + if (other.hasUpCnt()) { + setUpCnt(other.getUpCnt()); + } + if (other.hasValue()) { + mergeValue(other.getValue()); + } + setUnknownFields( + getUnknownFields().concat(other.unknownFields)); + return this; + } + + public Builder mergeFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private void maybeForceBuilderInitialization() { + } + /** + * required uint32 upCnt = 1; + */ + public boolean hasUpCnt() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required uint32 upCnt = 1; + */ + public int getUpCnt() { + return upCnt_; + } + + /** + * required uint32 upCnt = 1; + */ + public Builder setUpCnt(int value) { + bitField0_ |= 0x00000001; + upCnt_ = value; + + return this; + } + + public final boolean isInitialized() { + if (!hasUpCnt()) { + + return false; + } + if (!hasValue()) { + + return false; + } + if (!getValue().isInitialized()) { + + return false; + } + return true; + } + + /** + * required uint32 upCnt = 1; + */ + public Builder clearUpCnt() { + bitField0_ = (bitField0_ & ~0x00000001); + upCnt_ = 0; + + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public boolean hasValue() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression getValue() { + return value_; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public Builder setValue(org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value) { + if (value == null) { + throw new NullPointerException(); + } + value_ = value; + + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public Builder setValue( + org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.Builder builderForValue) { + value_ = builderForValue.build(); + + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public Builder mergeValue(org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + value_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance()) { + value_ = + org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.newBuilder(value_).mergeFrom(value).buildPartial(); + } else { + value_ = value; + } + + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + public Builder clearValue() { + value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) +} \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnableBlockReturnOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnableBlockReturnOrBuilder.java new file mode 100644 index 00000000000..43da38aa655 --- /dev/null +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnableBlockReturnOrBuilder.java @@ -0,0 +1,27 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compiler/ir/serialization.common/src/KotlinIr.proto + +package org.jetbrains.kotlin.backend.common.serialization.proto; + +public interface IrReturnableBlockReturnOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.proto.IrReturnableBlockReturn) + org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { + + /** + * required uint32 upCnt = 1; + */ + boolean hasUpCnt(); + /** + * required uint32 upCnt = 1; + */ + int getUpCnt(); + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + boolean hasValue(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2; + */ + org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression getValue(); +} \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameter.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameter.java index b3ccf15aa7b..abe67d40ddb 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameter.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameter.java @@ -27,92 +27,7 @@ public final class IrTypeParameter extends } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private IrTypeParameter( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = base_.toBuilder(); - } - base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(base_); - base_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 16: { - bitField0_ |= 0x00000002; - name_ = input.readInt32(); - break; - } - case 24: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - superType_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - superType_.add(input.readInt32()); - break; - } - case 26: { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) { - superType_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - while (input.getBytesUntilLimit() > 0) { - superType_.add(input.readInt32()); - } - input.popLimit(limit); - break; - } - } - } - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - superType_ = java.util.Collections.unmodifiableList(superType_); - } - try { - unknownFieldsCodedOutput.flush(); - } catch (java.io.IOException e) { - // Should not happen - } finally { - unknownFields = unknownFieldsOutput.toByteString(); - } - makeExtensionsImmutable(); - } - } + public static final int INDEX_FIELD_NUMBER = 4; public static org.jetbrains.kotlin.protobuf.Parser PARSER = new org.jetbrains.kotlin.protobuf.AbstractParser() { public IrTypeParameter parsePartialFrom( @@ -181,11 +96,139 @@ public final class IrTypeParameter extends return superType_.get(index); } private int superTypeMemoizedSerializedSize = -1; + public static final int ISGLOBAL_FIELD_NUMBER = 5; + private int index_; + private boolean isGlobal_; + private IrTypeParameter( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = + org.jetbrains.kotlin.protobuf.ByteString.newOutput(); + org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = + org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( + unknownFieldsOutput, 1); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFieldsCodedOutput, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = base_.toBuilder(); + } + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 16: { + bitField0_ |= 0x00000002; + name_ = input.readInt32(); + break; + } + case 24: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + superType_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + superType_.add(input.readInt32()); + break; + } + case 26: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) { + superType_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + while (input.getBytesUntilLimit() > 0) { + superType_.add(input.readInt32()); + } + input.popLimit(limit); + break; + } + case 32: { + bitField0_ |= 0x00000004; + index_ = input.readInt32(); + break; + } + case 40: { + bitField0_ |= 0x00000008; + isGlobal_ = input.readBool(); + break; + } + } + } + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + superType_ = java.util.Collections.unmodifiableList(superType_); + } + try { + unknownFieldsCodedOutput.flush(); + } catch (java.io.IOException e) { + // Should not happen + } finally { + unknownFields = unknownFieldsOutput.toByteString(); + } + makeExtensionsImmutable(); + } + } + + /** + * optional int32 index = 4; + */ + public boolean hasIndex() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + + /** + * optional int32 index = 4; + */ + public int getIndex() { + return index_; + } + + /** + * optional bool isGlobal = 5; + */ + public boolean hasIsGlobal() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional bool isGlobal = 5; + */ + public boolean getIsGlobal() { + return isGlobal_; + } private void initFields() { base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); name_ = 0; superType_ = java.util.Collections.emptyList(); + index_ = 0; + isGlobal_ = false; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -225,6 +268,12 @@ public final class IrTypeParameter extends for (int i = 0; i < superType_.size(); i++) { output.writeInt32NoTag(superType_.get(i)); } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(4, index_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeBool(5, isGlobal_); + } output.writeRawBytes(unknownFields); } @@ -256,6 +305,14 @@ public final class IrTypeParameter extends } superTypeMemoizedSerializedSize = dataSize; } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeInt32Size(4, index_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeBoolSize(5, isGlobal_); + } size += unknownFields.size(); memoizedSerializedSize = size; return size; @@ -348,16 +405,7 @@ public final class IrTypeParameter extends return new Builder(); } - public Builder clear() { - super.clear(); - base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - superType_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } + private int index_ ; public Builder clone() { return create().mergeFrom(buildPartial()); @@ -374,48 +422,20 @@ public final class IrTypeParameter extends } return result; } + private boolean isGlobal_ ; - public org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter buildPartial() { - org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter result = new org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.base_ = base_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.name_ = name_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - superType_ = java.util.Collections.unmodifiableList(superType_); - bitField0_ = (bitField0_ & ~0x00000004); - } - result.superType_ = superType_; - result.bitField0_ = to_bitField0_; - return result; - } - - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter.getDefaultInstance()) return this; - if (other.hasBase()) { - mergeBase(other.getBase()); - } - if (other.hasName()) { - setName(other.getName()); - } - if (!other.superType_.isEmpty()) { - if (superType_.isEmpty()) { - superType_ = other.superType_; - bitField0_ = (bitField0_ & ~0x00000004); - } else { - ensureSuperTypeIsMutable(); - superType_.addAll(other.superType_); - } - - } - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); + public Builder clear() { + super.clear(); + base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000001); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + superType_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + index_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + isGlobal_ = false; + bitField0_ = (bitField0_ & ~0x00000010); return this; } @@ -602,12 +622,136 @@ public final class IrTypeParameter extends return this; } + + public org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter buildPartial() { + org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter result = new org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.base_ = base_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.name_ = name_; + if (((bitField0_ & 0x00000004) == 0x00000004)) { + superType_ = java.util.Collections.unmodifiableList(superType_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.superType_ = superType_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000004; + } + result.index_ = index_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000008; + } + result.isGlobal_ = isGlobal_; + result.bitField0_ = to_bitField0_; + return result; + } + + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter.getDefaultInstance()) return this; + if (other.hasBase()) { + mergeBase(other.getBase()); + } + if (other.hasName()) { + setName(other.getName()); + } + if (!other.superType_.isEmpty()) { + if (superType_.isEmpty()) { + superType_ = other.superType_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureSuperTypeIsMutable(); + superType_.addAll(other.superType_); + } + + } + if (other.hasIndex()) { + setIndex(other.getIndex()); + } + if (other.hasIsGlobal()) { + setIsGlobal(other.getIsGlobal()); + } + setUnknownFields( + getUnknownFields().concat(other.unknownFields)); + return this; + } + /** * repeated int32 super_type = 3 [packed = true]; */ public Builder clearSuperType() { superType_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); + + return this; + } + + /** + * optional int32 index = 4; + */ + public boolean hasIndex() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + + /** + * optional int32 index = 4; + */ + public int getIndex() { + return index_; + } + + /** + * optional int32 index = 4; + */ + public Builder setIndex(int value) { + bitField0_ |= 0x00000008; + index_ = value; + + return this; + } + + /** + * optional int32 index = 4; + */ + public Builder clearIndex() { + bitField0_ = (bitField0_ & ~0x00000008); + index_ = 0; + + return this; + } + + /** + * optional bool isGlobal = 5; + */ + public boolean hasIsGlobal() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional bool isGlobal = 5; + */ + public boolean getIsGlobal() { + return isGlobal_; + } + /** + * optional bool isGlobal = 5; + */ + public Builder setIsGlobal(boolean value) { + bitField0_ |= 0x00000010; + isGlobal_ = value; + + return this; + } + /** + * optional bool isGlobal = 5; + */ + public Builder clearIsGlobal() { + bitField0_ = (bitField0_ & ~0x00000010); + isGlobal_ = false; return this; } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameterOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameterOrBuilder.java index 0dbb5a7c982..a5c1355ff55 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameterOrBuilder.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameterOrBuilder.java @@ -37,4 +37,22 @@ public interface IrTypeParameterOrBuilder extends * repeated int32 super_type = 3 [packed = true]; */ int getSuperType(int index); + + /** + * optional int32 index = 4; + */ + boolean hasIndex(); + /** + * optional int32 index = 4; + */ + int getIndex(); + + /** + * optional bool isGlobal = 5; + */ + boolean hasIsGlobal(); + /** + * optional bool isGlobal = 5; + */ + boolean getIsGlobal(); } \ No newline at end of file diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameter.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameter.java index 4996756b712..5c59d593990 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameter.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameter.java @@ -27,78 +27,7 @@ public final class IrValueParameter extends } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private IrValueParameter( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = base_.toBuilder(); - } - base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(base_); - base_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 16: { - bitField0_ |= 0x00000002; - nameType_ = input.readInt64(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - varargElementType_ = input.readInt32(); - break; - } - case 32: { - bitField0_ |= 0x00000008; - defaultValue_ = input.readInt32(); - break; - } - } - } - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - try { - unknownFieldsCodedOutput.flush(); - } catch (java.io.IOException e) { - // Should not happen - } finally { - unknownFields = unknownFieldsOutput.toByteString(); - } - makeExtensionsImmutable(); - } - } + public static final int INDEX_FIELD_NUMBER = 5; public static org.jetbrains.kotlin.protobuf.Parser PARSER = new org.jetbrains.kotlin.protobuf.AbstractParser() { public IrValueParameter parsePartialFrom( @@ -174,12 +103,104 @@ public final class IrValueParameter extends public int getDefaultValue() { return defaultValue_; } + private int index_; + private IrValueParameter( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = + org.jetbrains.kotlin.protobuf.ByteString.newOutput(); + org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = + org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( + unknownFieldsOutput, 1); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFieldsCodedOutput, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = base_.toBuilder(); + } + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 16: { + bitField0_ |= 0x00000002; + nameType_ = input.readInt64(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + varargElementType_ = input.readInt32(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + defaultValue_ = input.readInt32(); + break; + } + case 40: { + bitField0_ |= 0x00000010; + index_ = input.readInt32(); + break; + } + } + } + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + try { + unknownFieldsCodedOutput.flush(); + } catch (java.io.IOException e) { + // Should not happen + } finally { + unknownFields = unknownFieldsOutput.toByteString(); + } + makeExtensionsImmutable(); + } + } + + /** + * optional int32 index = 5; + */ + public boolean hasIndex() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 index = 5; + */ + public int getIndex() { + return index_; + } private void initFields() { base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); nameType_ = 0L; varargElementType_ = 0; defaultValue_ = 0; + index_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -218,6 +239,9 @@ public final class IrValueParameter extends if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeInt32(4, defaultValue_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeInt32(5, index_); + } output.writeRawBytes(unknownFields); } @@ -243,6 +267,10 @@ public final class IrValueParameter extends size += org.jetbrains.kotlin.protobuf.CodedOutputStream .computeInt32Size(4, defaultValue_); } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeInt32Size(5, index_); + } size += unknownFields.size(); memoizedSerializedSize = size; return size; @@ -335,18 +363,7 @@ public final class IrValueParameter extends return new Builder(); } - public Builder clear() { - super.clear(); - base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); - nameType_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); - varargElementType_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); - defaultValue_ = 0; - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } + private int index_ ; public Builder clone() { return create().mergeFrom(buildPartial()); @@ -364,6 +381,21 @@ public final class IrValueParameter extends return result; } + public Builder clear() { + super.clear(); + base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000001); + nameType_ = 0L; + bitField0_ = (bitField0_ & ~0x00000002); + varargElementType_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + defaultValue_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + index_ = 0; + bitField0_ = (bitField0_ & ~0x00000010); + return this; + } + public org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter buildPartial() { org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter result = new org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter(this); int from_bitField0_ = bitField0_; @@ -384,29 +416,14 @@ public final class IrValueParameter extends to_bitField0_ |= 0x00000008; } result.defaultValue_ = defaultValue_; + if (((from_bitField0_ & 0x00000010) == 0x00000010)) { + to_bitField0_ |= 0x00000010; + } + result.index_ = index_; result.bitField0_ = to_bitField0_; return result; } - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.getDefaultInstance()) return this; - if (other.hasBase()) { - mergeBase(other.getBase()); - } - if (other.hasNameType()) { - setNameType(other.getNameType()); - } - if (other.hasVarargElementType()) { - setVarargElementType(other.getVarargElementType()); - } - if (other.hasDefaultValue()) { - setDefaultValue(other.getDefaultValue()); - } - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); - return this; - } - public final boolean isInitialized() { if (!hasBase()) { @@ -588,12 +605,66 @@ public final class IrValueParameter extends return this; } + + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.getDefaultInstance()) return this; + if (other.hasBase()) { + mergeBase(other.getBase()); + } + if (other.hasNameType()) { + setNameType(other.getNameType()); + } + if (other.hasVarargElementType()) { + setVarargElementType(other.getVarargElementType()); + } + if (other.hasDefaultValue()) { + setDefaultValue(other.getDefaultValue()); + } + if (other.hasIndex()) { + setIndex(other.getIndex()); + } + setUnknownFields( + getUnknownFields().concat(other.unknownFields)); + return this; + } + /** * optional int32 default_value = 4; */ public Builder clearDefaultValue() { bitField0_ = (bitField0_ & ~0x00000008); defaultValue_ = 0; + + return this; + } + + /** + * optional int32 index = 5; + */ + public boolean hasIndex() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional int32 index = 5; + */ + public int getIndex() { + return index_; + } + /** + * optional int32 index = 5; + */ + public Builder setIndex(int value) { + bitField0_ |= 0x00000010; + index_ = value; + + return this; + } + /** + * optional int32 index = 5; + */ + public Builder clearIndex() { + bitField0_ = (bitField0_ & ~0x00000010); + index_ = 0; return this; } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameterOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameterOrBuilder.java index d30b680c8a0..2fa5e98c3d7 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameterOrBuilder.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameterOrBuilder.java @@ -42,4 +42,13 @@ public interface IrValueParameterOrBuilder extends * optional int32 default_value = 4; */ int getDefaultValue(); + + /** + * optional int32 index = 5; + */ + boolean hasIndex(); + /** + * optional int32 index = 5; + */ + int getIndex(); } \ No newline at end of file