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

[IR SERIALIZATION] Get rid of IrDataIndex

Browse Source
This commit is contained in:
Roman Artemev
2019-09-03 17:30:42 +03:00
committed by romanart
parent 8c2ae4f91a
commit 9fa89bf7e2
102 changed files with 2010 additions and 5708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/KotlinIr.proto
+68 -83
View File
@@ -8,7 +8,7 @@ option optimize_for = LITE_RUNTIME;
message DescriptorReference { message DescriptorReference {
required FqName package_fq_name = 1; required FqName package_fq_name = 1;
required FqName class_fq_name = 2; required FqName class_fq_name = 2;
required IrDataIndex name = 3; required int32 name = 3;
optional UniqId uniq_id = 4; optional UniqId uniq_id = 4;
optional bool is_getter = 5 [default = false]; optional bool is_getter = 5 [default = false];
optional bool is_setter = 6 [default = false]; optional bool is_setter = 6 [default = false];
@@ -31,11 +31,11 @@ message Coordinates {
} }
message Visibility { message Visibility {
required IrDataIndex name = 1; required int32 name = 1;
} }
message IrStatementOrigin { message IrStatementOrigin {
required IrDataIndex name = 1; required int32 name = 1;
} }
enum KnownOrigin { enum KnownOrigin {
@@ -72,16 +72,12 @@ enum KnownOrigin {
message IrDeclarationOrigin { message IrDeclarationOrigin {
oneof either { oneof either {
KnownOrigin origin = 1; KnownOrigin origin = 1;
IrDataIndex custom = 2; int32 custom = 2;
} }
} }
message IrDataIndex {
required int32 index = 1;
}
message FqName { message FqName {
repeated IrDataIndex segment = 1; repeated int32 segment = 1;
} }
/* ------ Top Level---------------------------------------------- */ /* ------ Top Level---------------------------------------------- */
@@ -100,18 +96,7 @@ message IrFile {
required FileEntry file_entry = 2; required FileEntry file_entry = 2;
required FqName fq_name = 3; required FqName fq_name = 3;
required Annotations annotations = 4; required Annotations annotations = 4;
repeated IrDataIndex explicitly_exported_to_compiler = 5; repeated int32 explicitly_exported_to_compiler = 5;
}
//message IrModule {
// required string name = 1;
// repeated IrFile file = 2;
//}
/* ------ String Table ------------------------------------------ */
message StringTable {
repeated string strings = 1;
} }
/* ------ IrSymbols --------------------------------------------- */ /* ------ IrSymbols --------------------------------------------- */
@@ -159,7 +144,7 @@ message Annotations {
} }
message TypeArguments { message TypeArguments {
repeated IrDataIndex type_argument = 1; repeated int32 type_argument = 1;
} }
message IrStarProjection { message IrStarProjection {
@@ -168,7 +153,7 @@ message IrStarProjection {
message IrTypeProjection { message IrTypeProjection {
required IrTypeVariance variance = 1; required IrTypeVariance variance = 1;
required IrDataIndex type = 2; required int32 type = 2;
} }
message IrTypeArgument { message IrTypeArgument {
@@ -180,7 +165,7 @@ message IrTypeArgument {
message IrSimpleType { message IrSimpleType {
required Annotations annotations = 1; required Annotations annotations = 1;
required IrDataIndex classifier = 2; required int32 classifier = 2;
required bool has_question_mark = 3; required bool has_question_mark = 3;
repeated IrTypeArgument argument = 4; repeated IrTypeArgument argument = 4;
optional IrTypeAbbreviation abbreviation = 5; optional IrTypeAbbreviation abbreviation = 5;
@@ -188,7 +173,7 @@ message IrSimpleType {
message IrTypeAbbreviation { message IrTypeAbbreviation {
required Annotations annotations = 1; required Annotations annotations = 1;
required IrDataIndex type_alias = 2; required int32 type_alias = 2;
required bool has_question_mark = 3; required bool has_question_mark = 3;
repeated IrTypeArgument argument = 4; repeated IrTypeArgument argument = 4;
} }
@@ -218,7 +203,7 @@ message IrTypeTable {
message IrBreak { message IrBreak {
required int32 loop_id = 1; required int32 loop_id = 1;
optional IrDataIndex label = 2; optional int32 label = 2;
} }
message IrBlock { message IrBlock {
@@ -234,39 +219,39 @@ message MemberAccessCommon {
} }
message IrCall { message IrCall {
required IrDataIndex symbol = 1; required int32 symbol = 1;
required MemberAccessCommon member_access = 2; required MemberAccessCommon member_access = 2;
optional IrDataIndex super = 3; optional int32 super = 3;
optional IrStatementOrigin origin = 4; optional IrStatementOrigin origin = 4;
} }
message IrConstructorCall { message IrConstructorCall {
required IrDataIndex symbol = 1; required int32 symbol = 1;
required int32 constructor_type_arguments_count = 2; required int32 constructor_type_arguments_count = 2;
required MemberAccessCommon member_access = 3; required MemberAccessCommon member_access = 3;
} }
message IrFunctionReference { message IrFunctionReference {
required IrDataIndex symbol = 1; required int32 symbol = 1;
optional IrStatementOrigin origin = 2; optional IrStatementOrigin origin = 2;
required MemberAccessCommon member_access = 3; required MemberAccessCommon member_access = 3;
} }
message IrLocalDelegatedPropertyReference { message IrLocalDelegatedPropertyReference {
required IrDataIndex delegate = 1; required int32 delegate = 1;
optional IrDataIndex getter = 2; optional int32 getter = 2;
optional IrDataIndex setter = 3; optional int32 setter = 3;
required IrDataIndex symbol = 4; required int32 symbol = 4;
optional IrStatementOrigin origin = 5; optional IrStatementOrigin origin = 5;
} }
message IrPropertyReference { message IrPropertyReference {
optional IrDataIndex field = 1; optional int32 field = 1;
optional IrDataIndex getter = 2; optional int32 getter = 2;
optional IrDataIndex setter = 3; optional int32 setter = 3;
optional IrStatementOrigin origin = 4; optional IrStatementOrigin origin = 4;
required MemberAccessCommon member_access = 5; required MemberAccessCommon member_access = 5;
required IrDataIndex symbol = 6; required int32 symbol = 6;
} }
message IrComposite { message IrComposite {
@@ -275,8 +260,8 @@ message IrComposite {
} }
message IrClassReference { message IrClassReference {
required IrDataIndex class_symbol = 1; required int32 class_symbol = 1;
required IrDataIndex class_type = 2; required int32 class_type = 2;
} }
message IrConst { message IrConst {
@@ -290,17 +275,17 @@ message IrConst {
int64 long = 7; int64 long = 7;
float float = 8; float float = 8;
double double = 9; double double = 9;
IrDataIndex string = 10; int32 string = 10;
} }
} }
message IrContinue { message IrContinue {
required int32 loop_id = 1; required int32 loop_id = 1;
optional IrDataIndex label = 2; optional int32 label = 2;
} }
message IrDelegatingConstructorCall { message IrDelegatingConstructorCall {
required IrDataIndex symbol = 1; required int32 symbol = 1;
required MemberAccessCommon member_access = 2; required MemberAccessCommon member_access = 2;
} }
@@ -309,7 +294,7 @@ message IrDoWhile {
} }
message IrEnumConstructorCall { message IrEnumConstructorCall {
required IrDataIndex symbol = 1; required int32 symbol = 1;
required MemberAccessCommon member_access = 2; required MemberAccessCommon member_access = 2;
} }
@@ -318,12 +303,12 @@ message IrGetClass {
} }
message IrGetEnumValue { message IrGetEnumValue {
required IrDataIndex symbol = 2; required int32 symbol = 2;
} }
message FieldAccessCommon { message FieldAccessCommon {
required IrDataIndex symbol = 1; required int32 symbol = 1;
optional IrDataIndex super = 2; optional int32 super = 2;
optional IrExpression receiver = 3; optional IrExpression receiver = 3;
} }
@@ -333,28 +318,28 @@ message IrGetField {
} }
message IrGetValue { message IrGetValue {
required IrDataIndex symbol = 1; required int32 symbol = 1;
optional IrStatementOrigin origin = 2; optional IrStatementOrigin origin = 2;
} }
message IrGetObject { message IrGetObject {
required IrDataIndex symbol = 1; required int32 symbol = 1;
} }
message IrInstanceInitializerCall { message IrInstanceInitializerCall {
required IrDataIndex symbol = 1; required int32 symbol = 1;
} }
message Loop { message Loop {
required int32 loop_id = 1; required int32 loop_id = 1;
required IrExpression condition = 2; required IrExpression condition = 2;
optional IrDataIndex label = 3; optional int32 label = 3;
optional IrExpression body = 4; optional IrExpression body = 4;
optional IrStatementOrigin origin = 5; optional IrStatementOrigin origin = 5;
} }
message IrReturn { message IrReturn {
required IrDataIndex return_target = 1; required int32 return_target = 1;
required IrExpression value = 2; required IrExpression value = 2;
} }
@@ -365,7 +350,7 @@ message IrSetField {
} }
message IrSetVariable { message IrSetVariable {
required IrDataIndex symbol = 1; required int32 symbol = 1;
required IrExpression value = 2; required IrExpression value = 2;
optional IrStatementOrigin origin = 3; optional IrStatementOrigin origin = 3;
} }
@@ -391,12 +376,12 @@ message IrTry {
message IrTypeOp { message IrTypeOp {
required IrTypeOperator operator = 1; required IrTypeOperator operator = 1;
required IrDataIndex operand = 2; required int32 operand = 2;
required IrExpression argument = 3; required IrExpression argument = 3;
} }
message IrVararg { message IrVararg {
required IrDataIndex element_type = 1; required int32 element_type = 1;
repeated IrVarargElement element = 2; repeated IrVarargElement element = 2;
} }
@@ -424,7 +409,7 @@ message IrFunctionExpression {
/* ------ Dynamic expression --------------------------------------------- */ /* ------ Dynamic expression --------------------------------------------- */
message IrDynamicMemberExpression { message IrDynamicMemberExpression {
required IrDataIndex memberName = 1; required int32 memberName = 1;
required IrExpression receiver = 2; required IrExpression receiver = 2;
} }
@@ -525,7 +510,7 @@ enum IrTypeOperator {
message IrExpression { message IrExpression {
required IrOperation operation = 1; required IrOperation operation = 1;
required IrDataIndex type = 2; required int32 type = 2;
required Coordinates coordinates = 3; required Coordinates coordinates = 3;
} }
@@ -536,7 +521,7 @@ message NullableIrExpression {
/* ------ Declarations --------------------------------------------- */ /* ------ Declarations --------------------------------------------- */
message IrDeclarationBase { message IrDeclarationBase {
required IrDataIndex symbol = 1; required int32 symbol = 1;
required IrDeclarationOrigin origin = 2; required IrDeclarationOrigin origin = 2;
required Coordinates coordinates = 3; required Coordinates coordinates = 3;
required Annotations annotations = 4; required Annotations annotations = 4;
@@ -544,7 +529,7 @@ message IrDeclarationBase {
message IrFunctionBase { message IrFunctionBase {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required Visibility visibility = 3; required Visibility visibility = 3;
required bool is_inline = 4; required bool is_inline = 4;
required bool is_external = 5; required bool is_external = 5;
@@ -552,8 +537,8 @@ message IrFunctionBase {
optional IrValueParameter dispatch_receiver = 7; optional IrValueParameter dispatch_receiver = 7;
optional IrValueParameter extension_receiver = 8; optional IrValueParameter extension_receiver = 8;
repeated IrValueParameter value_parameter = 9; repeated IrValueParameter value_parameter = 9;
optional IrDataIndex body = 10; optional int32 body = 10;
required IrDataIndex return_type = 11; required int32 return_type = 11;
} }
message IrFunction { message IrFunction {
@@ -561,7 +546,7 @@ message IrFunction {
required ModalityKind modality = 2; required ModalityKind modality = 2;
required bool is_tailrec = 3; required bool is_tailrec = 3;
required bool is_suspend = 4; required bool is_suspend = 4;
repeated IrDataIndex overridden = 5; repeated int32 overridden = 5;
//optional UniqId corresponding_property = 7; //optional UniqId corresponding_property = 7;
} }
@@ -573,19 +558,19 @@ message IrConstructor {
message IrField { message IrField {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
optional IrDataIndex initializer = 2; optional int32 initializer = 2;
required IrDataIndex name = 3; required int32 name = 3;
required Visibility visibility = 4; required Visibility visibility = 4;
required bool is_final = 5; required bool is_final = 5;
required bool is_external = 6; required bool is_external = 6;
required bool is_static = 7; required bool is_static = 7;
required IrDataIndex type = 8; required int32 type = 8;
} }
message IrLocalDelegatedProperty { message IrLocalDelegatedProperty {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required IrDataIndex type = 3; required int32 type = 3;
required bool is_var = 4; required bool is_var = 4;
required IrVariable delegate = 5; required IrVariable delegate = 5;
optional IrFunction getter = 6; optional IrFunction getter = 6;
@@ -594,7 +579,7 @@ message IrLocalDelegatedProperty {
message IrProperty { message IrProperty {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required Visibility visibility = 3; required Visibility visibility = 3;
required ModalityKind modality = 4; required ModalityKind modality = 4;
required bool is_var = 5; required bool is_var = 5;
@@ -609,8 +594,8 @@ message IrProperty {
message IrVariable { message IrVariable {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required IrDataIndex type = 3; required int32 type = 3;
required bool is_var = 4; required bool is_var = 4;
required bool is_const = 5; required bool is_const = 5;
required bool is_lateinit = 6; required bool is_lateinit = 6;
@@ -635,21 +620,21 @@ enum ModalityKind { // It is ModalityKind to not clash with Modality in descript
message IrValueParameter { message IrValueParameter {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required int32 index = 3; required int32 index = 3;
required IrDataIndex type = 4; required int32 type = 4;
optional IrDataIndex vararg_element_type = 5; optional int32 vararg_element_type = 5;
required bool is_crossinline = 6; required bool is_crossinline = 6;
required bool is_noinline = 7; required bool is_noinline = 7;
optional IrDataIndex default_value = 8; optional int32 default_value = 8;
} }
message IrTypeParameter { message IrTypeParameter {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required int32 index = 3; required int32 index = 3;
required IrTypeVariance variance = 4; required IrTypeVariance variance = 4;
repeated IrDataIndex super_type = 5; repeated int32 super_type = 5;
required bool is_reified = 6; required bool is_reified = 6;
} }
@@ -659,7 +644,7 @@ message IrTypeParameterContainer {
message IrClass { message IrClass {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required ClassKind kind = 3; required ClassKind kind = 3;
required Visibility visibility = 4; required Visibility visibility = 4;
required ModalityKind modality = 5; required ModalityKind modality = 5;
@@ -672,28 +657,28 @@ message IrClass {
optional IrValueParameter this_receiver = 11; optional IrValueParameter this_receiver = 11;
required IrTypeParameterContainer type_parameters = 12; required IrTypeParameterContainer type_parameters = 12;
required IrDeclarationContainer declaration_container = 13; required IrDeclarationContainer declaration_container = 13;
repeated IrDataIndex super_type = 14; repeated int32 super_type = 14;
} }
message IrTypeAlias { message IrTypeAlias {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex name = 2; required int32 name = 2;
required Visibility visibility = 3; required Visibility visibility = 3;
required IrTypeParameterContainer type_parameters = 4; required IrTypeParameterContainer type_parameters = 4;
required IrDataIndex expanded_type = 5; required int32 expanded_type = 5;
required bool is_actual = 6; required bool is_actual = 6;
} }
message IrEnumEntry { message IrEnumEntry {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
optional IrDataIndex initializer = 2; optional int32 initializer = 2;
optional IrClass corresponding_class = 3; optional IrClass corresponding_class = 3;
required IrDataIndex name = 4; required int32 name = 4;
} }
message IrAnonymousInit { message IrAnonymousInit {
required IrDeclarationBase base = 1; required IrDeclarationBase base = 1;
required IrDataIndex body = 2; required int32 body = 2;
} }
// TODO: we need an extension mechanism to accomodate new // TODO: we need an extension mechanism to accomodate new
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
+11 -11
View File
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind as Prot
import org.jetbrains.kotlin.backend.common.serialization.proto.DescriptorReference as ProtoDescriptorReference import org.jetbrains.kotlin.backend.common.serialization.proto.DescriptorReference as ProtoDescriptorReference
import org.jetbrains.kotlin.backend.common.serialization.proto.IrAnonymousInit as ProtoAnonymousInit import org.jetbrains.kotlin.backend.common.serialization.proto.IrAnonymousInit as ProtoAnonymousInit
import org.jetbrains.kotlin.backend.common.serialization.proto.IrBlock as ProtoBlock import org.jetbrains.kotlin.backend.common.serialization.proto.IrBlock as ProtoBlock
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoBodyIndex //import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoBodyIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrBlockBody as ProtoBlockBody import org.jetbrains.kotlin.backend.common.serialization.proto.IrBlockBody as ProtoBlockBody
import org.jetbrains.kotlin.backend.common.serialization.proto.IrBranch as ProtoBranch import org.jetbrains.kotlin.backend.common.serialization.proto.IrBranch as ProtoBranch
import org.jetbrains.kotlin.backend.common.serialization.proto.IrBreak as ProtoBreak import org.jetbrains.kotlin.backend.common.serialization.proto.IrBreak as ProtoBreak
@@ -93,7 +93,7 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.IrSpreadElement a
import org.jetbrains.kotlin.backend.common.serialization.proto.IrStatement as ProtoStatement import org.jetbrains.kotlin.backend.common.serialization.proto.IrStatement as ProtoStatement
import org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin as ProtoStatementOrigin import org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin as ProtoStatementOrigin
import org.jetbrains.kotlin.backend.common.serialization.proto.IrStringConcat as ProtoStringConcat import org.jetbrains.kotlin.backend.common.serialization.proto.IrStringConcat as ProtoStringConcat
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoSymbolIndex //import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoSymbolIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrSyntheticBody as ProtoSyntheticBody import org.jetbrains.kotlin.backend.common.serialization.proto.IrSyntheticBody as ProtoSyntheticBody
import org.jetbrains.kotlin.backend.common.serialization.proto.IrSyntheticBodyKind as ProtoSyntheticBodyKind import org.jetbrains.kotlin.backend.common.serialization.proto.IrSyntheticBodyKind as ProtoSyntheticBodyKind
import org.jetbrains.kotlin.backend.common.serialization.proto.IrThrow as ProtoThrow import org.jetbrains.kotlin.backend.common.serialization.proto.IrThrow as ProtoThrow
@@ -102,7 +102,7 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.IrType as ProtoTy
import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeAbbreviation as ProtoTypeAbbreviation import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeAbbreviation as ProtoTypeAbbreviation
import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeAlias as ProtoTypeAlias import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeAlias as ProtoTypeAlias
import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeArgument as ProtoTypeArgument import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeArgument as ProtoTypeArgument
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoTypeIndex //import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoTypeIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOp as ProtoTypeOp import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOp as ProtoTypeOp
import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator as ProtoTypeOperator import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator as ProtoTypeOperator
import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter as ProtoTypeParameter import org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameter as ProtoTypeParameter
@@ -116,7 +116,7 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.IrWhile as ProtoW
import org.jetbrains.kotlin.backend.common.serialization.proto.Loop as ProtoLoop import org.jetbrains.kotlin.backend.common.serialization.proto.Loop as ProtoLoop
import org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon as ProtoMemberAccessCommon import org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon as ProtoMemberAccessCommon
import org.jetbrains.kotlin.backend.common.serialization.proto.ModalityKind as ProtoModalityKind import org.jetbrains.kotlin.backend.common.serialization.proto.ModalityKind as ProtoModalityKind
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoStringIndex //import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoStringIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.TypeArguments as ProtoTypeArguments import org.jetbrains.kotlin.backend.common.serialization.proto.TypeArguments as ProtoTypeArguments
import org.jetbrains.kotlin.backend.common.serialization.proto.Visibility as ProtoVisibility import org.jetbrains.kotlin.backend.common.serialization.proto.Visibility as ProtoVisibility
import org.jetbrains.kotlin.backend.common.serialization.proto.FqName as ProtoFqName import org.jetbrains.kotlin.backend.common.serialization.proto.FqName as ProtoFqName
@@ -133,12 +133,12 @@ abstract class IrFileDeserializer(
val symbolTable: SymbolTable val symbolTable: SymbolTable
) { ) {
abstract fun deserializeIrSymbol(proto: ProtoSymbolIndex): IrSymbol abstract fun deserializeIrSymbol(index: Int): IrSymbol
abstract fun deserializeIrType(proto: ProtoTypeIndex): IrType abstract fun deserializeIrType(index: Int): IrType
abstract fun deserializeDescriptorReference(proto: ProtoDescriptorReference): DeclarationDescriptor abstract fun deserializeDescriptorReference(proto: ProtoDescriptorReference): DeclarationDescriptor
abstract fun deserializeString(proto: ProtoStringIndex): String abstract fun deserializeString(index: Int): String
abstract fun deserializeExpressionBody(proto: ProtoBodyIndex): IrExpression abstract fun deserializeExpressionBody(index: Int): IrExpression
abstract fun deserializeStatementBody(proto: ProtoBodyIndex): IrElement abstract fun deserializeStatementBody(index: Int): IrElement
abstract fun deserializeLoopHeader(loopIndex: Int, loopBuilder: () -> IrLoopBase): IrLoopBase abstract fun deserializeLoopHeader(loopIndex: Int, loopBuilder: () -> IrLoopBase): IrLoopBase
private val parentsStack = mutableListOf<IrDeclarationParent>() private val parentsStack = mutableListOf<IrDeclarationParent>()
@@ -149,8 +149,8 @@ abstract class IrFileDeserializer(
} }
} }
private fun deserializeName(proto: ProtoStringIndex): Name { private fun deserializeName(index: Int): Name {
val name = deserializeString(proto) val name = deserializeString(index)
return Name.guessByFirstCharacter(name) return Name.guessByFirstCharacter(name)
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+15 -38
View File
@@ -50,10 +50,6 @@ import org.jetbrains.kotlin.backend.common.serialization.proto.IrConst as ProtoC
import org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructor as ProtoConstructor import org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructor as ProtoConstructor
import org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall as ProtoConstructorCall import org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall as ProtoConstructorCall
import org.jetbrains.kotlin.backend.common.serialization.proto.IrContinue as ProtoContinue import org.jetbrains.kotlin.backend.common.serialization.proto.IrContinue as ProtoContinue
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoBodyIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoStringIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoSymbolIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoTypeIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclaration as ProtoDeclaration import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclaration as ProtoDeclaration
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase as ProtoDeclarationBase import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase as ProtoDeclarationBase
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationContainer as ProtoDeclarationContainer import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationContainer as ProtoDeclarationContainer
@@ -171,18 +167,14 @@ open class IrFileSerializer(
} }
} }
private fun serializeIrExpressionBody(expression: IrExpression): ProtoBodyIndex { private fun serializeIrExpressionBody(expression: IrExpression): Int {
val proto = ProtoBodyIndex.newBuilder()
protoBodyArray.add(XStatementOrExpression.XExpression(serializeExpression(expression))) protoBodyArray.add(XStatementOrExpression.XExpression(serializeExpression(expression)))
proto.index = protoBodyArray.size - 1 return protoBodyArray.size - 1
return proto.build()
} }
private fun serializeIrStatementBody(statement: IrElement): ProtoBodyIndex { private fun serializeIrStatementBody(statement: IrElement): Int {
val proto = ProtoBodyIndex.newBuilder()
protoBodyArray.add(XStatementOrExpression.XStatement(serializeStatement(statement))) protoBodyArray.add(XStatementOrExpression.XStatement(serializeStatement(statement)))
proto.index = protoBodyArray.size - 1 return protoBodyArray.size - 1
return proto.build()
} }
/* ------- Common fields ---------------------------------------------------- */ /* ------- Common fields ---------------------------------------------------- */
@@ -211,16 +203,12 @@ open class IrFileSerializer(
/* ------- Strings ---------------------------------------------------------- */ /* ------- Strings ---------------------------------------------------------- */
fun serializeString(value: String): ProtoStringIndex { private fun serializeString(value: String): Int = protoStringMap.getOrPut(value) {
val proto = ProtoStringIndex.newBuilder() protoStringArray.add(value)
proto.index = protoStringMap.getOrPut(value) { protoStringArray.size - 1
protoStringArray.add(value)
protoStringArray.size - 1
}
return proto.build()
} }
private fun serializeName(name: Name): ProtoStringIndex = serializeString(name.toString()) private fun serializeName(name: Name): Int = serializeString(name.toString())
/* ------- IrSymbols -------------------------------------------------------- */ /* ------- IrSymbols -------------------------------------------------------- */
@@ -283,14 +271,10 @@ open class IrFileSerializer(
return proto.build() return proto.build()
} }
fun serializeIrSymbol(symbol: IrSymbol): ProtoSymbolIndex { fun serializeIrSymbol(symbol: IrSymbol) = protoSymbolMap.getOrPut(symbol) {
val proto = ProtoSymbolIndex.newBuilder() val symbolData = serializeIrSymbolData(symbol)
proto.index = protoSymbolMap.getOrPut(symbol) { protoSymbolArray.add(symbolData)
val symbolData = serializeIrSymbolData(symbol) protoSymbolArray.size - 1
protoSymbolArray.add(symbolData)
protoSymbolArray.size - 1
}
return proto.build()
} }
/* ------- IrTypes ---------------------------------------------------------- */ /* ------- IrTypes ---------------------------------------------------------- */
@@ -445,16 +429,9 @@ open class IrFileSerializer(
type = (this as? IrTypeProjection)?.type?.toIrTypeKey type = (this as? IrTypeProjection)?.type?.toIrTypeKey
) )
private fun serializeIrType(type: IrType): ProtoTypeIndex { private fun serializeIrType(type: IrType) = protoTypeMap.getOrPut(type.toIrTypeKey) {
val proto = ProtoTypeIndex.newBuilder() protoTypeArray.add(serializeIrTypeData(type))
val key = type.toIrTypeKey protoTypeArray.size - 1
proto.index = protoTypeMap.getOrPut(key) {
// println("new type: $type ${(type as? IrSimpleType)?.classifier?.descriptor}${if((type as? IrSimpleType)?.hasQuestionMark ?: false) "?" else ""}")
// println("new key = $key")
protoTypeArray.add(serializeIrTypeData(type))
protoTypeArray.size - 1
}
return proto.build()
} }
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+13 -17
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.backend.common.serialization
import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.LoggingContext
import org.jetbrains.kotlin.backend.common.descriptors.* import org.jetbrains.kotlin.backend.common.descriptors.*
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoBodyIndex
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor
import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElement
@@ -33,21 +32,19 @@ import org.jetbrains.kotlin.ir.util.NaiveSourceBasedFileEntryImpl
import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite.newInstance import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite.newInstance
import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.backend.common.serialization.proto.Annotations as ProtoAnnotations
import org.jetbrains.kotlin.backend.common.serialization.proto.DescriptorReference as ProtoDescriptorReference import org.jetbrains.kotlin.backend.common.serialization.proto.DescriptorReference as ProtoDescriptorReference
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclaration as ProtoDeclaration import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclaration as ProtoDeclaration
import org.jetbrains.kotlin.backend.common.serialization.proto.IrFile as ProtoFile import org.jetbrains.kotlin.backend.common.serialization.proto.IrFile as ProtoFile
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoSymbolIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbolData as ProtoSymbolData import org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbolData as ProtoSymbolData
import org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbolKind as ProtoSymbolKind import org.jetbrains.kotlin.backend.common.serialization.proto.IrSymbolKind as ProtoSymbolKind
import org.jetbrains.kotlin.backend.common.serialization.proto.IrType as ProtoType import org.jetbrains.kotlin.backend.common.serialization.proto.IrType as ProtoType
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoTypeIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoStringIndex
import org.jetbrains.kotlin.backend.common.serialization.proto.IrStatement as ProtoStatement import org.jetbrains.kotlin.backend.common.serialization.proto.IrStatement as ProtoStatement
import org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression as ProtoExpression import org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression as ProtoExpression
import org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall as ProtoConstructorCall
abstract class KotlinIrLinker( abstract class KotlinIrLinker(
val logger: LoggingContext, val logger: LoggingContext,
@@ -345,25 +342,25 @@ abstract class KotlinIrLinker(
isTypeParameter = proto.isTypeParameter isTypeParameter = proto.isTypeParameter
) )
override fun deserializeIrSymbol(proto: ProtoSymbolIndex): IrSymbol { override fun deserializeIrSymbol(index: Int): IrSymbol {
val symbolData = loadSymbolProto(proto.index) val symbolData = loadSymbolProto(index)
return deserializeIrSymbolData(symbolData) return deserializeIrSymbolData(symbolData)
} }
override fun deserializeIrType(proto: ProtoTypeIndex): IrType { override fun deserializeIrType(index: Int): IrType {
val typeData = loadTypeProto(proto.index) val typeData = loadTypeProto(index)
return deserializeIrTypeData(typeData) return deserializeIrTypeData(typeData)
} }
override fun deserializeString(proto: ProtoStringIndex): String = override fun deserializeString(index: Int): String =
loadStringProto(proto.index) loadStringProto(index)
override fun deserializeLoopHeader(loopIndex: Int, loopBuilder: () -> IrLoopBase) = override fun deserializeLoopHeader(loopIndex: Int, loopBuilder: () -> IrLoopBase) =
fileLoops.getOrPut(loopIndex, loopBuilder) fileLoops.getOrPut(loopIndex, loopBuilder)
override fun deserializeExpressionBody(proto: ProtoBodyIndex): IrExpression { override fun deserializeExpressionBody(index: Int): IrExpression {
if (deserializeBodies) { if (deserializeBodies) {
val bodyData = loadExpressionBodyProto(proto.index) val bodyData = loadExpressionBodyProto(index)
return deserializeExpression(bodyData) return deserializeExpression(bodyData)
} else { } else {
val errorType = IrErrorTypeImpl(null, emptyList(), Variance.INVARIANT) val errorType = IrErrorTypeImpl(null, emptyList(), Variance.INVARIANT)
@@ -371,9 +368,9 @@ abstract class KotlinIrLinker(
} }
} }
override fun deserializeStatementBody(proto: ProtoBodyIndex): IrElement { override fun deserializeStatementBody(index: Int): IrElement {
if (deserializeBodies) { if (deserializeBodies) {
val bodyData = loadStatementBodyProto(proto.index) val bodyData = loadStatementBodyProto(index)
return deserializeStatement(bodyData) return deserializeStatement(bodyData)
} else { } else {
val errorType = IrErrorTypeImpl(null, emptyList(), Variance.INVARIANT) val errorType = IrErrorTypeImpl(null, emptyList(), Variance.INVARIANT)
@@ -427,7 +424,7 @@ abstract class KotlinIrLinker(
when { when {
theWholeWorld -> fileProto.declarationIdList theWholeWorld -> fileProto.declarationIdList
explicitlyExported -> fileProto.explicitlyExportedToCompilerList.map { explicitlyExported -> fileProto.explicitlyExportedToCompilerList.map {
fileDeserializer.loadSymbolData(it.index).topLevelUniqId fileDeserializer.loadSymbolData(it).topLevelUniqId
} }
else -> emptyList() else -> emptyList()
} }
@@ -447,7 +444,6 @@ abstract class KotlinIrLinker(
files.add(deserializeIrFile(ProtoFile.parseFrom(readFile(moduleDescriptor, i), newInstance()), i)) files.add(deserializeIrFile(ProtoFile.parseFrom(readFile(moduleDescriptor, i), newInstance()), i))
} }
return IrModuleFragmentImpl(moduleDescriptor, builtIns, files) return IrModuleFragmentImpl(moduleDescriptor, builtIns, files)
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/SerializeDescriptorReference.kt
+1 -2
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.backend.common.serialization package org.jetbrains.kotlin.backend.common.serialization
import org.jetbrains.kotlin.backend.common.serialization.proto.DescriptorReference as ProtoDescriptorReference import org.jetbrains.kotlin.backend.common.serialization.proto.DescriptorReference as ProtoDescriptorReference
import org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex as ProtoString
import org.jetbrains.kotlin.backend.common.serialization.proto.FqName as ProtoFqName import org.jetbrains.kotlin.backend.common.serialization.proto.FqName as ProtoFqName
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
@@ -21,7 +20,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.classId
open class DescriptorReferenceSerializer( open class DescriptorReferenceSerializer(
val declarationTable: DeclarationTable, val declarationTable: DeclarationTable,
val serializeString: (String) -> ProtoString, val serializeString: (String) -> Int,
val serializeFqName: (FqName) -> ProtoFqName val serializeFqName: (FqName) -> ProtoFqName
) { ) {
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/DescriptorReference.java
+22 -82
View File
@@ -79,17 +79,9 @@ public final class DescriptorReference extends
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
name_ = input.readInt32();
break; break;
} }
case 34: { case 34: {
@@ -210,17 +202,17 @@ public final class DescriptorReference extends
} }
public static final int NAME_FIELD_NUMBER = 3; public static final int NAME_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -362,7 +354,7 @@ public final class DescriptorReference extends
private void initFields() { private void initFields() {
packageFqName_ = org.jetbrains.kotlin.backend.common.serialization.proto.FqName.getDefaultInstance(); packageFqName_ = org.jetbrains.kotlin.backend.common.serialization.proto.FqName.getDefaultInstance();
classFqName_ = org.jetbrains.kotlin.backend.common.serialization.proto.FqName.getDefaultInstance(); classFqName_ = org.jetbrains.kotlin.backend.common.serialization.proto.FqName.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
uniqId_ = org.jetbrains.kotlin.backend.common.serialization.proto.UniqId.getDefaultInstance(); uniqId_ = org.jetbrains.kotlin.backend.common.serialization.proto.UniqId.getDefaultInstance();
isGetter_ = false; isGetter_ = false;
isSetter_ = false; isSetter_ = false;
@@ -391,18 +383,6 @@ public final class DescriptorReference extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getPackageFqName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getClassFqName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasUniqId()) { if (hasUniqId()) {
if (!getUniqId().isInitialized()) { if (!getUniqId().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -423,7 +403,7 @@ public final class DescriptorReference extends
output.writeMessage(2, classFqName_); output.writeMessage(2, classFqName_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, name_); output.writeInt32(3, name_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, uniqId_); output.writeMessage(4, uniqId_);
@@ -471,7 +451,7 @@ public final class DescriptorReference extends
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, name_); .computeInt32Size(3, name_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -607,7 +587,7 @@ public final class DescriptorReference extends
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
classFqName_ = org.jetbrains.kotlin.backend.common.serialization.proto.FqName.getDefaultInstance(); classFqName_ = org.jetbrains.kotlin.backend.common.serialization.proto.FqName.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
uniqId_ = org.jetbrains.kotlin.backend.common.serialization.proto.UniqId.getDefaultInstance(); uniqId_ = org.jetbrains.kotlin.backend.common.serialization.proto.UniqId.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -711,7 +691,7 @@ public final class DescriptorReference extends
mergeClassFqName(other.getClassFqName()); mergeClassFqName(other.getClassFqName());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasUniqId()) { if (other.hasUniqId()) {
mergeUniqId(other.getUniqId()); mergeUniqId(other.getUniqId());
@@ -758,18 +738,6 @@ public final class DescriptorReference extends
return false; return false;
} }
if (!getPackageFqName().isInitialized()) {
return false;
}
if (!getClassFqName().isInitialized()) {
return false;
}
if (!getName().isInitialized()) {
return false;
}
if (hasUniqId()) { if (hasUniqId()) {
if (!getUniqId().isInitialized()) { if (!getUniqId().isInitialized()) {
@@ -918,63 +886,35 @@ public final class DescriptorReference extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
name_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/DescriptorReferenceOrBuilder.java
+3 -3
View File
@@ -26,13 +26,13 @@ public interface DescriptorReferenceOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.FqName getClassFqName(); org.jetbrains.kotlin.backend.common.serialization.proto.FqName getClassFqName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.UniqId uniq_id = 4;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.UniqId uniq_id = 4;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FieldAccessCommon.java
+44 -136
View File
@@ -53,30 +53,14 @@ public final class FieldAccessCommon extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = super_.toBuilder();
}
super_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(super_);
super_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
super_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -127,32 +111,32 @@ public final class FieldAccessCommon extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
public static final int SUPER_FIELD_NUMBER = 2; public static final int SUPER_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_; private int super_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
public boolean hasSuper() { public boolean hasSuper() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuper() { public int getSuper() {
return super_; return super_;
} }
@@ -172,8 +156,8 @@ public final class FieldAccessCommon extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); super_ = 0;
receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -186,16 +170,6 @@ public final class FieldAccessCommon extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasSuper()) {
if (!getSuper().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasReceiver()) { if (hasReceiver()) {
if (!getReceiver().isInitialized()) { if (!getReceiver().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -210,10 +184,10 @@ public final class FieldAccessCommon extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, super_); output.writeInt32(2, super_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, receiver_); output.writeMessage(3, receiver_);
@@ -229,11 +203,11 @@ public final class FieldAccessCommon extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, super_); .computeInt32Size(2, super_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -333,9 +307,9 @@ public final class FieldAccessCommon extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); super_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -381,10 +355,10 @@ public final class FieldAccessCommon extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.FieldAccessCommon other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.FieldAccessCommon other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.FieldAccessCommon.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.FieldAccessCommon.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasSuper()) { if (other.hasSuper()) {
mergeSuper(other.getSuper()); setSuper(other.getSuper());
} }
if (other.hasReceiver()) { if (other.hasReceiver()) {
mergeReceiver(other.getReceiver()); mergeReceiver(other.getReceiver());
@@ -399,16 +373,6 @@ public final class FieldAccessCommon extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (hasSuper()) {
if (!getSuper().isInitialized()) {
return false;
}
}
if (hasReceiver()) { if (hasReceiver()) {
if (!getReceiver().isInitialized()) { if (!getReceiver().isInitialized()) {
@@ -437,123 +401,67 @@ public final class FieldAccessCommon extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int super_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
public boolean hasSuper() { public boolean hasSuper() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuper() { public int getSuper() {
return super_; return super_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
public Builder setSuper(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSuper(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
super_ = value; super_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/
public Builder setSuper(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
super_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code>
*/
public Builder mergeSuper(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
super_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
super_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(super_).mergeFrom(value).buildPartial();
} else {
super_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code>
*/ */
public Builder clearSuper() { public Builder clearSuper() {
super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
super_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FieldAccessCommonOrBuilder.java
+6 -6
View File
@@ -8,22 +8,22 @@ public interface FieldAccessCommonOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
boolean hasSuper(); boolean hasSuper();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 2;</code> * <code>optional int32 super = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuper(); int getSuper();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression receiver = 3;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression receiver = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FqName.java
+51 -117
View File
@@ -53,12 +53,25 @@ public final class FqName extends
} }
break; break;
} }
case 10: { case 8: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
segment_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(); segment_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000001; mutable_bitField0_ |= 0x00000001;
} }
segment_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry)); segment_.add(input.readInt32());
break;
}
case 10: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) && input.getBytesUntilLimit() > 0) {
segment_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000001;
}
while (input.getBytesUntilLimit() > 0) {
segment_.add(input.readInt32());
}
input.popLimit(limit);
break; break;
} }
} }
@@ -98,37 +111,24 @@ public final class FqName extends
} }
public static final int SEGMENT_FIELD_NUMBER = 1; public static final int SEGMENT_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> segment_; private java.util.List<java.lang.Integer> segment_;
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getSegmentList() { public java.util.List<java.lang.Integer>
getSegmentList() {
return segment_; return segment_;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/
public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder>
getSegmentOrBuilderList() {
return segment_;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/ */
public int getSegmentCount() { public int getSegmentCount() {
return segment_.size(); return segment_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSegment(int index) { public int getSegment(int index) {
return segment_.get(index);
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder getSegmentOrBuilder(
int index) {
return segment_.get(index); return segment_.get(index);
} }
@@ -141,12 +141,6 @@ public final class FqName extends
if (isInitialized == 1) return true; if (isInitialized == 1) return true;
if (isInitialized == 0) return false; if (isInitialized == 0) return false;
for (int i = 0; i < getSegmentCount(); i++) {
if (!getSegment(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -155,7 +149,7 @@ public final class FqName extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
for (int i = 0; i < segment_.size(); i++) { for (int i = 0; i < segment_.size(); i++) {
output.writeMessage(1, segment_.get(i)); output.writeInt32(1, segment_.get(i));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -166,9 +160,14 @@ public final class FqName extends
if (size != -1) return size; if (size != -1) return size;
size = 0; size = 0;
for (int i = 0; i < segment_.size(); i++) { {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream int dataSize = 0;
.computeMessageSize(1, segment_.get(i)); for (int i = 0; i < segment_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32SizeNoTag(segment_.get(i));
}
size += dataSize;
size += 1 * getSegmentList().size();
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -314,12 +313,6 @@ public final class FqName extends
} }
public final boolean isInitialized() { public final boolean isInitialized() {
for (int i = 0; i < getSegmentCount(); i++) {
if (!getSegment(i).isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -342,128 +335,69 @@ public final class FqName extends
} }
private int bitField0_; private int bitField0_;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> segment_ = private java.util.List<java.lang.Integer> segment_ = java.util.Collections.emptyList();
java.util.Collections.emptyList();
private void ensureSegmentIsMutable() { private void ensureSegmentIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) { if (!((bitField0_ & 0x00000001) == 0x00000001)) {
segment_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(segment_); segment_ = new java.util.ArrayList<java.lang.Integer>(segment_);
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getSegmentList() { public java.util.List<java.lang.Integer>
getSegmentList() {
return java.util.Collections.unmodifiableList(segment_); return java.util.Collections.unmodifiableList(segment_);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public int getSegmentCount() { public int getSegmentCount() {
return segment_.size(); return segment_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSegment(int index) { public int getSegment(int index) {
return segment_.get(index); return segment_.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public Builder setSegment( public Builder setSegment(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { int index, int value) {
if (value == null) {
throw new NullPointerException();
}
ensureSegmentIsMutable(); ensureSegmentIsMutable();
segment_.set(index, value); segment_.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public Builder setSegment( public Builder addSegment(int value) {
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSegmentIsMutable();
segment_.set(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/
public Builder addSegment(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureSegmentIsMutable(); ensureSegmentIsMutable();
segment_.add(value); segment_.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/
public Builder addSegment(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureSegmentIsMutable();
segment_.add(index, value);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/
public Builder addSegment(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSegmentIsMutable();
segment_.add(builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/
public Builder addSegment(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSegmentIsMutable();
segment_.add(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/ */
public Builder addAllSegment( public Builder addAllSegment(
java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureSegmentIsMutable(); ensureSegmentIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, segment_); values, segment_);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
public Builder clearSegment() { public Builder clearSegment() {
segment_ = java.util.Collections.emptyList(); segment_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/
public Builder removeSegment(int index) {
ensureSegmentIsMutable();
segment_.remove(index);
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FqNameOrBuilder.java
+7 -8
View File
@@ -8,16 +8,15 @@ public interface FqNameOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/ */
java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> java.util.List<java.lang.Integer> getSegmentList();
getSegmentList();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code> * <code>repeated int32 segment = 1;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSegment(int index);
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex segment = 1;</code>
*/ */
int getSegmentCount(); int getSegmentCount();
/**
* <code>repeated int32 segment = 1;</code>
*/
int getSegment(int index);
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrAnonymousInit.java
+22 -66
View File
@@ -66,17 +66,9 @@ public final class IrAnonymousInit extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = body_.toBuilder();
}
body_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(body_);
body_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
body_ = input.readInt32();
break; break;
} }
} }
@@ -129,23 +121,23 @@ public final class IrAnonymousInit extends
} }
public static final int BODY_FIELD_NUMBER = 2; public static final int BODY_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body_; private int body_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
public boolean hasBody() { public boolean hasBody() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getBody() { public int getBody() {
return body_; return body_;
} }
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); body_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -165,10 +157,6 @@ public final class IrAnonymousInit extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getBody().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -180,7 +168,7 @@ public final class IrAnonymousInit extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, body_); output.writeInt32(2, body_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -197,7 +185,7 @@ public final class IrAnonymousInit extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, body_); .computeInt32Size(2, body_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -295,7 +283,7 @@ public final class IrAnonymousInit extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); body_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
return this; return this;
} }
@@ -338,7 +326,7 @@ public final class IrAnonymousInit extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasBody()) { if (other.hasBody()) {
mergeBody(other.getBody()); setBody(other.getBody());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -358,10 +346,6 @@ public final class IrAnonymousInit extends
return false; return false;
} }
if (!getBody().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -444,63 +428,35 @@ public final class IrAnonymousInit extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int body_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
public boolean hasBody() { public boolean hasBody() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getBody() { public int getBody() {
return body_; return body_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
public Builder setBody(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setBody(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
body_ = value; body_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/
public Builder setBody(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
body_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code>
*/
public Builder mergeBody(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
body_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
body_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(body_).mergeFrom(value).buildPartial();
} else {
body_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code>
*/ */
public Builder clearBody() { public Builder clearBody() {
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
body_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrAnonymousInitOrBuilder.java
+3 -3
View File
@@ -17,11 +17,11 @@ public interface IrAnonymousInitOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
boolean hasBody(); boolean hasBody();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 2;</code> * <code>required int32 body = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getBody(); int getBody();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrBreak.java
+22 -70
View File
@@ -58,17 +58,9 @@ public final class IrBreak extends
loopId_ = input.readInt32(); loopId_ = input.readInt32();
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = label_.toBuilder();
}
label_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(label_);
label_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
label_ = input.readInt32();
break; break;
} }
} }
@@ -121,23 +113,23 @@ public final class IrBreak extends
} }
public static final int LABEL_FIELD_NUMBER = 2; public static final int LABEL_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label_; private int label_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public boolean hasLabel() { public boolean hasLabel() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel() { public int getLabel() {
return label_; return label_;
} }
private void initFields() { private void initFields() {
loopId_ = 0; loopId_ = 0;
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); label_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -149,12 +141,6 @@ public final class IrBreak extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasLabel()) {
if (!getLabel().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -166,7 +152,7 @@ public final class IrBreak extends
output.writeInt32(1, loopId_); output.writeInt32(1, loopId_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, label_); output.writeInt32(2, label_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -183,7 +169,7 @@ public final class IrBreak extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, label_); .computeInt32Size(2, label_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -281,7 +267,7 @@ public final class IrBreak extends
super.clear(); super.clear();
loopId_ = 0; loopId_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); label_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
return this; return this;
} }
@@ -324,7 +310,7 @@ public final class IrBreak extends
setLoopId(other.getLoopId()); setLoopId(other.getLoopId());
} }
if (other.hasLabel()) { if (other.hasLabel()) {
mergeLabel(other.getLabel()); setLabel(other.getLabel());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -336,12 +322,6 @@ public final class IrBreak extends
return false; return false;
} }
if (hasLabel()) {
if (!getLabel().isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -396,63 +376,35 @@ public final class IrBreak extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int label_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public boolean hasLabel() { public boolean hasLabel() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel() { public int getLabel() {
return label_; return label_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public Builder setLabel(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setLabel(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
label_ = value; label_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/
public Builder setLabel(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
label_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code>
*/
public Builder mergeLabel(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
label_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
label_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(label_).mergeFrom(value).buildPartial();
} else {
label_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code>
*/ */
public Builder clearLabel() { public Builder clearLabel() {
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
label_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrBreakOrBuilder.java
+3 -3
View File
@@ -17,11 +17,11 @@ public interface IrBreakOrBuilder extends
int getLoopId(); int getLoopId();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
boolean hasLabel(); boolean hasLabel();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel(); int getLabel();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrCall.java
+44 -136
View File
@@ -53,17 +53,9 @@ public final class IrCall extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -79,17 +71,9 @@ public final class IrCall extends
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = super_.toBuilder();
}
super_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(super_);
super_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
super_ = input.readInt32();
break; break;
} }
case 34: { case 34: {
@@ -140,17 +124,17 @@ public final class IrCall extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -170,17 +154,17 @@ public final class IrCall extends
} }
public static final int SUPER_FIELD_NUMBER = 3; public static final int SUPER_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_; private int super_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
public boolean hasSuper() { public boolean hasSuper() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuper() { public int getSuper() {
return super_; return super_;
} }
@@ -200,9 +184,9 @@ public final class IrCall extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); super_ = 0;
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -219,20 +203,10 @@ public final class IrCall extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasSuper()) {
if (!getSuper().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -247,13 +221,13 @@ public final class IrCall extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, memberAccess_); output.writeMessage(2, memberAccess_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, super_); output.writeInt32(3, super_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, origin_); output.writeMessage(4, origin_);
@@ -269,7 +243,7 @@ public final class IrCall extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -277,7 +251,7 @@ public final class IrCall extends
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, super_); .computeInt32Size(3, super_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -377,11 +351,11 @@ public final class IrCall extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); super_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -431,13 +405,13 @@ public final class IrCall extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrCall other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrCall other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrCall.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrCall.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasMemberAccess()) { if (other.hasMemberAccess()) {
mergeMemberAccess(other.getMemberAccess()); mergeMemberAccess(other.getMemberAccess());
} }
if (other.hasSuper()) { if (other.hasSuper()) {
mergeSuper(other.getSuper()); setSuper(other.getSuper());
} }
if (other.hasOrigin()) { if (other.hasOrigin()) {
mergeOrigin(other.getOrigin()); mergeOrigin(other.getOrigin());
@@ -456,20 +430,10 @@ public final class IrCall extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
return false; return false;
} }
if (hasSuper()) {
if (!getSuper().isInitialized()) {
return false;
}
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
@@ -498,63 +462,35 @@ public final class IrCall extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
@@ -618,63 +554,35 @@ public final class IrCall extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int super_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
public boolean hasSuper() { public boolean hasSuper() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuper() { public int getSuper() {
return super_; return super_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
public Builder setSuper(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSuper(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
super_ = value; super_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/
public Builder setSuper(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
super_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code>
*/
public Builder mergeSuper(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
super_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
super_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(super_).mergeFrom(value).buildPartial();
} else {
super_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code>
*/ */
public Builder clearSuper() { public Builder clearSuper() {
super_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
super_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrCallOrBuilder.java
+6 -6
View File
@@ -8,13 +8,13 @@ public interface IrCallOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon member_access = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon member_access = 2;</code>
@@ -26,13 +26,13 @@ public interface IrCallOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon getMemberAccess(); org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon getMemberAccess();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
boolean hasSuper(); boolean hasSuper();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super = 3;</code> * <code>optional int32 super = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuper(); int getSuper();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 4;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 4;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrClass.java
+73 -183
View File
@@ -66,17 +66,9 @@ public final class IrClass extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 24: { case 24: {
@@ -180,12 +172,25 @@ public final class IrClass extends
bitField0_ |= 0x00001000; bitField0_ |= 0x00001000;
break; break;
} }
case 114: { case 112: {
if (!((mutable_bitField0_ & 0x00002000) == 0x00002000)) { if (!((mutable_bitField0_ & 0x00002000) == 0x00002000)) {
superType_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(); superType_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00002000; mutable_bitField0_ |= 0x00002000;
} }
superType_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry)); superType_.add(input.readInt32());
break;
}
case 114: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00002000) == 0x00002000) && input.getBytesUntilLimit() > 0) {
superType_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00002000;
}
while (input.getBytesUntilLimit() > 0) {
superType_.add(input.readInt32());
}
input.popLimit(limit);
break; break;
} }
} }
@@ -241,17 +246,17 @@ public final class IrClass extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -429,43 +434,30 @@ public final class IrClass extends
} }
public static final int SUPER_TYPE_FIELD_NUMBER = 14; public static final int SUPER_TYPE_FIELD_NUMBER = 14;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> superType_; private java.util.List<java.lang.Integer> superType_;
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getSuperTypeList() { public java.util.List<java.lang.Integer>
getSuperTypeList() {
return superType_; return superType_;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/
public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder>
getSuperTypeOrBuilderList() {
return superType_;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/ */
public int getSuperTypeCount() { public int getSuperTypeCount() {
return superType_.size(); return superType_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuperType(int index) { public int getSuperType(int index) {
return superType_.get(index);
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder getSuperTypeOrBuilder(
int index) {
return superType_.get(index); return superType_.get(index);
} }
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
kind_ = org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind.CLASS; kind_ = org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind.CLASS;
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
modality_ = org.jetbrains.kotlin.backend.common.serialization.proto.ModalityKind.FINAL_MODALITY; modality_ = org.jetbrains.kotlin.backend.common.serialization.proto.ModalityKind.FINAL_MODALITY;
@@ -537,10 +529,6 @@ public final class IrClass extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -559,12 +547,6 @@ public final class IrClass extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
for (int i = 0; i < getSuperTypeCount(); i++) {
if (!getSuperType(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -576,7 +558,7 @@ public final class IrClass extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeEnum(3, kind_.getNumber()); output.writeEnum(3, kind_.getNumber());
@@ -612,7 +594,7 @@ public final class IrClass extends
output.writeMessage(13, declarationContainer_); output.writeMessage(13, declarationContainer_);
} }
for (int i = 0; i < superType_.size(); i++) { for (int i = 0; i < superType_.size(); i++) {
output.writeMessage(14, superType_.get(i)); output.writeInt32(14, superType_.get(i));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -629,7 +611,7 @@ public final class IrClass extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -675,9 +657,14 @@ public final class IrClass extends
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(13, declarationContainer_); .computeMessageSize(13, declarationContainer_);
} }
for (int i = 0; i < superType_.size(); i++) { {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream int dataSize = 0;
.computeMessageSize(14, superType_.get(i)); for (int i = 0; i < superType_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32SizeNoTag(superType_.get(i));
}
size += dataSize;
size += 1 * getSuperTypeList().size();
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -775,7 +762,7 @@ public final class IrClass extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
kind_ = org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind.CLASS; kind_ = org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind.CLASS;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -891,7 +878,7 @@ public final class IrClass extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasKind()) { if (other.hasKind()) {
setKind(other.getKind()); setKind(other.getKind());
@@ -994,10 +981,6 @@ public final class IrClass extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
return false; return false;
@@ -1016,12 +999,6 @@ public final class IrClass extends
return false; return false;
} }
for (int i = 0; i < getSuperTypeCount(); i++) {
if (!getSuperType(i).isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -1104,63 +1081,35 @@ public final class IrClass extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
@@ -1650,128 +1599,69 @@ public final class IrClass extends
return this; return this;
} }
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> superType_ = private java.util.List<java.lang.Integer> superType_ = java.util.Collections.emptyList();
java.util.Collections.emptyList();
private void ensureSuperTypeIsMutable() { private void ensureSuperTypeIsMutable() {
if (!((bitField0_ & 0x00002000) == 0x00002000)) { if (!((bitField0_ & 0x00002000) == 0x00002000)) {
superType_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(superType_); superType_ = new java.util.ArrayList<java.lang.Integer>(superType_);
bitField0_ |= 0x00002000; bitField0_ |= 0x00002000;
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getSuperTypeList() { public java.util.List<java.lang.Integer>
getSuperTypeList() {
return java.util.Collections.unmodifiableList(superType_); return java.util.Collections.unmodifiableList(superType_);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public int getSuperTypeCount() { public int getSuperTypeCount() {
return superType_.size(); return superType_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuperType(int index) { public int getSuperType(int index) {
return superType_.get(index); return superType_.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public Builder setSuperType( public Builder setSuperType(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { int index, int value) {
if (value == null) {
throw new NullPointerException();
}
ensureSuperTypeIsMutable(); ensureSuperTypeIsMutable();
superType_.set(index, value); superType_.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public Builder setSuperType( public Builder addSuperType(int value) {
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSuperTypeIsMutable();
superType_.set(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/
public Builder addSuperType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureSuperTypeIsMutable(); ensureSuperTypeIsMutable();
superType_.add(value); superType_.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/
public Builder addSuperType(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureSuperTypeIsMutable();
superType_.add(index, value);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/
public Builder addSuperType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSuperTypeIsMutable();
superType_.add(builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/
public Builder addSuperType(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSuperTypeIsMutable();
superType_.add(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/ */
public Builder addAllSuperType( public Builder addAllSuperType(
java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureSuperTypeIsMutable(); ensureSuperTypeIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, superType_); values, superType_);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
public Builder clearSuperType() { public Builder clearSuperType() {
superType_ = java.util.Collections.emptyList(); superType_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00002000); bitField0_ = (bitField0_ & ~0x00002000);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/
public Builder removeSuperType(int index) {
ensureSuperTypeIsMutable();
superType_.remove(index);
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrClassOrBuilder.java
+10 -11
View File
@@ -17,13 +17,13 @@ public interface IrClassOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind kind = 3;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.ClassKind kind = 3;</code>
@@ -133,16 +133,15 @@ public interface IrClassOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationContainer getDeclarationContainer(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationContainer getDeclarationContainer();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/ */
java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> java.util.List<java.lang.Integer> getSuperTypeList();
getSuperTypeList();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code> * <code>repeated int32 super_type = 14;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuperType(int index);
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 14;</code>
*/ */
int getSuperTypeCount(); int getSuperTypeCount();
/**
* <code>repeated int32 super_type = 14;</code>
*/
int getSuperType(int index);
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrClassReference.java
+44 -132
View File
@@ -53,30 +53,14 @@ public final class IrClassReference extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = classSymbol_.toBuilder();
}
classSymbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(classSymbol_);
classSymbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
classSymbol_ = input.readInt32();
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = classType_.toBuilder();
}
classType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(classType_);
classType_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
classType_ = input.readInt32();
break; break;
} }
} }
@@ -114,38 +98,38 @@ public final class IrClassReference extends
private int bitField0_; private int bitField0_;
public static final int CLASS_SYMBOL_FIELD_NUMBER = 1; public static final int CLASS_SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classSymbol_; private int classSymbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
public boolean hasClassSymbol() { public boolean hasClassSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassSymbol() { public int getClassSymbol() {
return classSymbol_; return classSymbol_;
} }
public static final int CLASS_TYPE_FIELD_NUMBER = 2; public static final int CLASS_TYPE_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classType_; private int classType_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
public boolean hasClassType() { public boolean hasClassType() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassType() { public int getClassType() {
return classType_; return classType_;
} }
private void initFields() { private void initFields() {
classSymbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); classSymbol_ = 0;
classType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); classType_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -161,14 +145,6 @@ public final class IrClassReference extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getClassSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getClassType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -177,10 +153,10 @@ public final class IrClassReference extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, classSymbol_); output.writeInt32(1, classSymbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, classType_); output.writeInt32(2, classType_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -193,11 +169,11 @@ public final class IrClassReference extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, classSymbol_); .computeInt32Size(1, classSymbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, classType_); .computeInt32Size(2, classType_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -293,9 +269,9 @@ public final class IrClassReference extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
classSymbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); classSymbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
classType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); classType_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
return this; return this;
} }
@@ -335,10 +311,10 @@ public final class IrClassReference extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrClassReference.getDefaultInstance()) return this;
if (other.hasClassSymbol()) { if (other.hasClassSymbol()) {
mergeClassSymbol(other.getClassSymbol()); setClassSymbol(other.getClassSymbol());
} }
if (other.hasClassType()) { if (other.hasClassType()) {
mergeClassType(other.getClassType()); setClassType(other.getClassType());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -354,14 +330,6 @@ public final class IrClassReference extends
return false; return false;
} }
if (!getClassSymbol().isInitialized()) {
return false;
}
if (!getClassType().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -384,123 +352,67 @@ public final class IrClassReference extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classSymbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int classSymbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
public boolean hasClassSymbol() { public boolean hasClassSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassSymbol() { public int getClassSymbol() {
return classSymbol_; return classSymbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
public Builder setClassSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setClassSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
classSymbol_ = value; classSymbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/
public Builder setClassSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
classSymbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code>
*/
public Builder mergeClassSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
classSymbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
classSymbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(classSymbol_).mergeFrom(value).buildPartial();
} else {
classSymbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code>
*/ */
public Builder clearClassSymbol() { public Builder clearClassSymbol() {
classSymbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
classSymbol_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int classType_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
public boolean hasClassType() { public boolean hasClassType() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassType() { public int getClassType() {
return classType_; return classType_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
public Builder setClassType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setClassType(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
classType_ = value; classType_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/
public Builder setClassType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
classType_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code>
*/
public Builder mergeClassType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
classType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
classType_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(classType_).mergeFrom(value).buildPartial();
} else {
classType_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code>
*/ */
public Builder clearClassType() { public Builder clearClassType() {
classType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
classType_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrClassReferenceOrBuilder.java
+6 -6
View File
@@ -8,20 +8,20 @@ public interface IrClassReferenceOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
boolean hasClassSymbol(); boolean hasClassSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_symbol = 1;</code> * <code>required int32 class_symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassSymbol(); int getClassSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
boolean hasClassType(); boolean hasClassType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex class_type = 2;</code> * <code>required int32 class_type = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassType(); int getClassType();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrConst.java
+22 -68
View File
@@ -98,17 +98,9 @@ public final class IrConst extends
value_ = input.readDouble(); value_ = input.readDouble();
break; break;
} }
case 82: { case 80: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (valueCase_ == 10) {
subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_).toBuilder();
}
value_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_);
value_ = subBuilder.buildPartial();
}
valueCase_ = 10; valueCase_ = 10;
value_ = input.readInt32();
break; break;
} }
} }
@@ -347,19 +339,19 @@ public final class IrConst extends
public static final int STRING_FIELD_NUMBER = 10; public static final int STRING_FIELD_NUMBER = 10;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
public boolean hasString() { public boolean hasString() {
return valueCase_ == 10; return valueCase_ == 10;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getString() { public int getString() {
if (valueCase_ == 10) { if (valueCase_ == 10) {
return (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_; return (java.lang.Integer) value_;
} }
return org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); return 0;
} }
private void initFields() { private void initFields() {
@@ -370,12 +362,6 @@ public final class IrConst extends
if (isInitialized == 1) return true; if (isInitialized == 1) return true;
if (isInitialized == 0) return false; if (isInitialized == 0) return false;
if (hasString()) {
if (!getString().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -420,7 +406,8 @@ public final class IrConst extends
9, (double)((java.lang.Double) value_)); 9, (double)((java.lang.Double) value_));
} }
if (valueCase_ == 10) { if (valueCase_ == 10) {
output.writeMessage(10, (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_); output.writeInt32(
10, (int)((java.lang.Integer) value_));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -478,7 +465,8 @@ public final class IrConst extends
} }
if (valueCase_ == 10) { if (valueCase_ == 10) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(10, (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_); .computeInt32Size(
10, (int)((java.lang.Integer) value_));
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -674,7 +662,7 @@ public final class IrConst extends
break; break;
} }
case STRING: { case STRING: {
mergeString(other.getString()); setString(other.getString());
break; break;
} }
case VALUE_NOT_SET: { case VALUE_NOT_SET: {
@@ -687,12 +675,6 @@ public final class IrConst extends
} }
public final boolean isInitialized() { public final boolean isInitialized() {
if (hasString()) {
if (!getString().isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -1054,59 +1036,31 @@ public final class IrConst extends
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
public boolean hasString() { public boolean hasString() {
return valueCase_ == 10; return valueCase_ == 10;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getString() { public int getString() {
if (valueCase_ == 10) { if (valueCase_ == 10) {
return (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_; return (java.lang.Integer) value_;
} }
return org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); return 0;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
public Builder setString(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setString(int value) {
if (value == null) { valueCase_ = 10;
throw new NullPointerException();
}
value_ = value; value_ = value;
valueCase_ = 10;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/
public Builder setString(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
value_ = builderForValue.build();
valueCase_ = 10;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code>
*/
public Builder mergeString(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (valueCase_ == 10 &&
value_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) value_)
.mergeFrom(value).buildPartial();
} else {
value_ = value;
}
valueCase_ = 10;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code>
*/ */
public Builder clearString() { public Builder clearString() {
if (valueCase_ == 10) { if (valueCase_ == 10) {
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrConstOrBuilder.java
+3 -3
View File
@@ -89,11 +89,11 @@ public interface IrConstOrBuilder extends
double getDouble(); double getDouble();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
boolean hasString(); boolean hasString();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex string = 10;</code> * <code>optional int32 string = 10;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getString(); int getString();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrConstructorCall.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrConstructorCall extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 16: { case 16: {
@@ -119,17 +111,17 @@ public final class IrConstructorCall extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -164,7 +156,7 @@ public final class IrConstructorCall extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
constructorTypeArgumentsCount_ = 0; constructorTypeArgumentsCount_ = 0;
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
} }
@@ -186,10 +178,6 @@ public final class IrConstructorCall extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -202,7 +190,7 @@ public final class IrConstructorCall extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, constructorTypeArgumentsCount_); output.writeInt32(2, constructorTypeArgumentsCount_);
@@ -221,7 +209,7 @@ public final class IrConstructorCall extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -325,7 +313,7 @@ public final class IrConstructorCall extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
constructorTypeArgumentsCount_ = 0; constructorTypeArgumentsCount_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -373,7 +361,7 @@ public final class IrConstructorCall extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrConstructorCall.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasConstructorTypeArgumentsCount()) { if (other.hasConstructorTypeArgumentsCount()) {
setConstructorTypeArgumentsCount(other.getConstructorTypeArgumentsCount()); setConstructorTypeArgumentsCount(other.getConstructorTypeArgumentsCount());
@@ -399,10 +387,6 @@ public final class IrConstructorCall extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
return false; return false;
@@ -429,63 +413,35 @@ public final class IrConstructorCall extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrConstructorCallOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrConstructorCallOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>required int32 constructor_type_arguments_count = 2;</code> * <code>required int32 constructor_type_arguments_count = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrContinue.java
+22 -70
View File
@@ -58,17 +58,9 @@ public final class IrContinue extends
loopId_ = input.readInt32(); loopId_ = input.readInt32();
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = label_.toBuilder();
}
label_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(label_);
label_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
label_ = input.readInt32();
break; break;
} }
} }
@@ -121,23 +113,23 @@ public final class IrContinue extends
} }
public static final int LABEL_FIELD_NUMBER = 2; public static final int LABEL_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label_; private int label_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public boolean hasLabel() { public boolean hasLabel() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel() { public int getLabel() {
return label_; return label_;
} }
private void initFields() { private void initFields() {
loopId_ = 0; loopId_ = 0;
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); label_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -149,12 +141,6 @@ public final class IrContinue extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasLabel()) {
if (!getLabel().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -166,7 +152,7 @@ public final class IrContinue extends
output.writeInt32(1, loopId_); output.writeInt32(1, loopId_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, label_); output.writeInt32(2, label_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -183,7 +169,7 @@ public final class IrContinue extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, label_); .computeInt32Size(2, label_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -281,7 +267,7 @@ public final class IrContinue extends
super.clear(); super.clear();
loopId_ = 0; loopId_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); label_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
return this; return this;
} }
@@ -324,7 +310,7 @@ public final class IrContinue extends
setLoopId(other.getLoopId()); setLoopId(other.getLoopId());
} }
if (other.hasLabel()) { if (other.hasLabel()) {
mergeLabel(other.getLabel()); setLabel(other.getLabel());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -336,12 +322,6 @@ public final class IrContinue extends
return false; return false;
} }
if (hasLabel()) {
if (!getLabel().isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -396,63 +376,35 @@ public final class IrContinue extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int label_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public boolean hasLabel() { public boolean hasLabel() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel() { public int getLabel() {
return label_; return label_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
public Builder setLabel(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setLabel(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
label_ = value; label_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/
public Builder setLabel(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
label_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code>
*/
public Builder mergeLabel(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
label_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
label_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(label_).mergeFrom(value).buildPartial();
} else {
label_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code>
*/ */
public Builder clearLabel() { public Builder clearLabel() {
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
label_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrContinueOrBuilder.java
+3 -3
View File
@@ -17,11 +17,11 @@ public interface IrContinueOrBuilder extends
int getLoopId(); int getLoopId();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
boolean hasLabel(); boolean hasLabel();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 2;</code> * <code>optional int32 label = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel(); int getLabel();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDataIndex.java
-351
View File
@@ -1,351 +0,0 @@
// 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.IrDataIndex}
*/
public final class IrDataIndex extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
// @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex)
IrDataIndexOrBuilder {
// Use IrDataIndex.newBuilder() to construct.
private IrDataIndex(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private IrDataIndex(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final IrDataIndex defaultInstance;
public static IrDataIndex getDefaultInstance() {
return defaultInstance;
}
public IrDataIndex getDefaultInstanceForType() {
return defaultInstance;
}
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private IrDataIndex(
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);
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;
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();
}
}
public static org.jetbrains.kotlin.protobuf.Parser<IrDataIndex> PARSER =
new org.jetbrains.kotlin.protobuf.AbstractParser<IrDataIndex>() {
public IrDataIndex parsePartialFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return new IrDataIndex(input, extensionRegistry);
}
};
@java.lang.Override
public org.jetbrains.kotlin.protobuf.Parser<IrDataIndex> getParserForType() {
return PARSER;
}
private int bitField0_;
public static final int INDEX_FIELD_NUMBER = 1;
private int index_;
/**
* <code>required int32 index = 1;</code>
*/
public boolean hasIndex() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required int32 index = 1;</code>
*/
public int getIndex() {
return index_;
}
private void initFields() {
index_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (!hasIndex()) {
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.writeInt32(1, index_);
}
output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
public int getSerializedSize() {
int size = memoizedSerializedSize;
if (size != -1) return size;
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32Size(1, index_);
}
size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
private static final long serialVersionUID = 0L;
@java.lang.Override
protected java.lang.Object writeReplace()
throws java.io.ObjectStreamException {
return super.writeReplace();
}
public static org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex 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.IrDataIndex 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.IrDataIndex parseFrom(byte[] data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex 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.IrDataIndex parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex 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.IrDataIndex parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
public static org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex 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.IrDataIndex parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex 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 Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
/**
* Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex}
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex, Builder>
implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex)
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder {
// Construct using org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
}
private static Builder create() {
return new Builder();
}
public Builder clear() {
super.clear();
index_ = 0;
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
public Builder clone() {
return create().mergeFrom(buildPartial());
}
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDefaultInstanceForType() {
return org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
}
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex build() {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex buildPartial() {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex result = new org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001;
}
result.index_ = index_;
result.bitField0_ = to_bitField0_;
return result;
}
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) return this;
if (other.hasIndex()) {
setIndex(other.getIndex());
}
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this;
}
public final boolean isInitialized() {
if (!hasIndex()) {
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.IrDataIndex parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
}
}
return this;
}
private int bitField0_;
private int index_ ;
/**
* <code>required int32 index = 1;</code>
*/
public boolean hasIndex() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>required int32 index = 1;</code>
*/
public int getIndex() {
return index_;
}
/**
* <code>required int32 index = 1;</code>
*/
public Builder setIndex(int value) {
bitField0_ |= 0x00000001;
index_ = value;
return this;
}
/**
* <code>required int32 index = 1;</code>
*/
public Builder clearIndex() {
bitField0_ = (bitField0_ & ~0x00000001);
index_ = 0;
return this;
}
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex)
}
static {
defaultInstance = new IrDataIndex(true);
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex)
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDataIndexOrBuilder.java
-18
View File
@@ -1,18 +0,0 @@
// 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 IrDataIndexOrBuilder extends
// @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/**
* <code>required int32 index = 1;</code>
*/
boolean hasIndex();
/**
* <code>required int32 index = 1;</code>
*/
int getIndex();
}
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDeclarationBase.java
+22 -74
View File
@@ -53,17 +53,9 @@ public final class IrDeclarationBase extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -140,17 +132,17 @@ public final class IrDeclarationBase extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -200,7 +192,7 @@ public final class IrDeclarationBase extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationOrigin.getDefaultInstance();
coordinates_ = org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates.getDefaultInstance(); coordinates_ = org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates.getDefaultInstance();
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance(); annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
@@ -227,14 +219,6 @@ public final class IrDeclarationBase extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getOrigin().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getCoordinates().isInitialized()) { if (!getCoordinates().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -251,7 +235,7 @@ public final class IrDeclarationBase extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, origin_); output.writeMessage(2, origin_);
@@ -273,7 +257,7 @@ public final class IrDeclarationBase extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -381,7 +365,7 @@ public final class IrDeclarationBase extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationOrigin.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -435,7 +419,7 @@ public final class IrDeclarationBase extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasOrigin()) { if (other.hasOrigin()) {
mergeOrigin(other.getOrigin()); mergeOrigin(other.getOrigin());
@@ -468,14 +452,6 @@ public final class IrDeclarationBase extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (!getOrigin().isInitialized()) {
return false;
}
if (!getCoordinates().isInitialized()) { if (!getCoordinates().isInitialized()) {
return false; return false;
@@ -506,63 +482,35 @@ public final class IrDeclarationBase extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDeclarationBaseOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrDeclarationBaseOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationOrigin origin = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationOrigin origin = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDeclarationOrigin.java
+22 -68
View File
@@ -65,17 +65,9 @@ public final class IrDeclarationOrigin extends
} }
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (eitherCase_ == 2) {
subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_).toBuilder();
}
either_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_);
either_ = subBuilder.buildPartial();
}
eitherCase_ = 2; eitherCase_ = 2;
either_ = input.readInt32();
break; break;
} }
} }
@@ -162,19 +154,19 @@ public final class IrDeclarationOrigin extends
public static final int CUSTOM_FIELD_NUMBER = 2; public static final int CUSTOM_FIELD_NUMBER = 2;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
public boolean hasCustom() { public boolean hasCustom() {
return eitherCase_ == 2; return eitherCase_ == 2;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getCustom() { public int getCustom() {
if (eitherCase_ == 2) { if (eitherCase_ == 2) {
return (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_; return (java.lang.Integer) either_;
} }
return org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); return 0;
} }
private void initFields() { private void initFields() {
@@ -185,12 +177,6 @@ public final class IrDeclarationOrigin extends
if (isInitialized == 1) return true; if (isInitialized == 1) return true;
if (isInitialized == 0) return false; if (isInitialized == 0) return false;
if (hasCustom()) {
if (!getCustom().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -202,7 +188,8 @@ public final class IrDeclarationOrigin extends
output.writeEnum(1, ((org.jetbrains.kotlin.backend.common.serialization.proto.KnownOrigin) either_).getNumber()); output.writeEnum(1, ((org.jetbrains.kotlin.backend.common.serialization.proto.KnownOrigin) either_).getNumber());
} }
if (eitherCase_ == 2) { if (eitherCase_ == 2) {
output.writeMessage(2, (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_); output.writeInt32(
2, (int)((java.lang.Integer) either_));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -219,7 +206,8 @@ public final class IrDeclarationOrigin extends
} }
if (eitherCase_ == 2) { if (eitherCase_ == 2) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_); .computeInt32Size(
2, (int)((java.lang.Integer) either_));
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -359,7 +347,7 @@ public final class IrDeclarationOrigin extends
break; break;
} }
case CUSTOM: { case CUSTOM: {
mergeCustom(other.getCustom()); setCustom(other.getCustom());
break; break;
} }
case EITHER_NOT_SET: { case EITHER_NOT_SET: {
@@ -372,12 +360,6 @@ public final class IrDeclarationOrigin extends
} }
public final boolean isInitialized() { public final boolean isInitialized() {
if (hasCustom()) {
if (!getCustom().isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -454,59 +436,31 @@ public final class IrDeclarationOrigin extends
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
public boolean hasCustom() { public boolean hasCustom() {
return eitherCase_ == 2; return eitherCase_ == 2;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getCustom() { public int getCustom() {
if (eitherCase_ == 2) { if (eitherCase_ == 2) {
return (org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_; return (java.lang.Integer) either_;
} }
return org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); return 0;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
public Builder setCustom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setCustom(int value) {
if (value == null) { eitherCase_ = 2;
throw new NullPointerException();
}
either_ = value; either_ = value;
eitherCase_ = 2;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/
public Builder setCustom(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
either_ = builderForValue.build();
eitherCase_ = 2;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code>
*/
public Builder mergeCustom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (eitherCase_ == 2 &&
either_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
either_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder((org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex) either_)
.mergeFrom(value).buildPartial();
} else {
either_ = value;
}
eitherCase_ = 2;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code>
*/ */
public Builder clearCustom() { public Builder clearCustom() {
if (eitherCase_ == 2) { if (eitherCase_ == 2) {
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDeclarationOriginOrBuilder.java
+3 -3
View File
@@ -17,11 +17,11 @@ public interface IrDeclarationOriginOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.KnownOrigin getOrigin(); org.jetbrains.kotlin.backend.common.serialization.proto.KnownOrigin getOrigin();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
boolean hasCustom(); boolean hasCustom();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex custom = 2;</code> * <code>optional int32 custom = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getCustom(); int getCustom();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDelegatingConstructorCall.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrDelegatingConstructorCall extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -114,17 +106,17 @@ public final class IrDelegatingConstructorCall extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -144,7 +136,7 @@ public final class IrDelegatingConstructorCall extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -161,10 +153,6 @@ public final class IrDelegatingConstructorCall extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -177,7 +165,7 @@ public final class IrDelegatingConstructorCall extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, memberAccess_); output.writeMessage(2, memberAccess_);
@@ -193,7 +181,7 @@ public final class IrDelegatingConstructorCall extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -293,7 +281,7 @@ public final class IrDelegatingConstructorCall extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -335,7 +323,7 @@ public final class IrDelegatingConstructorCall extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDelegatingConstructorCall.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasMemberAccess()) { if (other.hasMemberAccess()) {
mergeMemberAccess(other.getMemberAccess()); mergeMemberAccess(other.getMemberAccess());
@@ -354,10 +342,6 @@ public final class IrDelegatingConstructorCall extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
return false; return false;
@@ -384,63 +368,35 @@ public final class IrDelegatingConstructorCall extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDelegatingConstructorCallOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrDelegatingConstructorCallOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon member_access = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon member_access = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpression.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrDynamicMemberExpression extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = memberName_.toBuilder();
}
memberName_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(memberName_);
memberName_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
memberName_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -114,17 +106,17 @@ public final class IrDynamicMemberExpression extends
private int bitField0_; private int bitField0_;
public static final int MEMBERNAME_FIELD_NUMBER = 1; public static final int MEMBERNAME_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName_; private int memberName_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
public boolean hasMemberName() { public boolean hasMemberName() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getMemberName() { public int getMemberName() {
return memberName_; return memberName_;
} }
@@ -144,7 +136,7 @@ public final class IrDynamicMemberExpression extends
} }
private void initFields() { private void initFields() {
memberName_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); memberName_ = 0;
receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -161,10 +153,6 @@ public final class IrDynamicMemberExpression extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getMemberName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getReceiver().isInitialized()) { if (!getReceiver().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -177,7 +165,7 @@ public final class IrDynamicMemberExpression extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, memberName_); output.writeInt32(1, memberName_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, receiver_); output.writeMessage(2, receiver_);
@@ -193,7 +181,7 @@ public final class IrDynamicMemberExpression extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, memberName_); .computeInt32Size(1, memberName_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -293,7 +281,7 @@ public final class IrDynamicMemberExpression extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
memberName_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); memberName_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); receiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -335,7 +323,7 @@ public final class IrDynamicMemberExpression extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrDynamicMemberExpression.getDefaultInstance()) return this;
if (other.hasMemberName()) { if (other.hasMemberName()) {
mergeMemberName(other.getMemberName()); setMemberName(other.getMemberName());
} }
if (other.hasReceiver()) { if (other.hasReceiver()) {
mergeReceiver(other.getReceiver()); mergeReceiver(other.getReceiver());
@@ -354,10 +342,6 @@ public final class IrDynamicMemberExpression extends
return false; return false;
} }
if (!getMemberName().isInitialized()) {
return false;
}
if (!getReceiver().isInitialized()) { if (!getReceiver().isInitialized()) {
return false; return false;
@@ -384,63 +368,35 @@ public final class IrDynamicMemberExpression extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int memberName_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
public boolean hasMemberName() { public boolean hasMemberName() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getMemberName() { public int getMemberName() {
return memberName_; return memberName_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
public Builder setMemberName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setMemberName(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
memberName_ = value; memberName_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/
public Builder setMemberName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
memberName_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code>
*/
public Builder mergeMemberName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
memberName_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
memberName_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(memberName_).mergeFrom(value).buildPartial();
} else {
memberName_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code>
*/ */
public Builder clearMemberName() { public Builder clearMemberName() {
memberName_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
memberName_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpressionOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrDynamicMemberExpressionOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
boolean hasMemberName(); boolean hasMemberName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex memberName = 1;</code> * <code>required int32 memberName = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getMemberName(); int getMemberName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression receiver = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression receiver = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrEnumConstructorCall.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrEnumConstructorCall extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -114,17 +106,17 @@ public final class IrEnumConstructorCall extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -144,7 +136,7 @@ public final class IrEnumConstructorCall extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -161,10 +153,6 @@ public final class IrEnumConstructorCall extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -177,7 +165,7 @@ public final class IrEnumConstructorCall extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, memberAccess_); output.writeMessage(2, memberAccess_);
@@ -193,7 +181,7 @@ public final class IrEnumConstructorCall extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -293,7 +281,7 @@ public final class IrEnumConstructorCall extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -335,7 +323,7 @@ public final class IrEnumConstructorCall extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrEnumConstructorCall.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasMemberAccess()) { if (other.hasMemberAccess()) {
mergeMemberAccess(other.getMemberAccess()); mergeMemberAccess(other.getMemberAccess());
@@ -354,10 +342,6 @@ public final class IrEnumConstructorCall extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (!getMemberAccess().isInitialized()) { if (!getMemberAccess().isInitialized()) {
return false; return false;
@@ -384,63 +368,35 @@ public final class IrEnumConstructorCall extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrEnumConstructorCallOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrEnumConstructorCallOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon member_access = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon member_access = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrEnumEntry.java
+44 -136
View File
@@ -66,17 +66,9 @@ public final class IrEnumEntry extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = initializer_.toBuilder();
}
initializer_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(initializer_);
initializer_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
initializer_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -92,17 +84,9 @@ public final class IrEnumEntry extends
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
break; break;
} }
case 34: { case 32: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
name_ = input.readInt32();
break; break;
} }
} }
@@ -155,17 +139,17 @@ public final class IrEnumEntry extends
} }
public static final int INITIALIZER_FIELD_NUMBER = 2; public static final int INITIALIZER_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer_; private int initializer_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public boolean hasInitializer() { public boolean hasInitializer() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getInitializer() { public int getInitializer() {
return initializer_; return initializer_;
} }
@@ -185,25 +169,25 @@ public final class IrEnumEntry extends
} }
public static final int NAME_FIELD_NUMBER = 4; public static final int NAME_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); initializer_ = 0;
correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrClass.getDefaultInstance(); correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrClass.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -223,22 +207,12 @@ public final class IrEnumEntry extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasInitializer()) {
if (!getInitializer().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasCorrespondingClass()) { if (hasCorrespondingClass()) {
if (!getCorrespondingClass().isInitialized()) { if (!getCorrespondingClass().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -250,13 +224,13 @@ public final class IrEnumEntry extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, initializer_); output.writeInt32(2, initializer_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, correspondingClass_); output.writeMessage(3, correspondingClass_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, name_); output.writeInt32(4, name_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -273,7 +247,7 @@ public final class IrEnumEntry extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, initializer_); .computeInt32Size(2, initializer_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -281,7 +255,7 @@ public final class IrEnumEntry extends
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, name_); .computeInt32Size(4, name_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -379,11 +353,11 @@ public final class IrEnumEntry extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); initializer_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrClass.getDefaultInstance(); correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrClass.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
return this; return this;
} }
@@ -434,13 +408,13 @@ public final class IrEnumEntry extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasInitializer()) { if (other.hasInitializer()) {
mergeInitializer(other.getInitializer()); setInitializer(other.getInitializer());
} }
if (other.hasCorrespondingClass()) { if (other.hasCorrespondingClass()) {
mergeCorrespondingClass(other.getCorrespondingClass()); mergeCorrespondingClass(other.getCorrespondingClass());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -460,22 +434,12 @@ public final class IrEnumEntry extends
return false; return false;
} }
if (hasInitializer()) {
if (!getInitializer().isInitialized()) {
return false;
}
}
if (hasCorrespondingClass()) { if (hasCorrespondingClass()) {
if (!getCorrespondingClass().isInitialized()) { if (!getCorrespondingClass().isInitialized()) {
return false; return false;
} }
} }
if (!getName().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -558,63 +522,35 @@ public final class IrEnumEntry extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int initializer_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public boolean hasInitializer() { public boolean hasInitializer() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getInitializer() { public int getInitializer() {
return initializer_; return initializer_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public Builder setInitializer(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setInitializer(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
initializer_ = value; initializer_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/
public Builder setInitializer(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
initializer_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code>
*/
public Builder mergeInitializer(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
initializer_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
initializer_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(initializer_).mergeFrom(value).buildPartial();
} else {
initializer_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code>
*/ */
public Builder clearInitializer() { public Builder clearInitializer() {
initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
initializer_ = 0;
return this; return this;
} }
@@ -678,63 +614,35 @@ public final class IrEnumEntry extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000008;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000008;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000008;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000008) == 0x00000008) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000008;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
name_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrEnumEntryOrBuilder.java
+6 -6
View File
@@ -17,13 +17,13 @@ public interface IrEnumEntryOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
boolean hasInitializer(); boolean hasInitializer();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getInitializer(); int getInitializer();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrClass corresponding_class = 3;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrClass corresponding_class = 3;</code>
@@ -35,11 +35,11 @@ public interface IrEnumEntryOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrClass getCorrespondingClass(); org.jetbrains.kotlin.backend.common.serialization.proto.IrClass getCorrespondingClass();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 4;</code> * <code>required int32 name = 4;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrExpression.java
+22 -66
View File
@@ -66,17 +66,9 @@ public final class IrExpression extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = type_.toBuilder();
}
type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(type_);
type_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
type_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -142,17 +134,17 @@ public final class IrExpression extends
} }
public static final int TYPE_FIELD_NUMBER = 2; public static final int TYPE_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_; private int type_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
@@ -173,7 +165,7 @@ public final class IrExpression extends
private void initFields() { private void initFields() {
operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation.getDefaultInstance(); operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation.getDefaultInstance();
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
coordinates_ = org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates.getDefaultInstance(); coordinates_ = org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -198,10 +190,6 @@ public final class IrExpression extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getCoordinates().isInitialized()) { if (!getCoordinates().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -217,7 +205,7 @@ public final class IrExpression extends
output.writeMessage(1, operation_); output.writeMessage(1, operation_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, type_); output.writeInt32(2, type_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, coordinates_); output.writeMessage(3, coordinates_);
@@ -237,7 +225,7 @@ public final class IrExpression extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, type_); .computeInt32Size(2, type_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -339,7 +327,7 @@ public final class IrExpression extends
super.clear(); super.clear();
operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation.getDefaultInstance(); operation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
coordinates_ = org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates.getDefaultInstance(); coordinates_ = org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -388,7 +376,7 @@ public final class IrExpression extends
mergeOperation(other.getOperation()); mergeOperation(other.getOperation());
} }
if (other.hasType()) { if (other.hasType()) {
mergeType(other.getType()); setType(other.getType());
} }
if (other.hasCoordinates()) { if (other.hasCoordinates()) {
mergeCoordinates(other.getCoordinates()); mergeCoordinates(other.getCoordinates());
@@ -415,10 +403,6 @@ public final class IrExpression extends
return false; return false;
} }
if (!getType().isInitialized()) {
return false;
}
if (!getCoordinates().isInitialized()) { if (!getCoordinates().isInitialized()) {
return false; return false;
@@ -505,63 +489,35 @@ public final class IrExpression extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int type_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public Builder setType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setType(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
type_ = value; type_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/
public Builder setType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
type_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code>
*/
public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
type_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
type_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(type_).mergeFrom(value).buildPartial();
} else {
type_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code>
*/ */
public Builder clearType() { public Builder clearType() {
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
type_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrExpressionOrBuilder.java
+3 -3
View File
@@ -17,13 +17,13 @@ public interface IrExpressionOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation getOperation(); org.jetbrains.kotlin.backend.common.serialization.proto.IrOperation getOperation();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
boolean hasType(); boolean hasType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType(); int getType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates coordinates = 3;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Coordinates coordinates = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrField.java
+66 -202
View File
@@ -66,30 +66,14 @@ public final class IrField extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = initializer_.toBuilder();
}
initializer_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(initializer_);
initializer_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
initializer_ = input.readInt32();
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
name_ = input.readInt32();
break; break;
} }
case 34: { case 34: {
@@ -120,17 +104,9 @@ public final class IrField extends
isStatic_ = input.readBool(); isStatic_ = input.readBool();
break; break;
} }
case 66: { case 64: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000080) == 0x00000080)) {
subBuilder = type_.toBuilder();
}
type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(type_);
type_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000080; bitField0_ |= 0x00000080;
type_ = input.readInt32();
break; break;
} }
} }
@@ -183,32 +159,32 @@ public final class IrField extends
} }
public static final int INITIALIZER_FIELD_NUMBER = 2; public static final int INITIALIZER_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer_; private int initializer_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public boolean hasInitializer() { public boolean hasInitializer() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getInitializer() { public int getInitializer() {
return initializer_; return initializer_;
} }
public static final int NAME_FIELD_NUMBER = 3; public static final int NAME_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -273,29 +249,29 @@ public final class IrField extends
} }
public static final int TYPE_FIELD_NUMBER = 8; public static final int TYPE_FIELD_NUMBER = 8;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_; private int type_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000080) == 0x00000080); return ((bitField0_ & 0x00000080) == 0x00000080);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); initializer_ = 0;
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
isFinal_ = false; isFinal_ = false;
isExternal_ = false; isExternal_ = false;
isStatic_ = false; isStatic_ = false;
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -335,24 +311,10 @@ public final class IrField extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasInitializer()) {
if (!getInitializer().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -364,10 +326,10 @@ public final class IrField extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, initializer_); output.writeInt32(2, initializer_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, name_); output.writeInt32(3, name_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, visibility_); output.writeMessage(4, visibility_);
@@ -382,7 +344,7 @@ public final class IrField extends
output.writeBool(7, isStatic_); output.writeBool(7, isStatic_);
} }
if (((bitField0_ & 0x00000080) == 0x00000080)) { if (((bitField0_ & 0x00000080) == 0x00000080)) {
output.writeMessage(8, type_); output.writeInt32(8, type_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -399,11 +361,11 @@ public final class IrField extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, initializer_); .computeInt32Size(2, initializer_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, name_); .computeInt32Size(3, name_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -423,7 +385,7 @@ public final class IrField extends
} }
if (((bitField0_ & 0x00000080) == 0x00000080)) { if (((bitField0_ & 0x00000080) == 0x00000080)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(8, type_); .computeInt32Size(8, type_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -521,9 +483,9 @@ public final class IrField extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); initializer_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -533,7 +495,7 @@ public final class IrField extends
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
isStatic_ = false; isStatic_ = false;
bitField0_ = (bitField0_ & ~0x00000040); bitField0_ = (bitField0_ & ~0x00000040);
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
return this; return this;
} }
@@ -600,10 +562,10 @@ public final class IrField extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasInitializer()) { if (other.hasInitializer()) {
mergeInitializer(other.getInitializer()); setInitializer(other.getInitializer());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasVisibility()) { if (other.hasVisibility()) {
mergeVisibility(other.getVisibility()); mergeVisibility(other.getVisibility());
@@ -618,7 +580,7 @@ public final class IrField extends
setIsStatic(other.getIsStatic()); setIsStatic(other.getIsStatic());
} }
if (other.hasType()) { if (other.hasType()) {
mergeType(other.getType()); setType(other.getType());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -658,24 +620,10 @@ public final class IrField extends
return false; return false;
} }
if (hasInitializer()) {
if (!getInitializer().isInitialized()) {
return false;
}
}
if (!getName().isInitialized()) {
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
return false; return false;
} }
if (!getType().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -758,123 +706,67 @@ public final class IrField extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int initializer_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public boolean hasInitializer() { public boolean hasInitializer() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getInitializer() { public int getInitializer() {
return initializer_; return initializer_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
public Builder setInitializer(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setInitializer(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
initializer_ = value; initializer_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/
public Builder setInitializer(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
initializer_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code>
*/
public Builder mergeInitializer(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
initializer_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
initializer_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(initializer_).mergeFrom(value).buildPartial();
} else {
initializer_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code>
*/ */
public Builder clearInitializer() { public Builder clearInitializer() {
initializer_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
initializer_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
name_ = 0;
return this; return this;
} }
@@ -1034,63 +926,35 @@ public final class IrField extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int type_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000080) == 0x00000080); return ((bitField0_ & 0x00000080) == 0x00000080);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
public Builder setType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setType(int value) {
if (value == null) { bitField0_ |= 0x00000080;
throw new NullPointerException();
}
type_ = value; type_ = value;
bitField0_ |= 0x00000080;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/
public Builder setType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
type_ = builderForValue.build();
bitField0_ |= 0x00000080;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code>
*/
public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000080) == 0x00000080) &&
type_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
type_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(type_).mergeFrom(value).buildPartial();
} else {
type_ = value;
}
bitField0_ |= 0x00000080;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code>
*/ */
public Builder clearType() { public Builder clearType() {
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
type_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFieldOrBuilder.java
+9 -9
View File
@@ -17,22 +17,22 @@ public interface IrFieldOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
boolean hasInitializer(); boolean hasInitializer();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex initializer = 2;</code> * <code>optional int32 initializer = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getInitializer(); int getInitializer();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 3;</code> * <code>required int32 name = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 4;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 4;</code>
@@ -71,11 +71,11 @@ public interface IrFieldOrBuilder extends
boolean getIsStatic(); boolean getIsStatic();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
boolean hasType(); boolean hasType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 8;</code> * <code>required int32 type = 8;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType(); int getType();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFile.java
+51 -125
View File
@@ -100,12 +100,25 @@ public final class IrFile extends
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
break; break;
} }
case 42: { case 40: {
if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
explicitlyExportedToCompiler_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(); explicitlyExportedToCompiler_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000010; mutable_bitField0_ |= 0x00000010;
} }
explicitlyExportedToCompiler_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry)); explicitlyExportedToCompiler_.add(input.readInt32());
break;
}
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
explicitlyExportedToCompiler_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000010;
}
while (input.getBytesUntilLimit() > 0) {
explicitlyExportedToCompiler_.add(input.readInt32());
}
input.popLimit(limit);
break; break;
} }
} }
@@ -229,37 +242,24 @@ public final class IrFile extends
} }
public static final int EXPLICITLY_EXPORTED_TO_COMPILER_FIELD_NUMBER = 5; public static final int EXPLICITLY_EXPORTED_TO_COMPILER_FIELD_NUMBER = 5;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> explicitlyExportedToCompiler_; private java.util.List<java.lang.Integer> explicitlyExportedToCompiler_;
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getExplicitlyExportedToCompilerList() { public java.util.List<java.lang.Integer>
getExplicitlyExportedToCompilerList() {
return explicitlyExportedToCompiler_; return explicitlyExportedToCompiler_;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/
public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder>
getExplicitlyExportedToCompilerOrBuilderList() {
return explicitlyExportedToCompiler_;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/ */
public int getExplicitlyExportedToCompilerCount() { public int getExplicitlyExportedToCompilerCount() {
return explicitlyExportedToCompiler_.size(); return explicitlyExportedToCompiler_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExplicitlyExportedToCompiler(int index) { public int getExplicitlyExportedToCompiler(int index) {
return explicitlyExportedToCompiler_.get(index);
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder getExplicitlyExportedToCompilerOrBuilder(
int index) {
return explicitlyExportedToCompiler_.get(index); return explicitlyExportedToCompiler_.get(index);
} }
@@ -298,20 +298,10 @@ public final class IrFile extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getFqName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getAnnotations().isInitialized()) { if (!getAnnotations().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
for (int i = 0; i < getExplicitlyExportedToCompilerCount(); i++) {
if (!getExplicitlyExportedToCompiler(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -332,7 +322,7 @@ public final class IrFile extends
output.writeMessage(4, annotations_); output.writeMessage(4, annotations_);
} }
for (int i = 0; i < explicitlyExportedToCompiler_.size(); i++) { for (int i = 0; i < explicitlyExportedToCompiler_.size(); i++) {
output.writeMessage(5, explicitlyExportedToCompiler_.get(i)); output.writeInt32(5, explicitlyExportedToCompiler_.get(i));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -359,9 +349,14 @@ public final class IrFile extends
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, annotations_); .computeMessageSize(4, annotations_);
} }
for (int i = 0; i < explicitlyExportedToCompiler_.size(); i++) { {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream int dataSize = 0;
.computeMessageSize(5, explicitlyExportedToCompiler_.get(i)); for (int i = 0; i < explicitlyExportedToCompiler_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32SizeNoTag(explicitlyExportedToCompiler_.get(i));
}
size += dataSize;
size += 1 * getExplicitlyExportedToCompilerList().size();
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -575,20 +570,10 @@ public final class IrFile extends
return false; return false;
} }
if (!getFqName().isInitialized()) {
return false;
}
if (!getAnnotations().isInitialized()) { if (!getAnnotations().isInitialized()) {
return false; return false;
} }
for (int i = 0; i < getExplicitlyExportedToCompilerCount(); i++) {
if (!getExplicitlyExportedToCompiler(i).isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -916,128 +901,69 @@ public final class IrFile extends
return this; return this;
} }
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> explicitlyExportedToCompiler_ = private java.util.List<java.lang.Integer> explicitlyExportedToCompiler_ = java.util.Collections.emptyList();
java.util.Collections.emptyList();
private void ensureExplicitlyExportedToCompilerIsMutable() { private void ensureExplicitlyExportedToCompilerIsMutable() {
if (!((bitField0_ & 0x00000010) == 0x00000010)) { if (!((bitField0_ & 0x00000010) == 0x00000010)) {
explicitlyExportedToCompiler_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(explicitlyExportedToCompiler_); explicitlyExportedToCompiler_ = new java.util.ArrayList<java.lang.Integer>(explicitlyExportedToCompiler_);
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getExplicitlyExportedToCompilerList() { public java.util.List<java.lang.Integer>
getExplicitlyExportedToCompilerList() {
return java.util.Collections.unmodifiableList(explicitlyExportedToCompiler_); return java.util.Collections.unmodifiableList(explicitlyExportedToCompiler_);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public int getExplicitlyExportedToCompilerCount() { public int getExplicitlyExportedToCompilerCount() {
return explicitlyExportedToCompiler_.size(); return explicitlyExportedToCompiler_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExplicitlyExportedToCompiler(int index) { public int getExplicitlyExportedToCompiler(int index) {
return explicitlyExportedToCompiler_.get(index); return explicitlyExportedToCompiler_.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public Builder setExplicitlyExportedToCompiler( public Builder setExplicitlyExportedToCompiler(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { int index, int value) {
if (value == null) {
throw new NullPointerException();
}
ensureExplicitlyExportedToCompilerIsMutable(); ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.set(index, value); explicitlyExportedToCompiler_.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public Builder setExplicitlyExportedToCompiler( public Builder addExplicitlyExportedToCompiler(int value) {
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.set(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/
public Builder addExplicitlyExportedToCompiler(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureExplicitlyExportedToCompilerIsMutable(); ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.add(value); explicitlyExportedToCompiler_.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/
public Builder addExplicitlyExportedToCompiler(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.add(index, value);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/
public Builder addExplicitlyExportedToCompiler(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.add(builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/
public Builder addExplicitlyExportedToCompiler(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.add(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/ */
public Builder addAllExplicitlyExportedToCompiler( public Builder addAllExplicitlyExportedToCompiler(
java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureExplicitlyExportedToCompilerIsMutable(); ensureExplicitlyExportedToCompilerIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, explicitlyExportedToCompiler_); values, explicitlyExportedToCompiler_);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
public Builder clearExplicitlyExportedToCompiler() { public Builder clearExplicitlyExportedToCompiler() {
explicitlyExportedToCompiler_ = java.util.Collections.emptyList(); explicitlyExportedToCompiler_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/
public Builder removeExplicitlyExportedToCompiler(int index) {
ensureExplicitlyExportedToCompilerIsMutable();
explicitlyExportedToCompiler_.remove(index);
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFileOrBuilder.java
+7 -8
View File
@@ -49,16 +49,15 @@ public interface IrFileOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations(); org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/ */
java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> java.util.List<java.lang.Integer> getExplicitlyExportedToCompilerList();
getExplicitlyExportedToCompilerList();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code> * <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExplicitlyExportedToCompiler(int index);
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex explicitly_exported_to_compiler = 5;</code>
*/ */
int getExplicitlyExportedToCompilerCount(); int getExplicitlyExportedToCompilerCount();
/**
* <code>repeated int32 explicitly_exported_to_compiler = 5;</code>
*/
int getExplicitlyExportedToCompiler(int index);
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunction.java
+51 -145
View File
@@ -88,12 +88,25 @@ public final class IrFunction extends
isSuspend_ = input.readBool(); isSuspend_ = input.readBool();
break; break;
} }
case 42: { case 40: {
if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
overridden_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(); overridden_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000010; mutable_bitField0_ |= 0x00000010;
} }
overridden_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry)); overridden_.add(input.readInt32());
break;
}
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
overridden_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000010;
}
while (input.getBytesUntilLimit() > 0) {
overridden_.add(input.readInt32());
}
input.popLimit(limit);
break; break;
} }
} }
@@ -194,30 +207,20 @@ public final class IrFunction extends
} }
public static final int OVERRIDDEN_FIELD_NUMBER = 5; public static final int OVERRIDDEN_FIELD_NUMBER = 5;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> overridden_; private java.util.List<java.lang.Integer> overridden_;
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getOverriddenList() { public java.util.List<java.lang.Integer>
getOverriddenList() {
return overridden_; return overridden_;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder>
getOverriddenOrBuilderList() {
return overridden_;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
@@ -227,24 +230,13 @@ public final class IrFunction extends
return overridden_.size(); return overridden_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getOverridden(int index) { public int getOverridden(int index) {
return overridden_.get(index);
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder getOverriddenOrBuilder(
int index) {
return overridden_.get(index); return overridden_.get(index);
} }
@@ -281,12 +273,6 @@ public final class IrFunction extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
for (int i = 0; i < getOverriddenCount(); i++) {
if (!getOverridden(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -307,7 +293,7 @@ public final class IrFunction extends
output.writeBool(4, isSuspend_); output.writeBool(4, isSuspend_);
} }
for (int i = 0; i < overridden_.size(); i++) { for (int i = 0; i < overridden_.size(); i++) {
output.writeMessage(5, overridden_.get(i)); output.writeInt32(5, overridden_.get(i));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -334,9 +320,14 @@ public final class IrFunction extends
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeBoolSize(4, isSuspend_); .computeBoolSize(4, isSuspend_);
} }
for (int i = 0; i < overridden_.size(); i++) { {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream int dataSize = 0;
.computeMessageSize(5, overridden_.get(i)); for (int i = 0; i < overridden_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32SizeNoTag(overridden_.get(i));
}
size += dataSize;
size += 1 * getOverriddenList().size();
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -540,12 +531,6 @@ public final class IrFunction extends
return false; return false;
} }
for (int i = 0; i < getOverriddenCount(); i++) {
if (!getOverridden(i).isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -727,27 +712,26 @@ public final class IrFunction extends
return this; return this;
} }
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> overridden_ = private java.util.List<java.lang.Integer> overridden_ = java.util.Collections.emptyList();
java.util.Collections.emptyList();
private void ensureOverriddenIsMutable() { private void ensureOverriddenIsMutable() {
if (!((bitField0_ & 0x00000010) == 0x00000010)) { if (!((bitField0_ & 0x00000010) == 0x00000010)) {
overridden_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(overridden_); overridden_ = new java.util.ArrayList<java.lang.Integer>(overridden_);
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getOverriddenList() { public java.util.List<java.lang.Integer>
getOverriddenList() {
return java.util.Collections.unmodifiableList(overridden_); return java.util.Collections.unmodifiableList(overridden_);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
@@ -757,124 +741,59 @@ public final class IrFunction extends
return overridden_.size(); return overridden_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getOverridden(int index) { public int getOverridden(int index) {
return overridden_.get(index); return overridden_.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public Builder setOverridden( public Builder setOverridden(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { int index, int value) {
if (value == null) {
throw new NullPointerException();
}
ensureOverriddenIsMutable(); ensureOverriddenIsMutable();
overridden_.set(index, value); overridden_.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public Builder setOverridden( public Builder addOverridden(int value) {
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureOverriddenIsMutable();
overridden_.set(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public Builder addOverridden(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureOverriddenIsMutable(); ensureOverriddenIsMutable();
overridden_.add(value); overridden_.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public Builder addOverridden(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureOverriddenIsMutable();
overridden_.add(index, value);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public Builder addOverridden(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureOverriddenIsMutable();
overridden_.add(builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public Builder addOverridden(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureOverriddenIsMutable();
overridden_.add(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
public Builder addAllOverridden( public Builder addAllOverridden(
java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureOverriddenIsMutable(); ensureOverriddenIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, overridden_); values, overridden_);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
@@ -883,20 +802,7 @@ public final class IrFunction extends
public Builder clearOverridden() { public Builder clearOverridden() {
overridden_ = java.util.Collections.emptyList(); overridden_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
public Builder removeOverridden(int index) {
ensureOverriddenIsMutable();
overridden_.remove(index);
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionBase.java
+66 -202
View File
@@ -66,17 +66,9 @@ public final class IrFunctionBase extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -149,30 +141,14 @@ public final class IrFunctionBase extends
valueParameter_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.PARSER, extensionRegistry)); valueParameter_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.PARSER, extensionRegistry));
break; break;
} }
case 82: { case 80: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000100) == 0x00000100)) {
subBuilder = body_.toBuilder();
}
body_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(body_);
body_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000100; bitField0_ |= 0x00000100;
body_ = input.readInt32();
break; break;
} }
case 90: { case 88: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000200) == 0x00000200)) {
subBuilder = returnType_.toBuilder();
}
returnType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(returnType_);
returnType_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000200; bitField0_ |= 0x00000200;
returnType_ = input.readInt32();
break; break;
} }
} }
@@ -228,17 +204,17 @@ public final class IrFunctionBase extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -368,38 +344,38 @@ public final class IrFunctionBase extends
} }
public static final int BODY_FIELD_NUMBER = 10; public static final int BODY_FIELD_NUMBER = 10;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body_; private int body_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
public boolean hasBody() { public boolean hasBody() {
return ((bitField0_ & 0x00000100) == 0x00000100); return ((bitField0_ & 0x00000100) == 0x00000100);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getBody() { public int getBody() {
return body_; return body_;
} }
public static final int RETURN_TYPE_FIELD_NUMBER = 11; public static final int RETURN_TYPE_FIELD_NUMBER = 11;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex returnType_; private int returnType_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
public boolean hasReturnType() { public boolean hasReturnType() {
return ((bitField0_ & 0x00000200) == 0x00000200); return ((bitField0_ & 0x00000200) == 0x00000200);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getReturnType() { public int getReturnType() {
return returnType_; return returnType_;
} }
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
isInline_ = false; isInline_ = false;
isExternal_ = false; isExternal_ = false;
@@ -407,8 +383,8 @@ public final class IrFunctionBase extends
dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.getDefaultInstance(); dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.getDefaultInstance();
extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.getDefaultInstance(); extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrValueParameter.getDefaultInstance();
valueParameter_ = java.util.Collections.emptyList(); valueParameter_ = java.util.Collections.emptyList();
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); body_ = 0;
returnType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); returnType_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -448,10 +424,6 @@ public final class IrFunctionBase extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -478,16 +450,6 @@ public final class IrFunctionBase extends
return false; return false;
} }
} }
if (hasBody()) {
if (!getBody().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (!getReturnType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -499,7 +461,7 @@ public final class IrFunctionBase extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, visibility_); output.writeMessage(3, visibility_);
@@ -523,10 +485,10 @@ public final class IrFunctionBase extends
output.writeMessage(9, valueParameter_.get(i)); output.writeMessage(9, valueParameter_.get(i));
} }
if (((bitField0_ & 0x00000100) == 0x00000100)) { if (((bitField0_ & 0x00000100) == 0x00000100)) {
output.writeMessage(10, body_); output.writeInt32(10, body_);
} }
if (((bitField0_ & 0x00000200) == 0x00000200)) { if (((bitField0_ & 0x00000200) == 0x00000200)) {
output.writeMessage(11, returnType_); output.writeInt32(11, returnType_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -543,7 +505,7 @@ public final class IrFunctionBase extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -575,11 +537,11 @@ public final class IrFunctionBase extends
} }
if (((bitField0_ & 0x00000100) == 0x00000100)) { if (((bitField0_ & 0x00000100) == 0x00000100)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(10, body_); .computeInt32Size(10, body_);
} }
if (((bitField0_ & 0x00000200) == 0x00000200)) { if (((bitField0_ & 0x00000200) == 0x00000200)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(11, returnType_); .computeInt32Size(11, returnType_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -677,7 +639,7 @@ public final class IrFunctionBase extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -693,9 +655,9 @@ public final class IrFunctionBase extends
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
valueParameter_ = java.util.Collections.emptyList(); valueParameter_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000100); bitField0_ = (bitField0_ & ~0x00000100);
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); body_ = 0;
bitField0_ = (bitField0_ & ~0x00000200); bitField0_ = (bitField0_ & ~0x00000200);
returnType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); returnType_ = 0;
bitField0_ = (bitField0_ & ~0x00000400); bitField0_ = (bitField0_ & ~0x00000400);
return this; return this;
} }
@@ -775,7 +737,7 @@ public final class IrFunctionBase extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasVisibility()) { if (other.hasVisibility()) {
mergeVisibility(other.getVisibility()); mergeVisibility(other.getVisibility());
@@ -806,10 +768,10 @@ public final class IrFunctionBase extends
} }
if (other.hasBody()) { if (other.hasBody()) {
mergeBody(other.getBody()); setBody(other.getBody());
} }
if (other.hasReturnType()) { if (other.hasReturnType()) {
mergeReturnType(other.getReturnType()); setReturnType(other.getReturnType());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -849,10 +811,6 @@ public final class IrFunctionBase extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
return false; return false;
@@ -879,16 +837,6 @@ public final class IrFunctionBase extends
return false; return false;
} }
} }
if (hasBody()) {
if (!getBody().isInitialized()) {
return false;
}
}
if (!getReturnType().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -971,63 +919,35 @@ public final class IrFunctionBase extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
@@ -1460,123 +1380,67 @@ public final class IrFunctionBase extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int body_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
public boolean hasBody() { public boolean hasBody() {
return ((bitField0_ & 0x00000200) == 0x00000200); return ((bitField0_ & 0x00000200) == 0x00000200);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getBody() { public int getBody() {
return body_; return body_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
public Builder setBody(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setBody(int value) {
if (value == null) { bitField0_ |= 0x00000200;
throw new NullPointerException();
}
body_ = value; body_ = value;
bitField0_ |= 0x00000200;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/
public Builder setBody(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
body_ = builderForValue.build();
bitField0_ |= 0x00000200;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code>
*/
public Builder mergeBody(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000200) == 0x00000200) &&
body_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
body_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(body_).mergeFrom(value).buildPartial();
} else {
body_ = value;
}
bitField0_ |= 0x00000200;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code>
*/ */
public Builder clearBody() { public Builder clearBody() {
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000200); bitField0_ = (bitField0_ & ~0x00000200);
body_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex returnType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int returnType_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
public boolean hasReturnType() { public boolean hasReturnType() {
return ((bitField0_ & 0x00000400) == 0x00000400); return ((bitField0_ & 0x00000400) == 0x00000400);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getReturnType() { public int getReturnType() {
return returnType_; return returnType_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
public Builder setReturnType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setReturnType(int value) {
if (value == null) { bitField0_ |= 0x00000400;
throw new NullPointerException();
}
returnType_ = value; returnType_ = value;
bitField0_ |= 0x00000400;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/
public Builder setReturnType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
returnType_ = builderForValue.build();
bitField0_ |= 0x00000400;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code>
*/
public Builder mergeReturnType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000400) == 0x00000400) &&
returnType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
returnType_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(returnType_).mergeFrom(value).buildPartial();
} else {
returnType_ = value;
}
bitField0_ |= 0x00000400;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code>
*/ */
public Builder clearReturnType() { public Builder clearReturnType() {
returnType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000400); bitField0_ = (bitField0_ & ~0x00000400);
returnType_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionBaseOrBuilder.java
+9 -9
View File
@@ -17,13 +17,13 @@ public interface IrFunctionBaseOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code>
@@ -94,20 +94,20 @@ public interface IrFunctionBaseOrBuilder extends
int getValueParameterCount(); int getValueParameterCount();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
boolean hasBody(); boolean hasBody();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex body = 10;</code> * <code>optional int32 body = 10;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getBody(); int getBody();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
boolean hasReturnType(); boolean hasReturnType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_type = 11;</code> * <code>required int32 return_type = 11;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getReturnType(); int getReturnType();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionOrBuilder.java
+11 -12
View File
@@ -44,28 +44,27 @@ public interface IrFunctionOrBuilder extends
boolean getIsSuspend(); boolean getIsSuspend();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> java.util.List<java.lang.Integer> getOverriddenList();
getOverriddenList();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code> * <code>repeated int32 overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getOverridden(int index);
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex overridden = 5;</code>
* *
* <pre> * <pre>
*optional UniqId corresponding_property = 7; *optional UniqId corresponding_property = 7;
* </pre> * </pre>
*/ */
int getOverriddenCount(); int getOverriddenCount();
/**
* <code>repeated int32 overridden = 5;</code>
*
* <pre>
*optional UniqId corresponding_property = 7;
* </pre>
*/
int getOverridden(int index);
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReference.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrFunctionReference extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -127,17 +119,17 @@ public final class IrFunctionReference extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -172,7 +164,7 @@ public final class IrFunctionReference extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
} }
@@ -190,10 +182,6 @@ public final class IrFunctionReference extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -212,7 +200,7 @@ public final class IrFunctionReference extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, origin_); output.writeMessage(2, origin_);
@@ -231,7 +219,7 @@ public final class IrFunctionReference extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -335,7 +323,7 @@ public final class IrFunctionReference extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -383,7 +371,7 @@ public final class IrFunctionReference extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrFunctionReference.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasOrigin()) { if (other.hasOrigin()) {
mergeOrigin(other.getOrigin()); mergeOrigin(other.getOrigin());
@@ -405,10 +393,6 @@ public final class IrFunctionReference extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
@@ -441,63 +425,35 @@ public final class IrFunctionReference extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReferenceOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrFunctionReferenceOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 2;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrGetEnumValue.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrGetEnumValue extends
} }
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
} }
@@ -101,22 +93,22 @@ public final class IrGetEnumValue extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 2; public static final int SYMBOL_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -128,10 +120,6 @@ public final class IrGetEnumValue extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -140,7 +128,7 @@ public final class IrGetEnumValue extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(2, symbol_); output.writeInt32(2, symbol_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -153,7 +141,7 @@ public final class IrGetEnumValue extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, symbol_); .computeInt32Size(2, symbol_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -249,7 +237,7 @@ public final class IrGetEnumValue extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this; return this;
} }
@@ -285,7 +273,7 @@ public final class IrGetEnumValue extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrGetEnumValue.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -297,10 +285,6 @@ public final class IrGetEnumValue extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -323,63 +307,35 @@ public final class IrGetEnumValue extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrGetEnumValueOrBuilder.java
+3 -3
View File
@@ -8,11 +8,11 @@ public interface IrGetEnumValueOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 2;</code> * <code>required int32 symbol = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrGetObject.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrGetObject extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
} }
@@ -101,22 +93,22 @@ public final class IrGetObject extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -128,10 +120,6 @@ public final class IrGetObject extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -140,7 +128,7 @@ public final class IrGetObject extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -153,7 +141,7 @@ public final class IrGetObject extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -249,7 +237,7 @@ public final class IrGetObject extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this; return this;
} }
@@ -285,7 +273,7 @@ public final class IrGetObject extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrGetObject.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -297,10 +285,6 @@ public final class IrGetObject extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -323,63 +307,35 @@ public final class IrGetObject extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrGetObjectOrBuilder.java
+3 -3
View File
@@ -8,11 +8,11 @@ public interface IrGetObjectOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrGetValue.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrGetValue extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -114,17 +106,17 @@ public final class IrGetValue extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -144,7 +136,7 @@ public final class IrGetValue extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -157,10 +149,6 @@ public final class IrGetValue extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -175,7 +163,7 @@ public final class IrGetValue extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, origin_); output.writeMessage(2, origin_);
@@ -191,7 +179,7 @@ public final class IrGetValue extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -291,7 +279,7 @@ public final class IrGetValue extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -333,7 +321,7 @@ public final class IrGetValue extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrGetValue.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasOrigin()) { if (other.hasOrigin()) {
mergeOrigin(other.getOrigin()); mergeOrigin(other.getOrigin());
@@ -348,10 +336,6 @@ public final class IrGetValue extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
@@ -380,63 +364,35 @@ public final class IrGetValue extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrGetValueOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrGetValueOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 2;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrInstanceInitializerCall.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrInstanceInitializerCall extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
} }
@@ -101,22 +93,22 @@ public final class IrInstanceInitializerCall extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -128,10 +120,6 @@ public final class IrInstanceInitializerCall extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -140,7 +128,7 @@ public final class IrInstanceInitializerCall extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -153,7 +141,7 @@ public final class IrInstanceInitializerCall extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -249,7 +237,7 @@ public final class IrInstanceInitializerCall extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this; return this;
} }
@@ -285,7 +273,7 @@ public final class IrInstanceInitializerCall extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrInstanceInitializerCall.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -297,10 +285,6 @@ public final class IrInstanceInitializerCall extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -323,63 +307,35 @@ public final class IrInstanceInitializerCall extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrInstanceInitializerCallOrBuilder.java
+3 -3
View File
@@ -8,11 +8,11 @@ public interface IrInstanceInitializerCallOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrLocalDelegatedProperty.java
+44 -132
View File
@@ -66,30 +66,14 @@ public final class IrLocalDelegatedProperty extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = type_.toBuilder();
}
type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(type_);
type_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
type_ = input.readInt32();
break; break;
} }
case 32: { case 32: {
@@ -186,32 +170,32 @@ public final class IrLocalDelegatedProperty extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
public static final int TYPE_FIELD_NUMBER = 3; public static final int TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_; private int type_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
@@ -277,8 +261,8 @@ public final class IrLocalDelegatedProperty extends
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
isVar_ = false; isVar_ = false;
delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrVariable.getDefaultInstance(); delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrVariable.getDefaultInstance();
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrFunction.getDefaultInstance(); getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrFunction.getDefaultInstance();
@@ -314,14 +298,6 @@ public final class IrLocalDelegatedProperty extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getDelegate().isInitialized()) { if (!getDelegate().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -349,10 +325,10 @@ public final class IrLocalDelegatedProperty extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, type_); output.writeInt32(3, type_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeBool(4, isVar_); output.writeBool(4, isVar_);
@@ -381,11 +357,11 @@ public final class IrLocalDelegatedProperty extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, type_); .computeInt32Size(3, type_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -499,9 +475,9 @@ public final class IrLocalDelegatedProperty extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
isVar_ = false; isVar_ = false;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -572,10 +548,10 @@ public final class IrLocalDelegatedProperty extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasType()) { if (other.hasType()) {
mergeType(other.getType()); setType(other.getType());
} }
if (other.hasIsVar()) { if (other.hasIsVar()) {
setIsVar(other.getIsVar()); setIsVar(other.getIsVar());
@@ -619,14 +595,6 @@ public final class IrLocalDelegatedProperty extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getType().isInitialized()) {
return false;
}
if (!getDelegate().isInitialized()) { if (!getDelegate().isInitialized()) {
return false; return false;
@@ -725,123 +693,67 @@ public final class IrLocalDelegatedProperty extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int type_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public Builder setType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setType(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
type_ = value; type_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/
public Builder setType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
type_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code>
*/
public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
type_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
type_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(type_).mergeFrom(value).buildPartial();
} else {
type_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code>
*/ */
public Builder clearType() { public Builder clearType() {
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
type_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrLocalDelegatedPropertyOrBuilder.java
+6 -6
View File
@@ -17,22 +17,22 @@ public interface IrLocalDelegatedPropertyOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
boolean hasType(); boolean hasType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType(); int getType();
/** /**
* <code>required bool is_var = 4;</code> * <code>required bool is_var = 4;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrLocalDelegatedPropertyReference.java
+88 -272
View File
@@ -53,56 +53,24 @@ public final class IrLocalDelegatedPropertyReference extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = delegate_.toBuilder();
}
delegate_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(delegate_);
delegate_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
delegate_ = input.readInt32();
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = getter_.toBuilder();
}
getter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(getter_);
getter_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
getter_ = input.readInt32();
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = setter_.toBuilder();
}
setter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(setter_);
setter_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
setter_ = input.readInt32();
break; break;
} }
case 34: { case 32: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
symbol_ = input.readInt32();
break; break;
} }
case 42: { case 42: {
@@ -153,62 +121,62 @@ public final class IrLocalDelegatedPropertyReference extends
private int bitField0_; private int bitField0_;
public static final int DELEGATE_FIELD_NUMBER = 1; public static final int DELEGATE_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate_; private int delegate_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
public boolean hasDelegate() { public boolean hasDelegate() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDelegate() { public int getDelegate() {
return delegate_; return delegate_;
} }
public static final int GETTER_FIELD_NUMBER = 2; public static final int GETTER_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter_; private int getter_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public boolean hasGetter() { public boolean hasGetter() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getGetter() { public int getGetter() {
return getter_; return getter_;
} }
public static final int SETTER_FIELD_NUMBER = 3; public static final int SETTER_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter_; private int setter_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public boolean hasSetter() { public boolean hasSetter() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSetter() { public int getSetter() {
return setter_; return setter_;
} }
public static final int SYMBOL_FIELD_NUMBER = 4; public static final int SYMBOL_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -228,10 +196,10 @@ public final class IrLocalDelegatedPropertyReference extends
} }
private void initFields() { private void initFields() {
delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); delegate_ = 0;
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); getter_ = 0;
setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); setter_ = 0;
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -248,26 +216,6 @@ public final class IrLocalDelegatedPropertyReference extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getDelegate().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasGetter()) {
if (!getGetter().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasSetter()) {
if (!getSetter().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -282,16 +230,16 @@ public final class IrLocalDelegatedPropertyReference extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, delegate_); output.writeInt32(1, delegate_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, getter_); output.writeInt32(2, getter_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, setter_); output.writeInt32(3, setter_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, symbol_); output.writeInt32(4, symbol_);
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(5, origin_); output.writeMessage(5, origin_);
@@ -307,19 +255,19 @@ public final class IrLocalDelegatedPropertyReference extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, delegate_); .computeInt32Size(1, delegate_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, getter_); .computeInt32Size(2, getter_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, setter_); .computeInt32Size(3, setter_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, symbol_); .computeInt32Size(4, symbol_);
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -419,13 +367,13 @@ public final class IrLocalDelegatedPropertyReference extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); delegate_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); getter_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); setter_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
@@ -479,16 +427,16 @@ public final class IrLocalDelegatedPropertyReference extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrLocalDelegatedPropertyReference.getDefaultInstance()) return this;
if (other.hasDelegate()) { if (other.hasDelegate()) {
mergeDelegate(other.getDelegate()); setDelegate(other.getDelegate());
} }
if (other.hasGetter()) { if (other.hasGetter()) {
mergeGetter(other.getGetter()); setGetter(other.getGetter());
} }
if (other.hasSetter()) { if (other.hasSetter()) {
mergeSetter(other.getSetter()); setSetter(other.getSetter());
} }
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasOrigin()) { if (other.hasOrigin()) {
mergeOrigin(other.getOrigin()); mergeOrigin(other.getOrigin());
@@ -507,26 +455,6 @@ public final class IrLocalDelegatedPropertyReference extends
return false; return false;
} }
if (!getDelegate().isInitialized()) {
return false;
}
if (hasGetter()) {
if (!getGetter().isInitialized()) {
return false;
}
}
if (hasSetter()) {
if (!getSetter().isInitialized()) {
return false;
}
}
if (!getSymbol().isInitialized()) {
return false;
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
@@ -555,243 +483,131 @@ public final class IrLocalDelegatedPropertyReference extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int delegate_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
public boolean hasDelegate() { public boolean hasDelegate() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDelegate() { public int getDelegate() {
return delegate_; return delegate_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
public Builder setDelegate(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setDelegate(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
delegate_ = value; delegate_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/
public Builder setDelegate(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
delegate_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code>
*/
public Builder mergeDelegate(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
delegate_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
delegate_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(delegate_).mergeFrom(value).buildPartial();
} else {
delegate_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code>
*/ */
public Builder clearDelegate() { public Builder clearDelegate() {
delegate_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
delegate_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int getter_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public boolean hasGetter() { public boolean hasGetter() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getGetter() { public int getGetter() {
return getter_; return getter_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public Builder setGetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setGetter(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
getter_ = value; getter_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/
public Builder setGetter(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
getter_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code>
*/
public Builder mergeGetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
getter_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
getter_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(getter_).mergeFrom(value).buildPartial();
} else {
getter_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code>
*/ */
public Builder clearGetter() { public Builder clearGetter() {
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
getter_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int setter_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public boolean hasSetter() { public boolean hasSetter() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSetter() { public int getSetter() {
return setter_; return setter_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public Builder setSetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSetter(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
setter_ = value; setter_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/
public Builder setSetter(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
setter_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code>
*/
public Builder mergeSetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
setter_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
setter_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(setter_).mergeFrom(value).buildPartial();
} else {
setter_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code>
*/ */
public Builder clearSetter() { public Builder clearSetter() {
setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
setter_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000008;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000008;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000008;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000008) == 0x00000008) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000008;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrLocalDelegatedPropertyReferenceOrBuilder.java
+12 -12
View File
@@ -8,40 +8,40 @@ public interface IrLocalDelegatedPropertyReferenceOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
boolean hasDelegate(); boolean hasDelegate();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex delegate = 1;</code> * <code>required int32 delegate = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDelegate(); int getDelegate();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
boolean hasGetter(); boolean hasGetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getGetter(); int getGetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
boolean hasSetter(); boolean hasSetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSetter(); int getSetter();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 4;</code> * <code>required int32 symbol = 4;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 5;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 5;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrOperation.java
-12
View File
@@ -1215,12 +1215,6 @@ public final class IrOperation extends
return false; return false;
} }
} }
if (hasConst()) {
if (!getConst().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasContinue()) { if (hasContinue()) {
if (!getContinue().isInitialized()) { if (!getContinue().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -2036,12 +2030,6 @@ public final class IrOperation extends
return false; return false;
} }
} }
if (hasConst()) {
if (!getConst().isInitialized()) {
return false;
}
}
if (hasContinue()) { if (hasContinue()) {
if (!getContinue().isInitialized()) { if (!getContinue().isInitialized()) {
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrProperty.java
+22 -66
View File
@@ -66,17 +66,9 @@ public final class IrProperty extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -218,17 +210,17 @@ public final class IrProperty extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -384,7 +376,7 @@ public final class IrProperty extends
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
modality_ = org.jetbrains.kotlin.backend.common.serialization.proto.ModalityKind.FINAL_MODALITY; modality_ = org.jetbrains.kotlin.backend.common.serialization.proto.ModalityKind.FINAL_MODALITY;
isVar_ = false; isVar_ = false;
@@ -442,10 +434,6 @@ public final class IrProperty extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -479,7 +467,7 @@ public final class IrProperty extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, visibility_); output.writeMessage(3, visibility_);
@@ -526,7 +514,7 @@ public final class IrProperty extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -664,7 +652,7 @@ public final class IrProperty extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -767,7 +755,7 @@ public final class IrProperty extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasVisibility()) { if (other.hasVisibility()) {
mergeVisibility(other.getVisibility()); mergeVisibility(other.getVisibility());
@@ -845,10 +833,6 @@ public final class IrProperty extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
return false; return false;
@@ -953,63 +937,35 @@ public final class IrProperty extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrPropertyOrBuilder.java
+3 -3
View File
@@ -17,13 +17,13 @@ public interface IrPropertyOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrPropertyReference.java
+88 -276
View File
@@ -53,43 +53,19 @@ public final class IrPropertyReference extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = field_.toBuilder();
}
field_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(field_);
field_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
field_ = input.readInt32();
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = getter_.toBuilder();
}
getter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(getter_);
getter_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
getter_ = input.readInt32();
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = setter_.toBuilder();
}
setter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(setter_);
setter_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
setter_ = input.readInt32();
break; break;
} }
case 34: { case 34: {
@@ -118,17 +94,9 @@ public final class IrPropertyReference extends
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
break; break;
} }
case 50: { case 48: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000020) == 0x00000020)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
symbol_ = input.readInt32();
break; break;
} }
} }
@@ -166,47 +134,47 @@ public final class IrPropertyReference extends
private int bitField0_; private int bitField0_;
public static final int FIELD_FIELD_NUMBER = 1; public static final int FIELD_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field_; private int field_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
public boolean hasField() { public boolean hasField() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getField() { public int getField() {
return field_; return field_;
} }
public static final int GETTER_FIELD_NUMBER = 2; public static final int GETTER_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter_; private int getter_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public boolean hasGetter() { public boolean hasGetter() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getGetter() { public int getGetter() {
return getter_; return getter_;
} }
public static final int SETTER_FIELD_NUMBER = 3; public static final int SETTER_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter_; private int setter_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public boolean hasSetter() { public boolean hasSetter() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSetter() { public int getSetter() {
return setter_; return setter_;
} }
@@ -241,27 +209,27 @@ public final class IrPropertyReference extends
} }
public static final int SYMBOL_FIELD_NUMBER = 6; public static final int SYMBOL_FIELD_NUMBER = 6;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000020) == 0x00000020); return ((bitField0_ & 0x00000020) == 0x00000020);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
private void initFields() { private void initFields() {
field_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); field_ = 0;
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); getter_ = 0;
setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); setter_ = 0;
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -277,24 +245,6 @@ public final class IrPropertyReference extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasField()) {
if (!getField().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasGetter()) {
if (!getGetter().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasSetter()) {
if (!getSetter().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -305,10 +255,6 @@ public final class IrPropertyReference extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -317,13 +263,13 @@ public final class IrPropertyReference extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, field_); output.writeInt32(1, field_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, getter_); output.writeInt32(2, getter_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, setter_); output.writeInt32(3, setter_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, origin_); output.writeMessage(4, origin_);
@@ -332,7 +278,7 @@ public final class IrPropertyReference extends
output.writeMessage(5, memberAccess_); output.writeMessage(5, memberAccess_);
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeMessage(6, symbol_); output.writeInt32(6, symbol_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -345,15 +291,15 @@ public final class IrPropertyReference extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, field_); .computeInt32Size(1, field_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, getter_); .computeInt32Size(2, getter_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, setter_); .computeInt32Size(3, setter_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -365,7 +311,7 @@ public final class IrPropertyReference extends
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(6, symbol_); .computeInt32Size(6, symbol_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -461,17 +407,17 @@ public final class IrPropertyReference extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
field_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); field_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); getter_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); setter_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
return this; return this;
} }
@@ -527,13 +473,13 @@ public final class IrPropertyReference extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrPropertyReference.getDefaultInstance()) return this;
if (other.hasField()) { if (other.hasField()) {
mergeField(other.getField()); setField(other.getField());
} }
if (other.hasGetter()) { if (other.hasGetter()) {
mergeGetter(other.getGetter()); setGetter(other.getGetter());
} }
if (other.hasSetter()) { if (other.hasSetter()) {
mergeSetter(other.getSetter()); setSetter(other.getSetter());
} }
if (other.hasOrigin()) { if (other.hasOrigin()) {
mergeOrigin(other.getOrigin()); mergeOrigin(other.getOrigin());
@@ -542,7 +488,7 @@ public final class IrPropertyReference extends
mergeMemberAccess(other.getMemberAccess()); mergeMemberAccess(other.getMemberAccess());
} }
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -558,24 +504,6 @@ public final class IrPropertyReference extends
return false; return false;
} }
if (hasField()) {
if (!getField().isInitialized()) {
return false;
}
}
if (hasGetter()) {
if (!getGetter().isInitialized()) {
return false;
}
}
if (hasSetter()) {
if (!getSetter().isInitialized()) {
return false;
}
}
if (hasOrigin()) { if (hasOrigin()) {
if (!getOrigin().isInitialized()) { if (!getOrigin().isInitialized()) {
@@ -586,10 +514,6 @@ public final class IrPropertyReference extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -612,183 +536,99 @@ public final class IrPropertyReference extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int field_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
public boolean hasField() { public boolean hasField() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getField() { public int getField() {
return field_; return field_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
public Builder setField(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setField(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
field_ = value; field_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/
public Builder setField(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
field_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code>
*/
public Builder mergeField(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
field_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
field_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(field_).mergeFrom(value).buildPartial();
} else {
field_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code>
*/ */
public Builder clearField() { public Builder clearField() {
field_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
field_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int getter_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public boolean hasGetter() { public boolean hasGetter() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getGetter() { public int getGetter() {
return getter_; return getter_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
public Builder setGetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setGetter(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
getter_ = value; getter_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/
public Builder setGetter(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
getter_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code>
*/
public Builder mergeGetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
getter_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
getter_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(getter_).mergeFrom(value).buildPartial();
} else {
getter_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code>
*/ */
public Builder clearGetter() { public Builder clearGetter() {
getter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
getter_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int setter_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public boolean hasSetter() { public boolean hasSetter() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSetter() { public int getSetter() {
return setter_; return setter_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
public Builder setSetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSetter(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
setter_ = value; setter_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/
public Builder setSetter(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
setter_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code>
*/
public Builder mergeSetter(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
setter_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
setter_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(setter_).mergeFrom(value).buildPartial();
} else {
setter_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code>
*/ */
public Builder clearSetter() { public Builder clearSetter() {
setter_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
setter_ = 0;
return this; return this;
} }
@@ -912,63 +752,35 @@ public final class IrPropertyReference extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000020) == 0x00000020); return ((bitField0_ & 0x00000020) == 0x00000020);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000020;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000020;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000020;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000020) == 0x00000020) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000020;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrPropertyReferenceOrBuilder.java
+12 -12
View File
@@ -8,31 +8,31 @@ public interface IrPropertyReferenceOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
boolean hasField(); boolean hasField();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex field = 1;</code> * <code>optional int32 field = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getField(); int getField();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
boolean hasGetter(); boolean hasGetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getter = 2;</code> * <code>optional int32 getter = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getGetter(); int getGetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
boolean hasSetter(); boolean hasSetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex setter = 3;</code> * <code>optional int32 setter = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSetter(); int getSetter();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 4;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin origin = 4;</code>
@@ -53,11 +53,11 @@ public interface IrPropertyReferenceOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon getMemberAccess(); org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon getMemberAccess();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 6;</code> * <code>required int32 symbol = 6;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturn.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrReturn extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = returnTarget_.toBuilder();
}
returnTarget_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(returnTarget_);
returnTarget_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
returnTarget_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -114,17 +106,17 @@ public final class IrReturn extends
private int bitField0_; private int bitField0_;
public static final int RETURN_TARGET_FIELD_NUMBER = 1; public static final int RETURN_TARGET_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex returnTarget_; private int returnTarget_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
public boolean hasReturnTarget() { public boolean hasReturnTarget() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getReturnTarget() { public int getReturnTarget() {
return returnTarget_; return returnTarget_;
} }
@@ -144,7 +136,7 @@ public final class IrReturn extends
} }
private void initFields() { private void initFields() {
returnTarget_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); returnTarget_ = 0;
value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -161,10 +153,6 @@ public final class IrReturn extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getReturnTarget().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getValue().isInitialized()) { if (!getValue().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -177,7 +165,7 @@ public final class IrReturn extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, returnTarget_); output.writeInt32(1, returnTarget_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, value_); output.writeMessage(2, value_);
@@ -193,7 +181,7 @@ public final class IrReturn extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, returnTarget_); .computeInt32Size(1, returnTarget_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -293,7 +281,7 @@ public final class IrReturn extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
returnTarget_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); returnTarget_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -335,7 +323,7 @@ public final class IrReturn extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrReturn.getDefaultInstance()) return this;
if (other.hasReturnTarget()) { if (other.hasReturnTarget()) {
mergeReturnTarget(other.getReturnTarget()); setReturnTarget(other.getReturnTarget());
} }
if (other.hasValue()) { if (other.hasValue()) {
mergeValue(other.getValue()); mergeValue(other.getValue());
@@ -354,10 +342,6 @@ public final class IrReturn extends
return false; return false;
} }
if (!getReturnTarget().isInitialized()) {
return false;
}
if (!getValue().isInitialized()) { if (!getValue().isInitialized()) {
return false; return false;
@@ -384,63 +368,35 @@ public final class IrReturn extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex returnTarget_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int returnTarget_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
public boolean hasReturnTarget() { public boolean hasReturnTarget() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getReturnTarget() { public int getReturnTarget() {
return returnTarget_; return returnTarget_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
public Builder setReturnTarget(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setReturnTarget(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
returnTarget_ = value; returnTarget_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/
public Builder setReturnTarget(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
returnTarget_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code>
*/
public Builder mergeReturnTarget(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
returnTarget_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
returnTarget_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(returnTarget_).mergeFrom(value).buildPartial();
} else {
returnTarget_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code>
*/ */
public Builder clearReturnTarget() { public Builder clearReturnTarget() {
returnTarget_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
returnTarget_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrReturnOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrReturnOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
boolean hasReturnTarget(); boolean hasReturnTarget();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex return_target = 1;</code> * <code>required int32 return_target = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getReturnTarget(); int getReturnTarget();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrSetVariable.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrSetVariable extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = symbol_.toBuilder();
}
symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(symbol_);
symbol_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
symbol_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -127,17 +119,17 @@ public final class IrSetVariable extends
private int bitField0_; private int bitField0_;
public static final int SYMBOL_FIELD_NUMBER = 1; public static final int SYMBOL_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_; private int symbol_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
@@ -172,7 +164,7 @@ public final class IrSetVariable extends
} }
private void initFields() { private void initFields() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
} }
@@ -190,10 +182,6 @@ public final class IrSetVariable extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getSymbol().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getValue().isInitialized()) { if (!getValue().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -212,7 +200,7 @@ public final class IrSetVariable extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, symbol_); output.writeInt32(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, value_); output.writeMessage(2, value_);
@@ -231,7 +219,7 @@ public final class IrSetVariable extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, symbol_); .computeInt32Size(1, symbol_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -335,7 +323,7 @@ public final class IrSetVariable extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); symbol_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); value_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -383,7 +371,7 @@ public final class IrSetVariable extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrSetVariable other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrSetVariable other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrSetVariable.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrSetVariable.getDefaultInstance()) return this;
if (other.hasSymbol()) { if (other.hasSymbol()) {
mergeSymbol(other.getSymbol()); setSymbol(other.getSymbol());
} }
if (other.hasValue()) { if (other.hasValue()) {
mergeValue(other.getValue()); mergeValue(other.getValue());
@@ -405,10 +393,6 @@ public final class IrSetVariable extends
return false; return false;
} }
if (!getSymbol().isInitialized()) {
return false;
}
if (!getValue().isInitialized()) { if (!getValue().isInitialized()) {
return false; return false;
@@ -441,63 +425,35 @@ public final class IrSetVariable extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int symbol_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public boolean hasSymbol() { public boolean hasSymbol() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol() { public int getSymbol() {
return symbol_; return symbol_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setSymbol(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
symbol_ = value; symbol_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/
public Builder setSymbol(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
symbol_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/
public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
symbol_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
symbol_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(symbol_).mergeFrom(value).buildPartial();
} else {
symbol_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code>
*/ */
public Builder clearSymbol() { public Builder clearSymbol() {
symbol_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
symbol_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrSetVariableOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrSetVariableOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
boolean hasSymbol(); boolean hasSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex symbol = 1;</code> * <code>required int32 symbol = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSymbol(); int getSymbol();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression value = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrSimpleType.java
+22 -66
View File
@@ -66,17 +66,9 @@ public final class IrSimpleType extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = classifier_.toBuilder();
}
classifier_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(classifier_);
classifier_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
classifier_ = input.readInt32();
break; break;
} }
case 24: { case 24: {
@@ -158,17 +150,17 @@ public final class IrSimpleType extends
} }
public static final int CLASSIFIER_FIELD_NUMBER = 2; public static final int CLASSIFIER_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier_; private int classifier_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
public boolean hasClassifier() { public boolean hasClassifier() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassifier() { public int getClassifier() {
return classifier_; return classifier_;
} }
@@ -239,7 +231,7 @@ public final class IrSimpleType extends
private void initFields() { private void initFields() {
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance(); annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
classifier_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); classifier_ = 0;
hasQuestionMark_ = false; hasQuestionMark_ = false;
argument_ = java.util.Collections.emptyList(); argument_ = java.util.Collections.emptyList();
abbreviation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeAbbreviation.getDefaultInstance(); abbreviation_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeAbbreviation.getDefaultInstance();
@@ -266,10 +258,6 @@ public final class IrSimpleType extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getClassifier().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
for (int i = 0; i < getArgumentCount(); i++) { for (int i = 0; i < getArgumentCount(); i++) {
if (!getArgument(i).isInitialized()) { if (!getArgument(i).isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -293,7 +281,7 @@ public final class IrSimpleType extends
output.writeMessage(1, annotations_); output.writeMessage(1, annotations_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, classifier_); output.writeInt32(2, classifier_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBool(3, hasQuestionMark_); output.writeBool(3, hasQuestionMark_);
@@ -319,7 +307,7 @@ public final class IrSimpleType extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, classifier_); .computeInt32Size(2, classifier_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -429,7 +417,7 @@ public final class IrSimpleType extends
super.clear(); super.clear();
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance(); annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
classifier_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); classifier_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
hasQuestionMark_ = false; hasQuestionMark_ = false;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -491,7 +479,7 @@ public final class IrSimpleType extends
mergeAnnotations(other.getAnnotations()); mergeAnnotations(other.getAnnotations());
} }
if (other.hasClassifier()) { if (other.hasClassifier()) {
mergeClassifier(other.getClassifier()); setClassifier(other.getClassifier());
} }
if (other.hasHasQuestionMark()) { if (other.hasHasQuestionMark()) {
setHasQuestionMark(other.getHasQuestionMark()); setHasQuestionMark(other.getHasQuestionMark());
@@ -531,10 +519,6 @@ public final class IrSimpleType extends
return false; return false;
} }
if (!getClassifier().isInitialized()) {
return false;
}
for (int i = 0; i < getArgumentCount(); i++) { for (int i = 0; i < getArgumentCount(); i++) {
if (!getArgument(i).isInitialized()) { if (!getArgument(i).isInitialized()) {
@@ -629,63 +613,35 @@ public final class IrSimpleType extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int classifier_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
public boolean hasClassifier() { public boolean hasClassifier() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassifier() { public int getClassifier() {
return classifier_; return classifier_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
public Builder setClassifier(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setClassifier(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
classifier_ = value; classifier_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/
public Builder setClassifier(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
classifier_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code>
*/
public Builder mergeClassifier(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
classifier_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
classifier_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(classifier_).mergeFrom(value).buildPartial();
} else {
classifier_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code>
*/ */
public Builder clearClassifier() { public Builder clearClassifier() {
classifier_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
classifier_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrSimpleTypeOrBuilder.java
+3 -3
View File
@@ -17,13 +17,13 @@ public interface IrSimpleTypeOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations(); org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
boolean hasClassifier(); boolean hasClassifier();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex classifier = 2;</code> * <code>required int32 classifier = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getClassifier(); int getClassifier();
/** /**
* <code>required bool has_question_mark = 3;</code> * <code>required bool has_question_mark = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrStatementOrigin.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrStatementOrigin extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
name_ = input.readInt32();
break; break;
} }
} }
@@ -101,22 +93,22 @@ public final class IrStatementOrigin extends
private int bitField0_; private int bitField0_;
public static final int NAME_FIELD_NUMBER = 1; public static final int NAME_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
private void initFields() { private void initFields() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -128,10 +120,6 @@ public final class IrStatementOrigin extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -140,7 +128,7 @@ public final class IrStatementOrigin extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, name_); output.writeInt32(1, name_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -153,7 +141,7 @@ public final class IrStatementOrigin extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, name_); .computeInt32Size(1, name_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -249,7 +237,7 @@ public final class IrStatementOrigin extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this; return this;
} }
@@ -285,7 +273,7 @@ public final class IrStatementOrigin extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance()) return this;
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -297,10 +285,6 @@ public final class IrStatementOrigin extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -323,63 +307,35 @@ public final class IrStatementOrigin extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrStatementOriginOrBuilder.java
+3 -3
View File
@@ -8,11 +8,11 @@ public interface IrStatementOriginOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 1;</code> * <code>required int32 name = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrSymbolData.java
-12
View File
@@ -259,12 +259,6 @@ public final class IrSymbolData extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasFqname()) {
if (!getFqname().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasDescriptorReference()) { if (hasDescriptorReference()) {
if (!getDescriptorReference().isInitialized()) { if (!getDescriptorReference().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -516,12 +510,6 @@ public final class IrSymbolData extends
return false; return false;
} }
if (hasFqname()) {
if (!getFqname().isInitialized()) {
return false;
}
}
if (hasDescriptorReference()) { if (hasDescriptorReference()) {
if (!getDescriptorReference().isInitialized()) { if (!getDescriptorReference().isInitialized()) {
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAbbreviation.java
+22 -66
View File
@@ -66,17 +66,9 @@ public final class IrTypeAbbreviation extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = typeAlias_.toBuilder();
}
typeAlias_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(typeAlias_);
typeAlias_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
typeAlias_ = input.readInt32();
break; break;
} }
case 24: { case 24: {
@@ -145,17 +137,17 @@ public final class IrTypeAbbreviation extends
} }
public static final int TYPE_ALIAS_FIELD_NUMBER = 2; public static final int TYPE_ALIAS_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex typeAlias_; private int typeAlias_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
public boolean hasTypeAlias() { public boolean hasTypeAlias() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeAlias() { public int getTypeAlias() {
return typeAlias_; return typeAlias_;
} }
@@ -211,7 +203,7 @@ public final class IrTypeAbbreviation extends
private void initFields() { private void initFields() {
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance(); annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); typeAlias_ = 0;
hasQuestionMark_ = false; hasQuestionMark_ = false;
argument_ = java.util.Collections.emptyList(); argument_ = java.util.Collections.emptyList();
} }
@@ -237,10 +229,6 @@ public final class IrTypeAbbreviation extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getTypeAlias().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
for (int i = 0; i < getArgumentCount(); i++) { for (int i = 0; i < getArgumentCount(); i++) {
if (!getArgument(i).isInitialized()) { if (!getArgument(i).isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -258,7 +246,7 @@ public final class IrTypeAbbreviation extends
output.writeMessage(1, annotations_); output.writeMessage(1, annotations_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, typeAlias_); output.writeInt32(2, typeAlias_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeBool(3, hasQuestionMark_); output.writeBool(3, hasQuestionMark_);
@@ -281,7 +269,7 @@ public final class IrTypeAbbreviation extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, typeAlias_); .computeInt32Size(2, typeAlias_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -387,7 +375,7 @@ public final class IrTypeAbbreviation extends
super.clear(); super.clear();
annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance(); annotations_ = org.jetbrains.kotlin.backend.common.serialization.proto.Annotations.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); typeAlias_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
hasQuestionMark_ = false; hasQuestionMark_ = false;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -443,7 +431,7 @@ public final class IrTypeAbbreviation extends
mergeAnnotations(other.getAnnotations()); mergeAnnotations(other.getAnnotations());
} }
if (other.hasTypeAlias()) { if (other.hasTypeAlias()) {
mergeTypeAlias(other.getTypeAlias()); setTypeAlias(other.getTypeAlias());
} }
if (other.hasHasQuestionMark()) { if (other.hasHasQuestionMark()) {
setHasQuestionMark(other.getHasQuestionMark()); setHasQuestionMark(other.getHasQuestionMark());
@@ -480,10 +468,6 @@ public final class IrTypeAbbreviation extends
return false; return false;
} }
if (!getTypeAlias().isInitialized()) {
return false;
}
for (int i = 0; i < getArgumentCount(); i++) { for (int i = 0; i < getArgumentCount(); i++) {
if (!getArgument(i).isInitialized()) { if (!getArgument(i).isInitialized()) {
@@ -572,63 +556,35 @@ public final class IrTypeAbbreviation extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int typeAlias_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
public boolean hasTypeAlias() { public boolean hasTypeAlias() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeAlias() { public int getTypeAlias() {
return typeAlias_; return typeAlias_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
public Builder setTypeAlias(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setTypeAlias(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
typeAlias_ = value; typeAlias_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/
public Builder setTypeAlias(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
typeAlias_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/
public Builder mergeTypeAlias(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
typeAlias_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
typeAlias_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(typeAlias_).mergeFrom(value).buildPartial();
} else {
typeAlias_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code>
*/ */
public Builder clearTypeAlias() { public Builder clearTypeAlias() {
typeAlias_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
typeAlias_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAbbreviationOrBuilder.java
+3 -3
View File
@@ -17,13 +17,13 @@ public interface IrTypeAbbreviationOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations(); org.jetbrains.kotlin.backend.common.serialization.proto.Annotations getAnnotations();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
boolean hasTypeAlias(); boolean hasTypeAlias();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_alias = 2;</code> * <code>required int32 type_alias = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeAlias(); int getTypeAlias();
/** /**
* <code>required bool has_question_mark = 3;</code> * <code>required bool has_question_mark = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAlias.java
+44 -132
View File
@@ -66,17 +66,9 @@ public final class IrTypeAlias extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -105,17 +97,9 @@ public final class IrTypeAlias extends
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
break; break;
} }
case 42: { case 40: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = expandedType_.toBuilder();
}
expandedType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(expandedType_);
expandedType_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
expandedType_ = input.readInt32();
break; break;
} }
case 48: { case 48: {
@@ -173,17 +157,17 @@ public final class IrTypeAlias extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -218,17 +202,17 @@ public final class IrTypeAlias extends
} }
public static final int EXPANDED_TYPE_FIELD_NUMBER = 5; public static final int EXPANDED_TYPE_FIELD_NUMBER = 5;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expandedType_; private int expandedType_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
public boolean hasExpandedType() { public boolean hasExpandedType() {
return ((bitField0_ & 0x00000010) == 0x00000010); return ((bitField0_ & 0x00000010) == 0x00000010);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExpandedType() { public int getExpandedType() {
return expandedType_; return expandedType_;
} }
@@ -249,10 +233,10 @@ public final class IrTypeAlias extends
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer.getDefaultInstance(); typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer.getDefaultInstance();
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); expandedType_ = 0;
isActual_ = false; isActual_ = false;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -289,10 +273,6 @@ public final class IrTypeAlias extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -301,10 +281,6 @@ public final class IrTypeAlias extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getExpandedType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -316,7 +292,7 @@ public final class IrTypeAlias extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, visibility_); output.writeMessage(3, visibility_);
@@ -325,7 +301,7 @@ public final class IrTypeAlias extends
output.writeMessage(4, typeParameters_); output.writeMessage(4, typeParameters_);
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(5, expandedType_); output.writeInt32(5, expandedType_);
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeBool(6, isActual_); output.writeBool(6, isActual_);
@@ -345,7 +321,7 @@ public final class IrTypeAlias extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -357,7 +333,7 @@ public final class IrTypeAlias extends
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(5, expandedType_); .computeInt32Size(5, expandedType_);
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -459,13 +435,13 @@ public final class IrTypeAlias extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.proto.Visibility.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer.getDefaultInstance(); typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); expandedType_ = 0;
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
isActual_ = false; isActual_ = false;
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
@@ -526,7 +502,7 @@ public final class IrTypeAlias extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasVisibility()) { if (other.hasVisibility()) {
mergeVisibility(other.getVisibility()); mergeVisibility(other.getVisibility());
@@ -535,7 +511,7 @@ public final class IrTypeAlias extends
mergeTypeParameters(other.getTypeParameters()); mergeTypeParameters(other.getTypeParameters());
} }
if (other.hasExpandedType()) { if (other.hasExpandedType()) {
mergeExpandedType(other.getExpandedType()); setExpandedType(other.getExpandedType());
} }
if (other.hasIsActual()) { if (other.hasIsActual()) {
setIsActual(other.getIsActual()); setIsActual(other.getIsActual());
@@ -574,10 +550,6 @@ public final class IrTypeAlias extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getVisibility().isInitialized()) { if (!getVisibility().isInitialized()) {
return false; return false;
@@ -586,10 +558,6 @@ public final class IrTypeAlias extends
return false; return false;
} }
if (!getExpandedType().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -672,63 +640,35 @@ public final class IrTypeAlias extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
@@ -852,63 +792,35 @@ public final class IrTypeAlias extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int expandedType_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
public boolean hasExpandedType() { public boolean hasExpandedType() {
return ((bitField0_ & 0x00000010) == 0x00000010); return ((bitField0_ & 0x00000010) == 0x00000010);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExpandedType() { public int getExpandedType() {
return expandedType_; return expandedType_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
public Builder setExpandedType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setExpandedType(int value) {
if (value == null) { bitField0_ |= 0x00000010;
throw new NullPointerException();
}
expandedType_ = value; expandedType_ = value;
bitField0_ |= 0x00000010;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/
public Builder setExpandedType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
expandedType_ = builderForValue.build();
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/
public Builder mergeExpandedType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
expandedType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
expandedType_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(expandedType_).mergeFrom(value).buildPartial();
} else {
expandedType_ = value;
}
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code>
*/ */
public Builder clearExpandedType() { public Builder clearExpandedType() {
expandedType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
expandedType_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeAliasOrBuilder.java
+6 -6
View File
@@ -17,13 +17,13 @@ public interface IrTypeAliasOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.Visibility visibility = 3;</code>
@@ -44,13 +44,13 @@ public interface IrTypeAliasOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer getTypeParameters(); org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeParameterContainer getTypeParameters();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
boolean hasExpandedType(); boolean hasExpandedType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex expanded_type = 5;</code> * <code>required int32 expanded_type = 5;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getExpandedType(); int getExpandedType();
/** /**
* <code>required bool is_actual = 6;</code> * <code>required bool is_actual = 6;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeOp.java
+22 -66
View File
@@ -65,17 +65,9 @@ public final class IrTypeOp extends
} }
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = operand_.toBuilder();
}
operand_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(operand_);
operand_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
operand_ = input.readInt32();
break; break;
} }
case 26: { case 26: {
@@ -141,17 +133,17 @@ public final class IrTypeOp extends
} }
public static final int OPERAND_FIELD_NUMBER = 2; public static final int OPERAND_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand_; private int operand_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
public boolean hasOperand() { public boolean hasOperand() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getOperand() { public int getOperand() {
return operand_; return operand_;
} }
@@ -172,7 +164,7 @@ public final class IrTypeOp extends
private void initFields() { private void initFields() {
operator_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator.CAST; operator_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator.CAST;
operand_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); operand_ = 0;
argument_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); argument_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -193,10 +185,6 @@ public final class IrTypeOp extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getOperand().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getArgument().isInitialized()) { if (!getArgument().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
@@ -212,7 +200,7 @@ public final class IrTypeOp extends
output.writeEnum(1, operator_.getNumber()); output.writeEnum(1, operator_.getNumber());
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, operand_); output.writeInt32(2, operand_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, argument_); output.writeMessage(3, argument_);
@@ -232,7 +220,7 @@ public final class IrTypeOp extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, operand_); .computeInt32Size(2, operand_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -334,7 +322,7 @@ public final class IrTypeOp extends
super.clear(); super.clear();
operator_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator.CAST; operator_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator.CAST;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
operand_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); operand_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
argument_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); argument_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -383,7 +371,7 @@ public final class IrTypeOp extends
setOperator(other.getOperator()); setOperator(other.getOperator());
} }
if (other.hasOperand()) { if (other.hasOperand()) {
mergeOperand(other.getOperand()); setOperand(other.getOperand());
} }
if (other.hasArgument()) { if (other.hasArgument()) {
mergeArgument(other.getArgument()); mergeArgument(other.getArgument());
@@ -406,10 +394,6 @@ public final class IrTypeOp extends
return false; return false;
} }
if (!getOperand().isInitialized()) {
return false;
}
if (!getArgument().isInitialized()) { if (!getArgument().isInitialized()) {
return false; return false;
@@ -471,63 +455,35 @@ public final class IrTypeOp extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int operand_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
public boolean hasOperand() { public boolean hasOperand() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getOperand() { public int getOperand() {
return operand_; return operand_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
public Builder setOperand(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setOperand(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
operand_ = value; operand_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/
public Builder setOperand(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
operand_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code>
*/
public Builder mergeOperand(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
operand_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
operand_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(operand_).mergeFrom(value).buildPartial();
} else {
operand_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code>
*/ */
public Builder clearOperand() { public Builder clearOperand() {
operand_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
operand_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeOpOrBuilder.java
+3 -3
View File
@@ -17,13 +17,13 @@ public interface IrTypeOpOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator getOperator(); org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeOperator getOperator();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
boolean hasOperand(); boolean hasOperand();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex operand = 2;</code> * <code>required int32 operand = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getOperand(); int getOperand();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression argument = 3;</code> * <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression argument = 3;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameter.java
+73 -183
View File
@@ -66,17 +66,9 @@ public final class IrTypeParameter extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 24: { case 24: {
@@ -96,12 +88,25 @@ public final class IrTypeParameter extends
} }
break; break;
} }
case 42: { case 40: {
if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
superType_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(); superType_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000010; mutable_bitField0_ |= 0x00000010;
} }
superType_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry)); superType_.add(input.readInt32());
break;
}
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
superType_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000010;
}
while (input.getBytesUntilLimit() > 0) {
superType_.add(input.readInt32());
}
input.popLimit(limit);
break; break;
} }
case 48: { case 48: {
@@ -162,17 +167,17 @@ public final class IrTypeParameter extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -207,37 +212,24 @@ public final class IrTypeParameter extends
} }
public static final int SUPER_TYPE_FIELD_NUMBER = 5; public static final int SUPER_TYPE_FIELD_NUMBER = 5;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> superType_; private java.util.List<java.lang.Integer> superType_;
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getSuperTypeList() { public java.util.List<java.lang.Integer>
getSuperTypeList() {
return superType_; return superType_;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/
public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder>
getSuperTypeOrBuilderList() {
return superType_;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/ */
public int getSuperTypeCount() { public int getSuperTypeCount() {
return superType_.size(); return superType_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuperType(int index) { public int getSuperType(int index) {
return superType_.get(index);
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder getSuperTypeOrBuilder(
int index) {
return superType_.get(index); return superType_.get(index);
} }
@@ -258,7 +250,7 @@ public final class IrTypeParameter extends
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
index_ = 0; index_ = 0;
variance_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance.IN; variance_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance.IN;
superType_ = java.util.Collections.emptyList(); superType_ = java.util.Collections.emptyList();
@@ -294,16 +286,6 @@ public final class IrTypeParameter extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
for (int i = 0; i < getSuperTypeCount(); i++) {
if (!getSuperType(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -315,7 +297,7 @@ public final class IrTypeParameter extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, index_); output.writeInt32(3, index_);
@@ -324,7 +306,7 @@ public final class IrTypeParameter extends
output.writeEnum(4, variance_.getNumber()); output.writeEnum(4, variance_.getNumber());
} }
for (int i = 0; i < superType_.size(); i++) { for (int i = 0; i < superType_.size(); i++) {
output.writeMessage(5, superType_.get(i)); output.writeInt32(5, superType_.get(i));
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeBool(6, isReified_); output.writeBool(6, isReified_);
@@ -344,7 +326,7 @@ public final class IrTypeParameter extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -354,9 +336,14 @@ public final class IrTypeParameter extends
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeEnumSize(4, variance_.getNumber()); .computeEnumSize(4, variance_.getNumber());
} }
for (int i = 0; i < superType_.size(); i++) { {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream int dataSize = 0;
.computeMessageSize(5, superType_.get(i)); for (int i = 0; i < superType_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32SizeNoTag(superType_.get(i));
}
size += dataSize;
size += 1 * getSuperTypeList().size();
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -458,7 +445,7 @@ public final class IrTypeParameter extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
index_ = 0; index_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
@@ -526,7 +513,7 @@ public final class IrTypeParameter extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasIndex()) { if (other.hasIndex()) {
setIndex(other.getIndex()); setIndex(other.getIndex());
@@ -577,16 +564,6 @@ public final class IrTypeParameter extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
for (int i = 0; i < getSuperTypeCount(); i++) {
if (!getSuperType(i).isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -669,63 +646,35 @@ public final class IrTypeParameter extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
@@ -796,128 +745,69 @@ public final class IrTypeParameter extends
return this; return this;
} }
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> superType_ = private java.util.List<java.lang.Integer> superType_ = java.util.Collections.emptyList();
java.util.Collections.emptyList();
private void ensureSuperTypeIsMutable() { private void ensureSuperTypeIsMutable() {
if (!((bitField0_ & 0x00000010) == 0x00000010)) { if (!((bitField0_ & 0x00000010) == 0x00000010)) {
superType_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(superType_); superType_ = new java.util.ArrayList<java.lang.Integer>(superType_);
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getSuperTypeList() { public java.util.List<java.lang.Integer>
getSuperTypeList() {
return java.util.Collections.unmodifiableList(superType_); return java.util.Collections.unmodifiableList(superType_);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public int getSuperTypeCount() { public int getSuperTypeCount() {
return superType_.size(); return superType_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuperType(int index) { public int getSuperType(int index) {
return superType_.get(index); return superType_.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public Builder setSuperType( public Builder setSuperType(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { int index, int value) {
if (value == null) {
throw new NullPointerException();
}
ensureSuperTypeIsMutable(); ensureSuperTypeIsMutable();
superType_.set(index, value); superType_.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public Builder setSuperType( public Builder addSuperType(int value) {
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSuperTypeIsMutable();
superType_.set(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/
public Builder addSuperType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureSuperTypeIsMutable(); ensureSuperTypeIsMutable();
superType_.add(value); superType_.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/
public Builder addSuperType(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureSuperTypeIsMutable();
superType_.add(index, value);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/
public Builder addSuperType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSuperTypeIsMutable();
superType_.add(builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/
public Builder addSuperType(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureSuperTypeIsMutable();
superType_.add(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/ */
public Builder addAllSuperType( public Builder addAllSuperType(
java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureSuperTypeIsMutable(); ensureSuperTypeIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, superType_); values, superType_);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
public Builder clearSuperType() { public Builder clearSuperType() {
superType_ = java.util.Collections.emptyList(); superType_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/
public Builder removeSuperType(int index) {
ensureSuperTypeIsMutable();
superType_.remove(index);
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeParameterOrBuilder.java
+10 -11
View File
@@ -17,13 +17,13 @@ public interface IrTypeParameterOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required int32 index = 3;</code> * <code>required int32 index = 3;</code>
@@ -44,18 +44,17 @@ public interface IrTypeParameterOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance getVariance(); org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance getVariance();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/ */
java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> java.util.List<java.lang.Integer> getSuperTypeList();
getSuperTypeList();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code> * <code>repeated int32 super_type = 5;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getSuperType(int index);
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex super_type = 5;</code>
*/ */
int getSuperTypeCount(); int getSuperTypeCount();
/**
* <code>repeated int32 super_type = 5;</code>
*/
int getSuperType(int index);
/** /**
* <code>required bool is_reified = 6;</code> * <code>required bool is_reified = 6;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeProjection.java
+22 -66
View File
@@ -65,17 +65,9 @@ public final class IrTypeProjection extends
} }
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = type_.toBuilder();
}
type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(type_);
type_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
type_ = input.readInt32();
break; break;
} }
} }
@@ -128,23 +120,23 @@ public final class IrTypeProjection extends
} }
public static final int TYPE_FIELD_NUMBER = 2; public static final int TYPE_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_; private int type_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
private void initFields() { private void initFields() {
variance_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance.IN; variance_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance.IN;
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -160,10 +152,6 @@ public final class IrTypeProjection extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -175,7 +163,7 @@ public final class IrTypeProjection extends
output.writeEnum(1, variance_.getNumber()); output.writeEnum(1, variance_.getNumber());
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, type_); output.writeInt32(2, type_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -192,7 +180,7 @@ public final class IrTypeProjection extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, type_); .computeInt32Size(2, type_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -290,7 +278,7 @@ public final class IrTypeProjection extends
super.clear(); super.clear();
variance_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance.IN; variance_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance.IN;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
return this; return this;
} }
@@ -333,7 +321,7 @@ public final class IrTypeProjection extends
setVariance(other.getVariance()); setVariance(other.getVariance());
} }
if (other.hasType()) { if (other.hasType()) {
mergeType(other.getType()); setType(other.getType());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -349,10 +337,6 @@ public final class IrTypeProjection extends
return false; return false;
} }
if (!getType().isInitialized()) {
return false;
}
return true; return true;
} }
@@ -410,63 +394,35 @@ public final class IrTypeProjection extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int type_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
public Builder setType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setType(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
type_ = value; type_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/
public Builder setType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
type_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code>
*/
public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
type_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
type_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(type_).mergeFrom(value).buildPartial();
} else {
type_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code>
*/ */
public Builder clearType() { public Builder clearType() {
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
type_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrTypeProjectionOrBuilder.java
+3 -3
View File
@@ -17,11 +17,11 @@ public interface IrTypeProjectionOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance getVariance(); org.jetbrains.kotlin.backend.common.serialization.proto.IrTypeVariance getVariance();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
boolean hasType(); boolean hasType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 2;</code> * <code>required int32 type = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType(); int getType();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameter.java
+88 -272
View File
@@ -66,17 +66,9 @@ public final class IrValueParameter extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 24: { case 24: {
@@ -84,30 +76,14 @@ public final class IrValueParameter extends
index_ = input.readInt32(); index_ = input.readInt32();
break; break;
} }
case 34: { case 32: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = type_.toBuilder();
}
type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(type_);
type_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000008; bitField0_ |= 0x00000008;
type_ = input.readInt32();
break; break;
} }
case 42: { case 40: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = varargElementType_.toBuilder();
}
varargElementType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(varargElementType_);
varargElementType_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000010; bitField0_ |= 0x00000010;
varargElementType_ = input.readInt32();
break; break;
} }
case 48: { case 48: {
@@ -120,17 +96,9 @@ public final class IrValueParameter extends
isNoinline_ = input.readBool(); isNoinline_ = input.readBool();
break; break;
} }
case 66: { case 64: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000080) == 0x00000080)) {
subBuilder = defaultValue_.toBuilder();
}
defaultValue_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(defaultValue_);
defaultValue_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000080; bitField0_ |= 0x00000080;
defaultValue_ = input.readInt32();
break; break;
} }
} }
@@ -183,17 +151,17 @@ public final class IrValueParameter extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
@@ -213,32 +181,32 @@ public final class IrValueParameter extends
} }
public static final int TYPE_FIELD_NUMBER = 4; public static final int TYPE_FIELD_NUMBER = 4;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_; private int type_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 5; public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 5;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex varargElementType_; private int varargElementType_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
public boolean hasVarargElementType() { public boolean hasVarargElementType() {
return ((bitField0_ & 0x00000010) == 0x00000010); return ((bitField0_ & 0x00000010) == 0x00000010);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getVarargElementType() { public int getVarargElementType() {
return varargElementType_; return varargElementType_;
} }
@@ -273,29 +241,29 @@ public final class IrValueParameter extends
} }
public static final int DEFAULT_VALUE_FIELD_NUMBER = 8; public static final int DEFAULT_VALUE_FIELD_NUMBER = 8;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex defaultValue_; private int defaultValue_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
public boolean hasDefaultValue() { public boolean hasDefaultValue() {
return ((bitField0_ & 0x00000080) == 0x00000080); return ((bitField0_ & 0x00000080) == 0x00000080);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDefaultValue() { public int getDefaultValue() {
return defaultValue_; return defaultValue_;
} }
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
index_ = 0; index_ = 0;
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
varargElementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); varargElementType_ = 0;
isCrossinline_ = false; isCrossinline_ = false;
isNoinline_ = false; isNoinline_ = false;
defaultValue_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); defaultValue_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -331,26 +299,6 @@ public final class IrValueParameter extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasVarargElementType()) {
if (!getVarargElementType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasDefaultValue()) {
if (!getDefaultValue().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -362,16 +310,16 @@ public final class IrValueParameter extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, index_); output.writeInt32(3, index_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, type_); output.writeInt32(4, type_);
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(5, varargElementType_); output.writeInt32(5, varargElementType_);
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeBool(6, isCrossinline_); output.writeBool(6, isCrossinline_);
@@ -380,7 +328,7 @@ public final class IrValueParameter extends
output.writeBool(7, isNoinline_); output.writeBool(7, isNoinline_);
} }
if (((bitField0_ & 0x00000080) == 0x00000080)) { if (((bitField0_ & 0x00000080) == 0x00000080)) {
output.writeMessage(8, defaultValue_); output.writeInt32(8, defaultValue_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -397,7 +345,7 @@ public final class IrValueParameter extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -405,11 +353,11 @@ public final class IrValueParameter extends
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(4, type_); .computeInt32Size(4, type_);
} }
if (((bitField0_ & 0x00000010) == 0x00000010)) { if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(5, varargElementType_); .computeInt32Size(5, varargElementType_);
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -421,7 +369,7 @@ public final class IrValueParameter extends
} }
if (((bitField0_ & 0x00000080) == 0x00000080)) { if (((bitField0_ & 0x00000080) == 0x00000080)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(8, defaultValue_); .computeInt32Size(8, defaultValue_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -519,19 +467,19 @@ public final class IrValueParameter extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
index_ = 0; index_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
varargElementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); varargElementType_ = 0;
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
isCrossinline_ = false; isCrossinline_ = false;
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
isNoinline_ = false; isNoinline_ = false;
bitField0_ = (bitField0_ & ~0x00000040); bitField0_ = (bitField0_ & ~0x00000040);
defaultValue_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); defaultValue_ = 0;
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
return this; return this;
} }
@@ -598,16 +546,16 @@ public final class IrValueParameter extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasIndex()) { if (other.hasIndex()) {
setIndex(other.getIndex()); setIndex(other.getIndex());
} }
if (other.hasType()) { if (other.hasType()) {
mergeType(other.getType()); setType(other.getType());
} }
if (other.hasVarargElementType()) { if (other.hasVarargElementType()) {
mergeVarargElementType(other.getVarargElementType()); setVarargElementType(other.getVarargElementType());
} }
if (other.hasIsCrossinline()) { if (other.hasIsCrossinline()) {
setIsCrossinline(other.getIsCrossinline()); setIsCrossinline(other.getIsCrossinline());
@@ -616,7 +564,7 @@ public final class IrValueParameter extends
setIsNoinline(other.getIsNoinline()); setIsNoinline(other.getIsNoinline());
} }
if (other.hasDefaultValue()) { if (other.hasDefaultValue()) {
mergeDefaultValue(other.getDefaultValue()); setDefaultValue(other.getDefaultValue());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -652,26 +600,6 @@ public final class IrValueParameter extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getType().isInitialized()) {
return false;
}
if (hasVarargElementType()) {
if (!getVarargElementType().isInitialized()) {
return false;
}
}
if (hasDefaultValue()) {
if (!getDefaultValue().isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -754,63 +682,35 @@ public final class IrValueParameter extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
@@ -846,123 +746,67 @@ public final class IrValueParameter extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int type_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000008) == 0x00000008); return ((bitField0_ & 0x00000008) == 0x00000008);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
public Builder setType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setType(int value) {
if (value == null) { bitField0_ |= 0x00000008;
throw new NullPointerException();
}
type_ = value; type_ = value;
bitField0_ |= 0x00000008;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/
public Builder setType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
type_ = builderForValue.build();
bitField0_ |= 0x00000008;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code>
*/
public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000008) == 0x00000008) &&
type_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
type_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(type_).mergeFrom(value).buildPartial();
} else {
type_ = value;
}
bitField0_ |= 0x00000008;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code>
*/ */
public Builder clearType() { public Builder clearType() {
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
type_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex varargElementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int varargElementType_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
public boolean hasVarargElementType() { public boolean hasVarargElementType() {
return ((bitField0_ & 0x00000010) == 0x00000010); return ((bitField0_ & 0x00000010) == 0x00000010);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getVarargElementType() { public int getVarargElementType() {
return varargElementType_; return varargElementType_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
public Builder setVarargElementType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setVarargElementType(int value) {
if (value == null) { bitField0_ |= 0x00000010;
throw new NullPointerException();
}
varargElementType_ = value; varargElementType_ = value;
bitField0_ |= 0x00000010;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/
public Builder setVarargElementType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
varargElementType_ = builderForValue.build();
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code>
*/
public Builder mergeVarargElementType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
varargElementType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
varargElementType_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
} else {
varargElementType_ = value;
}
bitField0_ |= 0x00000010;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code>
*/ */
public Builder clearVarargElementType() { public Builder clearVarargElementType() {
varargElementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
varargElementType_ = 0;
return this; return this;
} }
@@ -1030,63 +874,35 @@ public final class IrValueParameter extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex defaultValue_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int defaultValue_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
public boolean hasDefaultValue() { public boolean hasDefaultValue() {
return ((bitField0_ & 0x00000080) == 0x00000080); return ((bitField0_ & 0x00000080) == 0x00000080);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDefaultValue() { public int getDefaultValue() {
return defaultValue_; return defaultValue_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
public Builder setDefaultValue(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setDefaultValue(int value) {
if (value == null) { bitField0_ |= 0x00000080;
throw new NullPointerException();
}
defaultValue_ = value; defaultValue_ = value;
bitField0_ |= 0x00000080;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/
public Builder setDefaultValue(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
defaultValue_ = builderForValue.build();
bitField0_ |= 0x00000080;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code>
*/
public Builder mergeDefaultValue(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000080) == 0x00000080) &&
defaultValue_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
defaultValue_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(defaultValue_).mergeFrom(value).buildPartial();
} else {
defaultValue_ = value;
}
bitField0_ |= 0x00000080;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code>
*/ */
public Builder clearDefaultValue() { public Builder clearDefaultValue() {
defaultValue_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000080); bitField0_ = (bitField0_ & ~0x00000080);
defaultValue_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrValueParameterOrBuilder.java
+12 -12
View File
@@ -17,13 +17,13 @@ public interface IrValueParameterOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required int32 index = 3;</code> * <code>required int32 index = 3;</code>
@@ -35,22 +35,22 @@ public interface IrValueParameterOrBuilder extends
int getIndex(); int getIndex();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
boolean hasType(); boolean hasType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 4;</code> * <code>required int32 type = 4;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType(); int getType();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
boolean hasVarargElementType(); boolean hasVarargElementType();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex vararg_element_type = 5;</code> * <code>optional int32 vararg_element_type = 5;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getVarargElementType(); int getVarargElementType();
/** /**
* <code>required bool is_crossinline = 6;</code> * <code>required bool is_crossinline = 6;</code>
@@ -71,11 +71,11 @@ public interface IrValueParameterOrBuilder extends
boolean getIsNoinline(); boolean getIsNoinline();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
boolean hasDefaultValue(); boolean hasDefaultValue();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex default_value = 8;</code> * <code>optional int32 default_value = 8;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getDefaultValue(); int getDefaultValue();
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrVararg.java
+22 -66
View File
@@ -53,17 +53,9 @@ public final class IrVararg extends
} }
break; break;
} }
case 10: { case 8: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = elementType_.toBuilder();
}
elementType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(elementType_);
elementType_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
elementType_ = input.readInt32();
break; break;
} }
case 18: { case 18: {
@@ -112,17 +104,17 @@ public final class IrVararg extends
private int bitField0_; private int bitField0_;
public static final int ELEMENT_TYPE_FIELD_NUMBER = 1; public static final int ELEMENT_TYPE_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex elementType_; private int elementType_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
public boolean hasElementType() { public boolean hasElementType() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getElementType() { public int getElementType() {
return elementType_; return elementType_;
} }
@@ -162,7 +154,7 @@ public final class IrVararg extends
} }
private void initFields() { private void initFields() {
elementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); elementType_ = 0;
element_ = java.util.Collections.emptyList(); element_ = java.util.Collections.emptyList();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
@@ -175,10 +167,6 @@ public final class IrVararg extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getElementType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
for (int i = 0; i < getElementCount(); i++) { for (int i = 0; i < getElementCount(); i++) {
if (!getElement(i).isInitialized()) { if (!getElement(i).isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -193,7 +181,7 @@ public final class IrVararg extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, elementType_); output.writeInt32(1, elementType_);
} }
for (int i = 0; i < element_.size(); i++) { for (int i = 0; i < element_.size(); i++) {
output.writeMessage(2, element_.get(i)); output.writeMessage(2, element_.get(i));
@@ -209,7 +197,7 @@ public final class IrVararg extends
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, elementType_); .computeInt32Size(1, elementType_);
} }
for (int i = 0; i < element_.size(); i++) { for (int i = 0; i < element_.size(); i++) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -309,7 +297,7 @@ public final class IrVararg extends
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
elementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); elementType_ = 0;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
element_ = java.util.Collections.emptyList(); element_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -352,7 +340,7 @@ public final class IrVararg extends
public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg other) { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg other) {
if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.backend.common.serialization.proto.IrVararg.getDefaultInstance()) return this;
if (other.hasElementType()) { if (other.hasElementType()) {
mergeElementType(other.getElementType()); setElementType(other.getElementType());
} }
if (!other.element_.isEmpty()) { if (!other.element_.isEmpty()) {
if (element_.isEmpty()) { if (element_.isEmpty()) {
@@ -374,10 +362,6 @@ public final class IrVararg extends
return false; return false;
} }
if (!getElementType().isInitialized()) {
return false;
}
for (int i = 0; i < getElementCount(); i++) { for (int i = 0; i < getElementCount(); i++) {
if (!getElement(i).isInitialized()) { if (!getElement(i).isInitialized()) {
@@ -406,63 +390,35 @@ public final class IrVararg extends
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex elementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int elementType_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
public boolean hasElementType() { public boolean hasElementType() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getElementType() { public int getElementType() {
return elementType_; return elementType_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
public Builder setElementType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setElementType(int value) {
if (value == null) { bitField0_ |= 0x00000001;
throw new NullPointerException();
}
elementType_ = value; elementType_ = value;
bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/
public Builder setElementType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
elementType_ = builderForValue.build();
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code>
*/
public Builder mergeElementType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000001) == 0x00000001) &&
elementType_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
elementType_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(elementType_).mergeFrom(value).buildPartial();
} else {
elementType_ = value;
}
bitField0_ |= 0x00000001;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code>
*/ */
public Builder clearElementType() { public Builder clearElementType() {
elementType_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
elementType_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrVarargOrBuilder.java
+3 -3
View File
@@ -8,13 +8,13 @@ public interface IrVarargOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
boolean hasElementType(); boolean hasElementType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex element_type = 1;</code> * <code>required int32 element_type = 1;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getElementType(); int getElementType();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrVarargElement element = 2;</code> * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrVarargElement element = 2;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrVariable.java
+44 -132
View File
@@ -66,30 +66,14 @@ public final class IrVariable extends
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
} }
case 18: { case 16: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = name_.toBuilder();
}
name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(name_);
name_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
name_ = input.readInt32();
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = type_.toBuilder();
}
type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(type_);
type_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
type_ = input.readInt32();
break; break;
} }
case 32: { case 32: {
@@ -170,32 +154,32 @@ public final class IrVariable extends
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_; private int name_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
public static final int TYPE_FIELD_NUMBER = 3; public static final int TYPE_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_; private int type_;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
@@ -261,8 +245,8 @@ public final class IrVariable extends
private void initFields() { private void initFields() {
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
isVar_ = false; isVar_ = false;
isConst_ = false; isConst_ = false;
isLateinit_ = false; isLateinit_ = false;
@@ -302,14 +286,6 @@ public final class IrVariable extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (!getName().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (!getType().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
if (hasInitializer()) { if (hasInitializer()) {
if (!getInitializer().isInitialized()) { if (!getInitializer().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -327,10 +303,10 @@ public final class IrVariable extends
output.writeMessage(1, base_); output.writeMessage(1, base_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeInt32(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, type_); output.writeInt32(3, type_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeBool(4, isVar_); output.writeBool(4, isVar_);
@@ -359,11 +335,11 @@ public final class IrVariable extends
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(2, name_); .computeInt32Size(2, name_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, type_); .computeInt32Size(3, type_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -477,9 +453,9 @@ public final class IrVariable extends
super.clear(); super.clear();
base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); name_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); type_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
isVar_ = false; isVar_ = false;
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -550,10 +526,10 @@ public final class IrVariable extends
mergeBase(other.getBase()); mergeBase(other.getBase());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); setName(other.getName());
} }
if (other.hasType()) { if (other.hasType()) {
mergeType(other.getType()); setType(other.getType());
} }
if (other.hasIsVar()) { if (other.hasIsVar()) {
setIsVar(other.getIsVar()); setIsVar(other.getIsVar());
@@ -601,14 +577,6 @@ public final class IrVariable extends
return false; return false;
} }
if (!getName().isInitialized()) {
return false;
}
if (!getType().isInitialized()) {
return false;
}
if (hasInitializer()) { if (hasInitializer()) {
if (!getInitializer().isInitialized()) { if (!getInitializer().isInitialized()) {
@@ -697,123 +665,67 @@ public final class IrVariable extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int name_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public boolean hasName() { public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002); return ((bitField0_ & 0x00000002) == 0x00000002);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName() { public int getName() {
return name_; return name_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
public Builder setName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setName(int value) {
if (value == null) { bitField0_ |= 0x00000002;
throw new NullPointerException();
}
name_ = value; name_ = value;
bitField0_ |= 0x00000002;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/
public Builder setName(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
name_ = builderForValue.build();
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/
public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000002) == 0x00000002) &&
name_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
name_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(name_).mergeFrom(value).buildPartial();
} else {
name_ = value;
}
bitField0_ |= 0x00000002;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code>
*/ */
public Builder clearName() { public Builder clearName() {
name_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
name_ = 0;
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int type_ ;
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public boolean hasType() { public boolean hasType() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType() { public int getType() {
return type_; return type_;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
public Builder setType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setType(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
type_ = value; type_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/
public Builder setType(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
type_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code>
*/
public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
type_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
type_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(type_).mergeFrom(value).buildPartial();
} else {
type_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code>
*/ */
public Builder clearType() { public Builder clearType() {
type_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
type_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrVariableOrBuilder.java
+6 -6
View File
@@ -17,22 +17,22 @@ public interface IrVariableOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase(); org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclarationBase getBase();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
boolean hasName(); boolean hasName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex name = 2;</code> * <code>required int32 name = 2;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getName(); int getName();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
boolean hasType(); boolean hasType();
/** /**
* <code>required .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type = 3;</code> * <code>required int32 type = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getType(); int getType();
/** /**
* <code>required bool is_var = 4;</code> * <code>required bool is_var = 4;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/Loop.java
+22 -70
View File
@@ -71,17 +71,9 @@ public final class Loop extends
bitField0_ |= 0x00000002; bitField0_ |= 0x00000002;
break; break;
} }
case 26: { case 24: {
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = label_.toBuilder();
}
label_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(label_);
label_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
label_ = input.readInt32();
break; break;
} }
case 34: { case 34: {
@@ -175,17 +167,17 @@ public final class Loop extends
} }
public static final int LABEL_FIELD_NUMBER = 3; public static final int LABEL_FIELD_NUMBER = 3;
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label_; private int label_;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
public boolean hasLabel() { public boolean hasLabel() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel() { public int getLabel() {
return label_; return label_;
} }
@@ -222,7 +214,7 @@ public final class Loop extends
private void initFields() { private void initFields() {
loopId_ = 0; loopId_ = 0;
condition_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); condition_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); label_ = 0;
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrStatementOrigin.getDefaultInstance();
} }
@@ -244,12 +236,6 @@ public final class Loop extends
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasLabel()) {
if (!getLabel().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
if (hasBody()) { if (hasBody()) {
if (!getBody().isInitialized()) { if (!getBody().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
@@ -276,7 +262,7 @@ public final class Loop extends
output.writeMessage(2, condition_); output.writeMessage(2, condition_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, label_); output.writeInt32(3, label_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(4, body_); output.writeMessage(4, body_);
@@ -303,7 +289,7 @@ public final class Loop extends
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(3, label_); .computeInt32Size(3, label_);
} }
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -411,7 +397,7 @@ public final class Loop extends
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
condition_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); condition_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); label_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance(); body_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -473,7 +459,7 @@ public final class Loop extends
mergeCondition(other.getCondition()); mergeCondition(other.getCondition());
} }
if (other.hasLabel()) { if (other.hasLabel()) {
mergeLabel(other.getLabel()); setLabel(other.getLabel());
} }
if (other.hasBody()) { if (other.hasBody()) {
mergeBody(other.getBody()); mergeBody(other.getBody());
@@ -499,12 +485,6 @@ public final class Loop extends
return false; return false;
} }
if (hasLabel()) {
if (!getLabel().isInitialized()) {
return false;
}
}
if (hasBody()) { if (hasBody()) {
if (!getBody().isInitialized()) { if (!getBody().isInitialized()) {
@@ -631,63 +611,35 @@ public final class Loop extends
return this; return this;
} }
private org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance(); private int label_ ;
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
public boolean hasLabel() { public boolean hasLabel() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel() { public int getLabel() {
return label_; return label_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
public Builder setLabel(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { public Builder setLabel(int value) {
if (value == null) { bitField0_ |= 0x00000004;
throw new NullPointerException();
}
label_ = value; label_ = value;
bitField0_ |= 0x00000004;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/
public Builder setLabel(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
label_ = builderForValue.build();
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code>
*/
public Builder mergeLabel(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
label_ != org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance()) {
label_ =
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.newBuilder(label_).mergeFrom(value).buildPartial();
} else {
label_ = value;
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code>
*/ */
public Builder clearLabel() { public Builder clearLabel() {
label_ = org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
label_ = 0;
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/LoopOrBuilder.java
+3 -3
View File
@@ -26,13 +26,13 @@ public interface LoopOrBuilder extends
org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression getCondition(); org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression getCondition();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
boolean hasLabel(); boolean hasLabel();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex label = 3;</code> * <code>optional int32 label = 3;</code>
*/ */
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getLabel(); int getLabel();
/** /**
* <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression body = 4;</code> * <code>optional .org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression body = 4;</code>
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/MemberAccessCommon.java
-8
View File
@@ -251,10 +251,6 @@ public final class MemberAccessCommon extends
return false; return false;
} }
} }
if (!getTypeArguments().isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -494,10 +490,6 @@ public final class MemberAccessCommon extends
return false; return false;
} }
} }
if (!getTypeArguments().isInitialized()) {
return false;
}
return true; return true;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/TypeArguments.java
+51 -117
View File
@@ -53,12 +53,25 @@ public final class TypeArguments extends
} }
break; break;
} }
case 10: { case 8: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
typeArgument_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(); typeArgument_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000001; mutable_bitField0_ |= 0x00000001;
} }
typeArgument_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.PARSER, extensionRegistry)); typeArgument_.add(input.readInt32());
break;
}
case 10: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) && input.getBytesUntilLimit() > 0) {
typeArgument_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000001;
}
while (input.getBytesUntilLimit() > 0) {
typeArgument_.add(input.readInt32());
}
input.popLimit(limit);
break; break;
} }
} }
@@ -98,37 +111,24 @@ public final class TypeArguments extends
} }
public static final int TYPE_ARGUMENT_FIELD_NUMBER = 1; public static final int TYPE_ARGUMENT_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> typeArgument_; private java.util.List<java.lang.Integer> typeArgument_;
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getTypeArgumentList() { public java.util.List<java.lang.Integer>
getTypeArgumentList() {
return typeArgument_; return typeArgument_;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/
public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder>
getTypeArgumentOrBuilderList() {
return typeArgument_;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/ */
public int getTypeArgumentCount() { public int getTypeArgumentCount() {
return typeArgument_.size(); return typeArgument_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeArgument(int index) { public int getTypeArgument(int index) {
return typeArgument_.get(index);
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndexOrBuilder getTypeArgumentOrBuilder(
int index) {
return typeArgument_.get(index); return typeArgument_.get(index);
} }
@@ -141,12 +141,6 @@ public final class TypeArguments extends
if (isInitialized == 1) return true; if (isInitialized == 1) return true;
if (isInitialized == 0) return false; if (isInitialized == 0) return false;
for (int i = 0; i < getTypeArgumentCount(); i++) {
if (!getTypeArgument(i).isInitialized()) {
memoizedIsInitialized = 0;
return false;
}
}
memoizedIsInitialized = 1; memoizedIsInitialized = 1;
return true; return true;
} }
@@ -155,7 +149,7 @@ public final class TypeArguments extends
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
for (int i = 0; i < typeArgument_.size(); i++) { for (int i = 0; i < typeArgument_.size(); i++) {
output.writeMessage(1, typeArgument_.get(i)); output.writeInt32(1, typeArgument_.get(i));
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -166,9 +160,14 @@ public final class TypeArguments extends
if (size != -1) return size; if (size != -1) return size;
size = 0; size = 0;
for (int i = 0; i < typeArgument_.size(); i++) { {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream int dataSize = 0;
.computeMessageSize(1, typeArgument_.get(i)); for (int i = 0; i < typeArgument_.size(); i++) {
dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeInt32SizeNoTag(typeArgument_.get(i));
}
size += dataSize;
size += 1 * getTypeArgumentList().size();
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -314,12 +313,6 @@ public final class TypeArguments extends
} }
public final boolean isInitialized() { public final boolean isInitialized() {
for (int i = 0; i < getTypeArgumentCount(); i++) {
if (!getTypeArgument(i).isInitialized()) {
return false;
}
}
return true; return true;
} }
@@ -342,128 +335,69 @@ public final class TypeArguments extends
} }
private int bitField0_; private int bitField0_;
private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> typeArgument_ = private java.util.List<java.lang.Integer> typeArgument_ = java.util.Collections.emptyList();
java.util.Collections.emptyList();
private void ensureTypeArgumentIsMutable() { private void ensureTypeArgumentIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) { if (!((bitField0_ & 0x00000001) == 0x00000001)) {
typeArgument_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex>(typeArgument_); typeArgument_ = new java.util.ArrayList<java.lang.Integer>(typeArgument_);
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
} }
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> getTypeArgumentList() { public java.util.List<java.lang.Integer>
getTypeArgumentList() {
return java.util.Collections.unmodifiableList(typeArgument_); return java.util.Collections.unmodifiableList(typeArgument_);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public int getTypeArgumentCount() { public int getTypeArgumentCount() {
return typeArgument_.size(); return typeArgument_.size();
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeArgument(int index) { public int getTypeArgument(int index) {
return typeArgument_.get(index); return typeArgument_.get(index);
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public Builder setTypeArgument( public Builder setTypeArgument(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) { int index, int value) {
if (value == null) {
throw new NullPointerException();
}
ensureTypeArgumentIsMutable(); ensureTypeArgumentIsMutable();
typeArgument_.set(index, value); typeArgument_.set(index, value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public Builder setTypeArgument( public Builder addTypeArgument(int value) {
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureTypeArgumentIsMutable();
typeArgument_.set(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/
public Builder addTypeArgument(org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureTypeArgumentIsMutable(); ensureTypeArgumentIsMutable();
typeArgument_.add(value); typeArgument_.add(value);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/
public Builder addTypeArgument(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex value) {
if (value == null) {
throw new NullPointerException();
}
ensureTypeArgumentIsMutable();
typeArgument_.add(index, value);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/
public Builder addTypeArgument(
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureTypeArgumentIsMutable();
typeArgument_.add(builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/
public Builder addTypeArgument(
int index, org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex.Builder builderForValue) {
ensureTypeArgumentIsMutable();
typeArgument_.add(index, builderForValue.build());
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/ */
public Builder addAllTypeArgument( public Builder addAllTypeArgument(
java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> values) { java.lang.Iterable<? extends java.lang.Integer> values) {
ensureTypeArgumentIsMutable(); ensureTypeArgumentIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, typeArgument_); values, typeArgument_);
return this; return this;
} }
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
public Builder clearTypeArgument() { public Builder clearTypeArgument() {
typeArgument_ = java.util.Collections.emptyList(); typeArgument_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/
public Builder removeTypeArgument(int index) {
ensureTypeArgumentIsMutable();
typeArgument_.remove(index);
return this; return this;
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/TypeArgumentsOrBuilder.java
+7 -8
View File
@@ -8,16 +8,15 @@ public interface TypeArgumentsOrBuilder extends
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/ */
java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex> java.util.List<java.lang.Integer> getTypeArgumentList();
getTypeArgumentList();
/** /**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code> * <code>repeated int32 type_argument = 1;</code>
*/
org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex getTypeArgument(int index);
/**
* <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.IrDataIndex type_argument = 1;</code>
*/ */
int getTypeArgumentCount(); int getTypeArgumentCount();
/**
* <code>repeated int32 type_argument = 1;</code>
*/
int getTypeArgument(int index);
} }

Some files were not shown because too many files have changed in this diff Show More