From 175dfb41b69f06dc1cb71610041ec2eadc6846a8 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Fri, 21 Jun 2019 17:21:59 +0300 Subject: [PATCH] [IrSerializer] Supported all annotations + refactoring --- .../serialization.common/src/KotlinIr.proto | 109 +- .../serialization/IrModuleDeserializer.kt | 662 +- .../serialization/IrModuleSerializer.kt | 105 +- .../common/serialization/KotlinIr.java | 6441 ++++++++--------- .../common/serialization/KotlinIrLinker.kt | 5 +- 5 files changed, 3263 insertions(+), 4059 deletions(-) diff --git a/compiler/ir/serialization.common/src/KotlinIr.proto b/compiler/ir/serialization.common/src/KotlinIr.proto index 22b08a6d313..7503a2f592e 100644 --- a/compiler/ir/serialization.common/src/KotlinIr.proto +++ b/compiler/ir/serialization.common/src/KotlinIr.proto @@ -528,42 +528,44 @@ message NullableIrExpression { /* ------ Declarations --------------------------------------------- */ -message IrTypeAlias { - // Nothing for now. -} - -message IrFunction { +message IrDeclarationBase { required IrSymbol symbol = 1; - required IrFunctionBase base = 2; - required ModalityKind modality = 3; - required bool is_tailrec = 4; - required bool is_suspend = 5; - repeated IrSymbol overridden = 6; - //optional UniqId corresponding_property = 7; + required IrDeclarationOrigin origin = 2; + required Coordinates coordinates = 3; + required Annotations annotations = 4; } message IrFunctionBase { - required String name = 1; - required Visibility visibility = 2; - required bool is_inline = 3; - required bool is_external = 4; - required IrTypeParameterContainer type_parameters = 5; - optional IrDeclaration dispatch_receiver = 6; - optional IrDeclaration extension_receiver = 7; - repeated IrDeclaration value_parameter = 8; - optional IrStatement body = 9; - required IrTypeIndex return_type = 10; + required IrDeclarationBase base = 1; + required String name = 2; + required Visibility visibility = 3; + required bool is_inline = 4; + required bool is_external = 5; + required IrTypeParameterContainer type_parameters = 6; + optional IrValueParameter dispatch_receiver = 7; + optional IrValueParameter extension_receiver = 8; + repeated IrValueParameter value_parameter = 9; + optional IrStatement body = 10; + required IrTypeIndex return_type = 11; +} + +message IrFunction { + required IrFunctionBase base = 1; + required ModalityKind modality = 2; + required bool is_tailrec = 3; + required bool is_suspend = 4; + repeated IrSymbol overridden = 5; + //optional UniqId corresponding_property = 7; } message IrConstructor { - required IrSymbol symbol = 1; - required IrFunctionBase base = 2; - required bool is_primary = 3; + required IrFunctionBase base = 1; + required bool is_primary = 2; } message IrField { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; optional IrExpression initializer = 2; required String name = 3; required Visibility visibility = 4; @@ -574,17 +576,17 @@ message IrField { } message IrLocalDelegatedProperty { - required String name = 1; - required IrTypeIndex type = 2; - required bool is_var = 3; - required IrVariable delegate = 4; - optional IrFunction getter = 5; - optional IrFunction setter = 6; - required IrSymbol symbol = 7; + required IrDeclarationBase base = 1; + required String name = 2; + required IrTypeIndex type = 3; + required bool is_var = 4; + required IrVariable delegate = 5; + optional IrFunction getter = 6; + optional IrFunction setter = 7; } message IrProperty { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; required String name = 2; required Visibility visibility = 3; required ModalityKind modality = 4; @@ -599,8 +601,8 @@ message IrProperty { } message IrVariable { - required String name = 1; - required IrSymbol symbol = 2; + required IrDeclarationBase base = 1; + required String name = 2; required IrTypeIndex type = 3; required bool is_var = 4; required bool is_const = 5; @@ -625,7 +627,7 @@ enum ModalityKind { // It is ModalityKind to not clash with Modality in descript } message IrValueParameter { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; required String name = 2; required int32 index = 3; required IrTypeIndex type = 4; @@ -636,7 +638,7 @@ message IrValueParameter { } message IrTypeParameter { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; required String name = 2; required int32 index = 3; required IrTypeVariance variance = 4; @@ -645,11 +647,11 @@ message IrTypeParameter { } message IrTypeParameterContainer { - repeated IrDeclaration type_parameter = 1; + repeated IrTypeParameter type_parameter = 1; } message IrClass { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; required String name = 2; required ClassKind kind = 3; required Visibility visibility = 4; @@ -660,27 +662,28 @@ message IrClass { required bool is_data = 8; required bool is_external = 9; required bool is_inline = 10; - optional IrDeclaration this_receiver = 11; + optional IrValueParameter this_receiver = 11; required IrTypeParameterContainer type_parameters = 12; required IrDeclarationContainer declaration_container = 13; repeated IrTypeIndex super_type = 14; } message IrEnumEntry { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; optional IrExpression initializer = 2; - optional IrDeclaration corresponding_class = 3; + optional IrClass corresponding_class = 3; required String name = 4; } message IrAnonymousInit { - required IrSymbol symbol = 1; + required IrDeclarationBase base = 1; required IrStatement body = 2; } // TODO: we need an extension mechanism to accomodate new // IR operators in upcoming releases. -message IrDeclarator { + +message IrDeclaration { oneof declarator { IrAnonymousInit ir_anonymous_init = 1; IrClass ir_class = 2; @@ -689,21 +692,13 @@ message IrDeclarator { IrField ir_field = 5; IrFunction ir_function = 6; IrProperty ir_property = 7; - IrTypeAlias ir_type_alias = 8; - IrTypeParameter ir_type_parameter = 9; - IrVariable ir_variable = 10; - IrValueParameter ir_value_parameter = 11; - IrLocalDelegatedProperty ir_local_delegated_property = 12; + IrTypeParameter ir_type_parameter = 8; + IrVariable ir_variable = 9; + IrValueParameter ir_value_parameter = 10; + IrLocalDelegatedProperty ir_local_delegated_property = 11; } } -message IrDeclaration { - required IrDeclarationOrigin origin = 1; - required Coordinates coordinates = 2; - required Annotations annotations = 3; - required IrDeclarator declarator = 4; -} - /* ------- IrStatements --------------------------------------------- */ message IrBranch { @@ -716,7 +711,7 @@ message IrBlockBody { } message IrCatch { - required IrDeclaration catch_parameter = 1; + required IrVariable catch_parameter = 1; required IrExpression result = 2; } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt index 62ad8ff497e..681709b9f6e 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt @@ -9,8 +9,11 @@ import org.jetbrains.kotlin.backend.common.LoggingContext import org.jetbrains.kotlin.backend.common.descriptors.* import org.jetbrains.kotlin.backend.common.ir.DeclarationFactory import org.jetbrains.kotlin.backend.common.ir.ir2string +import org.jetbrains.kotlin.backend.common.peek +import org.jetbrains.kotlin.backend.common.pop +import org.jetbrains.kotlin.backend.common.push import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrConst.ValueCase.* -import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.DeclaratorCase.* +import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.DeclaratorCase.* import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrOperation.OperationCase.* import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.StatementCase import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrType.KindCase.* @@ -54,6 +57,8 @@ abstract class IrModuleDeserializer( abstract fun deserializeString(proto: KotlinIr.String): String abstract fun deserializeLoopHeader(loopIndex: Int, loopBuilder: () -> IrLoopBase): IrLoopBase + private val parentsStack = mutableListOf() + private fun deserializeName(proto: KotlinIr.String): Name { val name = deserializeString(proto) return Name.guessByFirstCharacter(name) @@ -159,12 +164,10 @@ abstract class IrModuleDeserializer( } private fun deserializeCatch(proto: KotlinIr.IrCatch, start: Int, end: Int): IrCatch { - val catchParameter = - deserializeDeclaration(proto.catchParameter, null) as IrVariable // TODO: we need a proper parent here + val catchParameter = deserializeIrVariable(proto.catchParameter) val result = deserializeExpression(proto.result) - val catch = IrCatchImpl(start, end, catchParameter, result) - return catch + return IrCatchImpl(start, end, catchParameter, result) } private fun deserializeSyntheticBody(proto: KotlinIr.IrSyntheticBody, start: Int, end: Int): IrSyntheticBody { @@ -186,7 +189,7 @@ abstract class IrModuleDeserializer( StatementCase.CATCH //proto.hasCatch() -> deserializeCatch(proto.catch, start, end) StatementCase.DECLARATION // proto.hasDeclaration() - -> deserializeDeclaration(proto.declaration, null) // TODO: we need a proper parent here. + -> deserializeDeclaration(proto.declaration) StatementCase.EXPRESSION // proto.hasExpression() -> deserializeExpression(proto.expression) StatementCase.SYNTHETIC_BODY // proto.hasSyntheticBody() @@ -817,44 +820,52 @@ abstract class IrModuleDeserializer( return expression } - private fun deserializeIrTypeParameter( - proto: KotlinIr.IrTypeParameter, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrTypeParameter { - val symbol = deserializeIrSymbol(proto.symbol) as IrTypeParameterSymbol - val name = deserializeName(proto.name) - val variance = deserializeIrTypeVariance(proto.variance) - val descriptor = symbol.descriptor + private inline fun usingParent(parent: T, block: (T) -> R): R { + parentsStack.push(parent) + try { + return block(parent) + } finally { + parentsStack.pop() + } + } - val parameter = if (descriptor is DeserializedTypeParameterDescriptor && descriptor.containingDeclaration is PropertyDescriptor && symbol.isBound) { - // TODO: Get rid of once new properties are implemented - IrTypeParameterImpl(start, end, origin, IrTypeParameterSymbolImpl(descriptor), name, proto.index, proto.isReified, variance) - } else { - symbolTable.declareGlobalTypeParameter(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, descriptor) { - IrTypeParameterImpl(start, end, origin, it, name, proto.index, proto.isReified, variance) + private inline fun T.usingParent(block: T.() -> Unit): T = + this.apply { usingParent(this) { block(it) } } + + private inline fun withDeserializedIrDeclarationBase( + proto: KotlinIr.IrDeclarationBase, + block: (IrSymbol, Int, Int, IrDeclarationOrigin) -> T + ): T where T : IrDeclaration, T : IrSymbolOwner { + val result = block( + deserializeIrSymbol(proto.symbol), + proto.coordinates.startOffset, proto.coordinates.endOffset, + deserializeIrDeclarationOrigin(proto.origin) + ) + result.annotations.addAll(deserializeAnnotations(proto.annotations)) + result.parent = parentsStack.peek()!! + return result + } + + private fun deserializeIrTypeParameter(proto: KotlinIr.IrTypeParameter) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + val name = deserializeName(proto.name) + val variance = deserializeIrTypeVariance(proto.variance) + + val descriptor = (symbol as IrTypeParameterSymbol).descriptor + if (descriptor is DeserializedTypeParameterDescriptor && descriptor.containingDeclaration is PropertyDescriptor && symbol.isBound) { + // TODO: Get rid of once new properties are implemented + IrTypeParameterImpl(startOffset, endOffset, origin, IrTypeParameterSymbolImpl(descriptor), name, proto.index, proto.isReified, variance) + } else { + symbolTable.declareGlobalTypeParameter(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, descriptor) { + IrTypeParameterImpl(startOffset, endOffset, origin, it, name, proto.index, proto.isReified, variance) + } + }.apply { + proto.superTypeList.mapTo(superTypes) { deserializeIrType(it) } + + (descriptor as? WrappedTypeParameterDescriptor)?.bind(this) } } - val superTypes = proto.superTypeList.map { deserializeIrType(it) } - parameter.superTypes.addAll(superTypes) - - return parameter - } - - private fun deserializeIrTypeParameterContainer( - proto: KotlinIr.IrTypeParameterContainer, - parent: IrDeclarationParent - ): List { - return proto.typeParameterList.map { - deserializeDeclaration( - it, - parent - ) as IrTypeParameter - } // TODO: we need proper start, end and origin here? - } - private fun deserializeClassKind(kind: KotlinIr.ClassKind) = when (kind) { KotlinIr.ClassKind.CLASS -> ClassKind.CLASS KotlinIr.ClassKind.INTERFACE -> ClassKind.INTERFACE @@ -864,202 +875,149 @@ abstract class IrModuleDeserializer( KotlinIr.ClassKind.OBJECT -> ClassKind.OBJECT } - private fun deserializeIrValueParameter( - proto: KotlinIr.IrValueParameter, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrValueParameter { - - val varargElementType = if (proto.hasVarargElementType()) deserializeIrType(proto.varargElementType) else null - val paramSymbol = deserializeIrSymbol(proto.symbol) as IrValueParameterSymbol - val parameter = + private fun deserializeIrValueParameter(proto: KotlinIr.IrValueParameter) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> IrValueParameterImpl( - start, end, origin, - paramSymbol, + startOffset, endOffset, origin, + symbol as IrValueParameterSymbol, deserializeName(proto.name), proto.index, deserializeIrType(proto.type), - varargElementType, + if (proto.hasVarargElementType()) deserializeIrType(proto.varargElementType) else null, proto.isCrossinline, proto.isNoinline ).apply { - defaultValue = if (proto.hasDefaultValue()) { - val expression = deserializeExpression(proto.defaultValue) - IrExpressionBodyImpl(expression) - } else null + if (proto.hasDefaultValue()) + defaultValue = IrExpressionBodyImpl(deserializeExpression(proto.defaultValue)) + + (descriptor as? WrappedValueParameterDescriptor)?.bind(this) + (descriptor as? WrappedReceiverParameterDescriptor)?.bind(this) } + } - return parameter + private fun deserializeIrClass(proto: KotlinIr.IrClass) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + val modality = deserializeModality(proto.modality) + + symbolTable.declareClass( + UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, + (symbol as IrClassSymbol).descriptor, modality + ) { + IrClassImpl( + startOffset, endOffset, origin, + it, + deserializeName(proto.name), + deserializeClassKind(proto.kind), + deserializeVisibility(proto.visibility), + modality, + proto.isCompanion, + proto.isInner, + proto.isData, + proto.isExternal, + proto.isInline + ) + }.usingParent { + proto.declarationContainer.declarationList.mapTo(declarations) { deserializeDeclaration(it) } + + thisReceiver = deserializeIrValueParameter(proto.thisReceiver) + + proto.typeParameters.typeParameterList.mapTo(typeParameters) { deserializeIrTypeParameter(it) } + + proto.superTypeList.mapTo(superTypes) { deserializeIrType(it) } + + (descriptor as? WrappedClassDescriptor)?.bind(this) + } + } + + private inline fun withDeserializedIrFunctionBase( + proto: KotlinIr.IrFunctionBase, + block: (IrFunctionSymbol, Int, Int, IrDeclarationOrigin) -> T + ) = withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + block(symbol as IrFunctionSymbol, startOffset, endOffset, origin).usingParent { + proto.typeParameters.typeParameterList.mapTo(typeParameters) { deserializeIrTypeParameter(it) } + proto.valueParameterList.mapTo(valueParameters) { deserializeIrValueParameter(it) } + if (proto.hasDispatchReceiver()) + dispatchReceiverParameter = deserializeIrValueParameter(proto.dispatchReceiver) + if (proto.hasExtensionReceiver()) + extensionReceiverParameter = deserializeIrValueParameter(proto.extensionReceiver) + if (proto.hasBody()) + body = deserializeStatement(proto.body) as IrBody + } } - private fun deserializeIrClass( - proto: KotlinIr.IrClass, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrClass { + private fun deserializeIrFunction(proto: KotlinIr.IrFunction) = + withDeserializedIrFunctionBase(proto.base) { symbol, startOffset, endOffset, origin -> + logger.log { "### deserializing IrFunction ${proto.base.name}" } - val symbol = deserializeIrSymbol(proto.symbol) as IrClassSymbol + symbolTable.declareSimpleFunction( + UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, + symbol.descriptor + ) { + IrFunctionImpl( + startOffset, endOffset, origin, + it, + deserializeName(proto.base.name), + deserializeVisibility(proto.base.visibility), + deserializeModality(proto.modality), + deserializeIrType(proto.base.returnType), + proto.base.isInline, + proto.base.isExternal, + proto.isTailrec, + proto.isSuspend + ) + }.apply { + proto.overriddenList.mapTo(overriddenSymbols) { deserializeIrSymbol(it) as IrSimpleFunctionSymbol } - val modality = deserializeModality(proto.modality) - val clazz = symbolTable.declareClass( - UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, - symbol.descriptor, modality - ) { - IrClassImpl( - start, end, origin, - it, + (descriptor as? WrappedSimpleFunctionDescriptor)?.bind(this) + } + } + + private fun deserializeIrVariable(proto: KotlinIr.IrVariable) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + IrVariableImpl( + startOffset, endOffset, origin, + symbol as IrVariableSymbol, deserializeName(proto.name), - deserializeClassKind(proto.kind), - deserializeVisibility(proto.visibility), - modality, - proto.isCompanion, - proto.isInner, - proto.isData, - proto.isExternal, - proto.isInline - ) + deserializeIrType(proto.type), + proto.isVar, + proto.isConst, + proto.isLateinit + ).apply { + if (proto.hasInitializer()) + initializer = deserializeExpression(proto.initializer) + + (descriptor as? WrappedVariableDescriptor)?.bind(this) + } } - proto.declarationContainer.declarationList.forEach { - val member = deserializeDeclaration(it, clazz) - clazz.addMember(member) - member.parent = clazz + private fun deserializeIrEnumEntry(proto: KotlinIr.IrEnumEntry): IrEnumEntry = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + symbolTable.declareEnumEntry( + UNDEFINED_OFFSET, + UNDEFINED_OFFSET, + irrelevantOrigin, + (symbol as IrEnumEntrySymbol).descriptor + ) { + IrEnumEntryImpl(startOffset, endOffset, origin, it, deserializeName(proto.name)) + }.apply { + if (proto.hasCorrespondingClass()) + correspondingClass = deserializeIrClass(proto.correspondingClass) + if (proto.hasInitializer()) + initializerExpression = deserializeExpression(proto.initializer) + + (descriptor as? WrappedEnumEntryDescriptor)?.bind(this) + } } - clazz.thisReceiver = deserializeDeclaration(proto.thisReceiver, clazz) as IrValueParameter + private fun deserializeIrAnonymousInit(proto: KotlinIr.IrAnonymousInit) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + IrAnonymousInitializerImpl(startOffset, endOffset, origin, symbol as IrAnonymousInitializerSymbol).apply { + body = deserializeBlockBody(proto.body.blockBody, startOffset, endOffset) - val typeParameters = deserializeIrTypeParameterContainer(proto.typeParameters, clazz) - clazz.typeParameters.addAll(typeParameters) - - val superTypes = proto.superTypeList.map { deserializeIrType(it) } - clazz.superTypes.addAll(superTypes) - - return clazz - } - - private fun deserializeIrFunctionBase( - base: KotlinIr.IrFunctionBase, - function: IrFunctionBase, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ) { - - function.body = if (base.hasBody()) deserializeStatement(base.body) as IrBody else null - - val valueParameters = base.valueParameterList.map { deserializeDeclaration(it, function) as IrValueParameter } - function.valueParameters.addAll(valueParameters) - function.dispatchReceiverParameter = if (base.hasDispatchReceiver()) deserializeDeclaration( - base.dispatchReceiver, - function - ) as IrValueParameter else null - function.extensionReceiverParameter = if (base.hasExtensionReceiver()) deserializeDeclaration( - base.extensionReceiver, - function - ) as IrValueParameter else null - val typeParameters = deserializeIrTypeParameterContainer(base.typeParameters, function) // TODO - function.typeParameters.addAll(typeParameters) - } - - private fun deserializeIrFunction( - proto: KotlinIr.IrFunction, - start: Int, end: Int, origin: IrDeclarationOrigin - ): IrSimpleFunction { - - logger.log { "### deserializing IrFunction ${proto.base.name}" } - val symbol = deserializeIrSymbol(proto.symbol) as IrSimpleFunctionSymbol - - val function = symbolTable.declareSimpleFunction(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, - symbol.descriptor - ) { - IrFunctionImpl( - start, end, origin, it, - deserializeName(proto.base.name), - deserializeVisibility(proto.base.visibility), - deserializeModality(proto.modality), - deserializeIrType(proto.base.returnType), - proto.base.isInline, - proto.base.isExternal, - proto.isTailrec, - proto.isSuspend - ) + (descriptor as? WrappedClassDescriptor)?.bind(parentsStack.peek() as IrClass) + } } - deserializeIrFunctionBase(proto.base, function as IrFunctionBase, start, end, origin) - val overridden = proto.overriddenList.map { deserializeIrSymbol(it) as IrSimpleFunctionSymbol } - function.overriddenSymbols.addAll(overridden) - -// function.correspondingProperty = correspondingProperty - - return function - } - - private fun deserializeIrVariable( - proto: KotlinIr.IrVariable, - start: Int, end: Int, origin: IrDeclarationOrigin - ): IrVariable { - - val initializer = if (proto.hasInitializer()) { - deserializeExpression(proto.initializer) - } else null - - val symbol = deserializeIrSymbol(proto.symbol) as IrVariableSymbol - val type = deserializeIrType(proto.type) - - val variable = IrVariableImpl( - start, - end, - origin, - symbol, - deserializeName(proto.name), - type, - proto.isVar, - proto.isConst, - proto.isLateinit - ) - variable.initializer = initializer - return variable - } - - private fun deserializeIrEnumEntry( - proto: KotlinIr.IrEnumEntry, - start: Int, end: Int, origin: IrDeclarationOrigin - ): IrEnumEntry { - val symbol = deserializeIrSymbol(proto.symbol) as IrEnumEntrySymbol - - val enumEntry = symbolTable.declareEnumEntry( - UNDEFINED_OFFSET, - UNDEFINED_OFFSET, - irrelevantOrigin, - symbol.descriptor - ) { - IrEnumEntryImpl(start, end, origin, it, deserializeName(proto.name)) - } - - if (proto.hasCorrespondingClass()) { - enumEntry.correspondingClass = deserializeDeclaration(proto.correspondingClass, null) as IrClass - } - if (proto.hasInitializer()) { - enumEntry.initializerExpression = deserializeExpression(proto.initializer) - } - - return enumEntry - } - - private fun deserializeIrAnonymousInit( - proto: KotlinIr.IrAnonymousInit, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrAnonymousInitializer { - val symbol = deserializeIrSymbol(proto.symbol) as IrAnonymousInitializerSymbol - val initializer = IrAnonymousInitializerImpl(start, end, origin, symbol) - initializer.body = deserializeBlockBody(proto.body.blockBody, start, end) - return initializer - } - private fun deserializeVisibility(value: KotlinIr.Visibility): Visibility { // TODO: switch to enum return when (deserializeString(value.name)) { "public" -> Visibilities.PUBLIC @@ -1073,50 +1031,38 @@ abstract class IrModuleDeserializer( } } - private fun deserializeIrConstructor( - proto: KotlinIr.IrConstructor, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrConstructor { - val symbol = deserializeIrSymbol(proto.symbol) as IrConstructorSymbol + private fun deserializeIrConstructor(proto: KotlinIr.IrConstructor) = + withDeserializedIrFunctionBase(proto.base) { symbol, startOffset, endOffset, origin -> + symbolTable.declareConstructor( + UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, + (symbol as IrConstructorSymbol).descriptor + ) { + IrConstructorImpl( + startOffset, endOffset, origin, + it, + deserializeName(proto.base.name), + deserializeVisibility(proto.base.visibility), + deserializeIrType(proto.base.returnType), + proto.base.isInline, + proto.base.isExternal, + proto.isPrimary + ) + }.apply { + (descriptor as? WrappedClassConstructorDescriptor)?.bind(this) + } + } - val constructor = symbolTable.declareConstructor(UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, - symbol.descriptor, { - IrConstructorImpl( - start, end, origin, - it, - deserializeName(proto.base.name), - deserializeVisibility(proto.base.visibility), - deserializeIrType(proto.base.returnType), - proto.base.isInline, - proto.base.isExternal, - proto.isPrimary - ) + private fun deserializeIrField(proto: KotlinIr.IrField) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + val type = deserializeIrType(proto.type) - }) - - deserializeIrFunctionBase(proto.base, constructor as IrFunctionBase, start, end, origin) - return constructor - } - - private fun deserializeIrField( - proto: KotlinIr.IrField, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrField { - - val symbol = deserializeIrSymbol(proto.symbol) as IrFieldSymbol - val type = deserializeIrType(proto.type) - val field = symbolTable.declareField(UNDEFINED_OFFSET, - UNDEFINED_OFFSET, - irrelevantOrigin, - symbol.descriptor, - type, - { + symbolTable.declareField( + UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, + (symbol as IrFieldSymbol).descriptor, + type + ) { IrFieldImpl( - start, end, origin, + startOffset, endOffset, origin, it, deserializeName(proto.name), type, @@ -1125,14 +1071,13 @@ abstract class IrModuleDeserializer( proto.isExternal, proto.isStatic ) + }.usingParent { + if (proto.hasInitializer()) + initializer = IrExpressionBodyImpl(deserializeExpression(proto.initializer)) + + (descriptor as? WrappedFieldDescriptor)?.bind(this) } - ) - - val initializer = if (proto.hasInitializer()) deserializeExpression(proto.initializer) else null - field.initializer = initializer?.let { IrExpressionBodyImpl(it) } - - return field - } + } private fun deserializeModality(modality: KotlinIr.ModalityKind) = when (modality) { KotlinIr.ModalityKind.OPEN_MODALITY -> Modality.OPEN @@ -1141,58 +1086,33 @@ abstract class IrModuleDeserializer( KotlinIr.ModalityKind.ABSTRACT_MODALITY -> Modality.ABSTRACT } - private fun deserializeIrLocalDelegatedProperty( - proto: KotlinIr.IrLocalDelegatedProperty, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrLocalDelegatedProperty { + private fun deserializeIrLocalDelegatedProperty(proto: KotlinIr.IrLocalDelegatedProperty) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> + IrLocalDelegatedPropertyImpl( + startOffset, endOffset, origin, + symbol as IrLocalDelegatedPropertySymbol, + deserializeName(proto.name), + deserializeIrType(proto.type), + proto.isVar + ).apply { + delegate = deserializeIrVariable(proto.delegate) + getter = deserializeIrFunction(proto.getter) + if (proto.hasSetter()) + setter = deserializeIrFunction(proto.setter) - val delegate = deserializeIrVariable(proto.delegate, start, end, origin) - val getter = deserializeIrFunction(proto.getter, start, end, origin) - val setter = if (proto.hasSetter()) deserializeIrFunction(proto.setter, start, end, origin) else null - - delegate.let { (it.descriptor as? WrappedVariableDescriptor)?.bind(it) } - getter.let { (it.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(it) } - setter?.let { (it.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(it) } - - val symbol = deserializeIrSymbol(proto.symbol) as IrLocalDelegatedPropertySymbol - - return IrLocalDelegatedPropertyImpl( - start, end, origin, - symbol, - deserializeName(proto.name), - deserializeIrType(proto.type), - proto.isVar - ).also { - it.delegate = delegate - it.getter = getter - it.setter = setter + (descriptor as? WrappedVariableDescriptorWithAccessor)?.bind(this) + } } - } - private fun deserializeIrProperty( - proto: KotlinIr.IrProperty, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrProperty { - - val symbol = deserializeIrSymbol(proto.symbol) as IrPropertySymbol - - val backingField = - if (proto.hasBackingField()) deserializeIrField(proto.backingField, start, end, origin) else null - val getter = if (proto.hasGetter()) deserializeIrFunction(proto.getter, start, end, origin) else null - val setter = if (proto.hasSetter()) deserializeIrFunction(proto.setter, start, end, origin) else null - - val property = + private fun deserializeIrProperty(proto: KotlinIr.IrProperty) = + withDeserializedIrDeclarationBase(proto.base) { symbol, startOffset, endOffset, origin -> symbolTable.declareProperty( UNDEFINED_OFFSET, UNDEFINED_OFFSET, irrelevantOrigin, - symbol.descriptor, proto.isDelegated + (symbol as IrPropertySymbol).descriptor, proto.isDelegated ) { IrPropertyImpl( - start, end, origin, - symbol, + startOffset, endOffset, origin, + it, deserializeName(proto.name), deserializeVisibility(proto.visibility), deserializeModality(proto.modality), @@ -1202,44 +1122,32 @@ abstract class IrModuleDeserializer( proto.isDelegated, proto.isExternal ) - } + }.apply { + if (proto.hasGetter()) { + getter = deserializeIrFunction(proto.getter).also { + it.correspondingPropertySymbol = symbol + } + } + if (proto.hasSetter()) { + setter = deserializeIrFunction(proto.setter).also { + it.correspondingPropertySymbol = symbol + } + } + if (proto.hasBackingField()) { + backingField = deserializeIrField(proto.backingField).also { + // A property symbol and its field symbol share the same descriptor. + // Unfortunately symbol deserialization doesn't know anything about that. + // So we can end up with two wrapped property descriptors for property and its field. + // In that case we need to bind the field's one here. + if (descriptor != it.descriptor) + (it.descriptor as? WrappedPropertyDescriptor)?.bind(this) + it.correspondingPropertySymbol = symbol + } + } - backingField?.let { - val descriptor = it.descriptor - when (descriptor) { - is WrappedFieldDescriptor -> - descriptor.bind(it) - is WrappedPropertyDescriptor -> - // A property symbol and its field symbol share the same descriptor. - // Unfortunately symbol deserialization doesn't know anything about that. - // So we can end up with two wrapped property descriptors for property and its field. - // In that case we need to bind the field's one here. - if (symbol.descriptor != descriptor) descriptor.bind(property) + (descriptor as? WrappedPropertyDescriptor)?.bind(this) } - } - getter?.let { (it.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(it) } - setter?.let { (it.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(it) } - - property.backingField = backingField - property.getter = getter - property.setter = setter - - backingField?.let { it.correspondingPropertySymbol = symbol } - getter?.let { it.correspondingPropertySymbol = symbol } - setter?.let { it.correspondingPropertySymbol = symbol } - - return property - } - - private fun deserializeIrTypeAlias( - proto: KotlinIr.IrTypeAlias, - start: Int, - end: Int, - origin: IrDeclarationOrigin - ): IrDeclaration { - return IrErrorDeclarationImpl(start, end, WrappedClassDescriptor()) - } private val allKnownDeclarationOrigins = IrDeclarationOrigin::class.nestedClasses.toList() + DeclarationFactory.FIELD_FOR_OUTER_THIS::class @@ -1270,71 +1178,43 @@ abstract class IrModuleDeserializer( } } - open fun deserializeDeclaration(proto: KotlinIr.IrDeclaration, parent: IrDeclarationParent?): IrDeclaration { - - val start = proto.coordinates.startOffset - val end = proto.coordinates.endOffset - val origin = deserializeIrDeclarationOrigin(proto.origin) - - val declarator = proto.declarator - - val declaration: IrDeclaration = when (declarator.declaratorCase!!) { + private fun deserializeDeclaration(proto: KotlinIr.IrDeclaration): IrDeclaration { + val declaration: IrDeclaration = when (proto.declaratorCase!!) { IR_ANONYMOUS_INIT - -> deserializeIrAnonymousInit(declarator.irAnonymousInit, start, end, origin) + -> deserializeIrAnonymousInit(proto.irAnonymousInit) IR_CONSTRUCTOR - -> deserializeIrConstructor(declarator.irConstructor, start, end, origin) + -> deserializeIrConstructor(proto.irConstructor) IR_FIELD - -> deserializeIrField(declarator.irField, start, end, origin) + -> deserializeIrField(proto.irField) IR_CLASS - -> deserializeIrClass(declarator.irClass, start, end, origin) + -> deserializeIrClass(proto.irClass) IR_FUNCTION - -> deserializeIrFunction(declarator.irFunction, start, end, origin) + -> deserializeIrFunction(proto.irFunction) IR_PROPERTY - -> deserializeIrProperty(declarator.irProperty, start, end, origin) - IR_TYPE_ALIAS - -> deserializeIrTypeAlias(declarator.irTypeAlias, start, end, origin) + -> deserializeIrProperty(proto.irProperty) IR_TYPE_PARAMETER - -> deserializeIrTypeParameter(declarator.irTypeParameter, start, end, origin) + -> deserializeIrTypeParameter(proto.irTypeParameter) IR_VARIABLE - -> deserializeIrVariable(declarator.irVariable, start, end, origin) + -> deserializeIrVariable(proto.irVariable) IR_VALUE_PARAMETER - -> deserializeIrValueParameter(declarator.irValueParameter, start, end, origin) + -> deserializeIrValueParameter(proto.irValueParameter) IR_ENUM_ENTRY - -> deserializeIrEnumEntry(declarator.irEnumEntry, start, end, origin) + -> deserializeIrEnumEntry(proto.irEnumEntry) IR_LOCAL_DELEGATED_PROPERTY - -> deserializeIrLocalDelegatedProperty(declarator.irLocalDelegatedProperty, start, end, origin) + -> deserializeIrLocalDelegatedProperty(proto.irLocalDelegatedProperty) DECLARATOR_NOT_SET - -> error("Declaration deserialization not implemented: ${declarator.declaratorCase}") + -> error("Declaration deserialization not implemented: ${proto.declaratorCase}") } - val annotations = deserializeAnnotations(proto.annotations) - declaration.annotations.addAll(annotations) - - parent?.let { declaration.parent = it } - - val descriptor = declaration.descriptor - - if (descriptor is WrappedDeclarationDescriptor<*>) { - when (declaration) { - is IrValueParameter -> - if (descriptor is WrappedValueParameterDescriptor) descriptor.bind(declaration) - else (descriptor as WrappedReceiverParameterDescriptor).bind(declaration) - is IrVariable -> (descriptor as WrappedVariableDescriptor).bind(declaration) - is IrTypeParameter -> (descriptor as WrappedTypeParameterDescriptor).bind(declaration) - is IrAnonymousInitializer -> (descriptor as WrappedClassDescriptor).bind(parent!! as IrClass) - is IrClass -> (descriptor as WrappedClassDescriptor).bind(declaration) - is IrConstructor -> (descriptor as WrappedClassConstructorDescriptor).bind(declaration) - is IrField -> (descriptor as WrappedFieldDescriptor).bind(declaration) - is IrProperty -> (descriptor as WrappedPropertyDescriptor).bind(declaration) - is IrEnumEntry -> (descriptor as WrappedEnumEntryDescriptor).bind(declaration) - is IrSimpleFunction -> (descriptor as WrappedSimpleFunctionDescriptor).bind(declaration) - is IrLocalDelegatedProperty -> (descriptor as WrappedVariableDescriptorWithAccessor).bind(declaration) - } - } - logger.log { "### Deserialized declaration: ${descriptor} -> ${ir2string(declaration)}" } + logger.log { "### Deserialized declaration: ${declaration.descriptor} -> ${ir2string(declaration)}" } return declaration } + + fun deserializeDeclaration(proto: KotlinIr.IrDeclaration, parent: IrDeclarationParent) = + usingParent(parent) { + deserializeDeclaration(proto) + } } val irrelevantOrigin = object : IrDeclarationOriginImpl("irrelevant") {} diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt index 57c94c78c19..c5b637a8b4f 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt @@ -342,7 +342,7 @@ open class IrModuleSerializer( private fun serializeCatch(catch: IrCatch): KotlinIr.IrCatch { val proto = KotlinIr.IrCatch.newBuilder() - .setCatchParameter(serializeDeclaration(catch.catchParameter)) + .setCatchParameter(serializeIrVariable(catch.catchParameter)) .setResult(serializeExpression(catch.result)) return proto.build() } @@ -878,9 +878,17 @@ open class IrModuleSerializer( return proto.build() } + private fun serializeIrDeclarationBase(declaration: IrDeclaration) = + KotlinIr.IrDeclarationBase.newBuilder() + .setSymbol(serializeIrSymbol((declaration as IrSymbolOwner).symbol)) + .setCoordinates(serializeCoordinates(declaration.startOffset, declaration.endOffset)) + .setAnnotations(serializeAnnotations(declaration.annotations)) + .setOrigin(serializeIrDeclarationOrigin(declaration.origin)) + .build() + private fun serializeIrValueParameter(parameter: IrValueParameter): KotlinIr.IrValueParameter { val proto = KotlinIr.IrValueParameter.newBuilder() - .setSymbol(serializeIrSymbol(parameter.symbol)) + .setBase(serializeIrDeclarationBase(parameter)) .setName(serializeName(parameter.name)) .setIndex(parameter.index) .setType(serializeIrType(parameter.type)) @@ -895,7 +903,7 @@ open class IrModuleSerializer( private fun serializeIrTypeParameter(parameter: IrTypeParameter): KotlinIr.IrTypeParameter { val proto = KotlinIr.IrTypeParameter.newBuilder() - .setSymbol(serializeIrSymbol(parameter.symbol)) + .setBase(serializeIrDeclarationBase(parameter)) .setName(serializeName(parameter.name)) .setIndex(parameter.index) .setVariance(serializeIrTypeVariance(parameter.variance)) @@ -909,13 +917,14 @@ open class IrModuleSerializer( private fun serializeIrTypeParameterContainer(typeParameters: List): KotlinIr.IrTypeParameterContainer { val proto = KotlinIr.IrTypeParameterContainer.newBuilder() typeParameters.forEach { - proto.addTypeParameter(serializeDeclaration(it)) + proto.addTypeParameter(serializeIrTypeParameter(it)) } return proto.build() } private fun serializeIrFunctionBase(function: IrFunction): KotlinIr.IrFunctionBase { val proto = KotlinIr.IrFunctionBase.newBuilder() + .setBase(serializeIrDeclarationBase(function)) .setName(serializeName(function.name)) .setVisibility(serializeVisibility(function.visibility)) .setIsInline(function.isInline) @@ -923,11 +932,10 @@ open class IrModuleSerializer( .setReturnType(serializeIrType(function.returnType)) .setTypeParameters(serializeIrTypeParameterContainer(function.typeParameters)) - function.dispatchReceiverParameter?.let { proto.setDispatchReceiver(serializeDeclaration(it)) } - function.extensionReceiverParameter?.let { proto.setExtensionReceiver(serializeDeclaration(it)) } + function.dispatchReceiverParameter?.let { proto.setDispatchReceiver(serializeIrValueParameter(it)) } + function.extensionReceiverParameter?.let { proto.setExtensionReceiver(serializeIrValueParameter(it)) } function.valueParameters.forEach { - //proto.addValueParameter(serializeIrValueParameter(it)) - proto.addValueParameter(serializeDeclaration(it)) + proto.addValueParameter(serializeIrValueParameter(it)) } if (!bodiesOnlyForInlines || function.isInline) { function.body?.let { proto.body = serializeStatement(it) } @@ -944,48 +952,38 @@ open class IrModuleSerializer( private fun serializeIrConstructor(declaration: IrConstructor): KotlinIr.IrConstructor = KotlinIr.IrConstructor.newBuilder() - .setSymbol(serializeIrSymbol(declaration.symbol)) .setBase(serializeIrFunctionBase(declaration)) .setIsPrimary(declaration.isPrimary) .build() private fun serializeIrFunction(declaration: IrSimpleFunction): KotlinIr.IrFunction { - val function = declaration// as IrFunctionImpl val proto = KotlinIr.IrFunction.newBuilder() - .setSymbol(serializeIrSymbol(function.symbol)) - .setModality(serializeModality(function.modality)) - .setIsTailrec(function.isTailrec) - .setIsSuspend(function.isSuspend) + .setBase(serializeIrFunctionBase(declaration)) + .setModality(serializeModality(declaration.modality)) + .setIsTailrec(declaration.isTailrec) + .setIsSuspend(declaration.isSuspend) - function.overriddenSymbols.forEach { + declaration.overriddenSymbols.forEach { proto.addOverridden(serializeIrSymbol(it)) } - //function.correspondingProperty?.let { - // val uniqId = declarationTable.uniqIdByDeclaration(it) - // proto.setCorrespondingProperty(protoUniqId(uniqId)) - //} - - val base = serializeIrFunctionBase(function) - proto.setBase(base) - return proto.build() } - private fun serializeIrAnonymousInit(declaration: IrAnonymousInitializer) = KotlinIr.IrAnonymousInit.newBuilder() - .setSymbol(serializeIrSymbol(declaration.symbol)) - .setBody(serializeStatement(declaration.body)) - .build() + private fun serializeIrAnonymousInit(declaration: IrAnonymousInitializer) = + KotlinIr.IrAnonymousInit.newBuilder() + .setBase(serializeIrDeclarationBase(declaration)) + .setBody(serializeStatement(declaration.body)) + .build() private fun serializeIrLocalDelegatedProperty(variable: IrLocalDelegatedProperty): KotlinIr.IrLocalDelegatedProperty { - val proto = KotlinIr.IrLocalDelegatedProperty.newBuilder() + .setBase(serializeIrDeclarationBase(variable)) .setName(serializeString(variable.name.toString())) .setIsVar(variable.isVar) .setType(serializeIrType(variable.type)) .setDelegate(serializeIrVariable(variable.delegate)) .setGetter(serializeIrFunction(variable.getter as IrSimpleFunction)) // TODO: can it be non simple? - .setSymbol(serializeIrSymbol(variable.symbol)) variable.setter?.let { proto.setSetter(serializeIrFunction(it as IrSimpleFunction)) } // TODO: ditto. @@ -996,6 +994,7 @@ open class IrModuleSerializer( declarationTable.uniqIdByDeclaration(property) val proto = KotlinIr.IrProperty.newBuilder() + .setBase(serializeIrDeclarationBase(property)) .setIsDelegated(property.isDelegated) .setName(serializeName(property.name)) .setVisibility(serializeVisibility(property.visibility)) @@ -1005,7 +1004,6 @@ open class IrModuleSerializer( .setIsLateinit(property.isLateinit) .setIsDelegated(property.isDelegated) .setIsExternal(property.isExternal) - .setSymbol(serializeIrSymbol(property.symbol)) val backingField = property.backingField val getter = property.getter @@ -1022,7 +1020,7 @@ open class IrModuleSerializer( private fun serializeIrField(field: IrField): KotlinIr.IrField { val proto = KotlinIr.IrField.newBuilder() - .setSymbol(serializeIrSymbol(field.symbol)) + .setBase(serializeIrDeclarationBase(field)) .setName(serializeName(field.name)) .setVisibility(serializeVisibility(field.visibility)) .setIsFinal(field.isFinal) @@ -1038,7 +1036,7 @@ open class IrModuleSerializer( private fun serializeIrVariable(variable: IrVariable): KotlinIr.IrVariable { val proto = KotlinIr.IrVariable.newBuilder() - .setSymbol(serializeIrSymbol(variable.symbol)) + .setBase(serializeIrDeclarationBase(variable)) .setName(serializeName(variable.name)) .setType(serializeIrType(variable.type)) .setIsConst(variable.isConst) @@ -1068,8 +1066,8 @@ open class IrModuleSerializer( private fun serializeIrClass(clazz: IrClass): KotlinIr.IrClass { val proto = KotlinIr.IrClass.newBuilder() + .setBase(serializeIrDeclarationBase(clazz)) .setName(serializeName(clazz.name)) - .setSymbol(serializeIrSymbol(clazz.symbol)) .setKind(serializeClassKind(clazz.kind)) .setVisibility(serializeVisibility(clazz.visibility)) .setModality(serializeModality(clazz.modality)) @@ -1083,21 +1081,21 @@ open class IrModuleSerializer( clazz.superTypes.forEach { proto.addSuperType(serializeIrType(it)) } - clazz.thisReceiver?.let { proto.thisReceiver = serializeDeclaration(it) } + clazz.thisReceiver?.let { proto.thisReceiver = serializeIrValueParameter(it) } return proto.build() } private fun serializeIrEnumEntry(enumEntry: IrEnumEntry): KotlinIr.IrEnumEntry { val proto = KotlinIr.IrEnumEntry.newBuilder() + .setBase(serializeIrDeclarationBase(enumEntry)) .setName(serializeName(enumEntry.name)) - .setSymbol(serializeIrSymbol(enumEntry.symbol)) enumEntry.initializerExpression?.let { proto.initializer = serializeExpression(it) } enumEntry.correspondingClass?.let { - proto.correspondingClass = serializeDeclaration(it) + proto.correspondingClass = serializeIrClass(it) } return proto.build() } @@ -1105,46 +1103,35 @@ open class IrModuleSerializer( private fun serializeDeclaration(declaration: IrDeclaration): KotlinIr.IrDeclaration { logger.log { "### serializing Declaration: ${ir2string(declaration)}" } - val declarator = KotlinIr.IrDeclarator.newBuilder() + val proto = KotlinIr.IrDeclaration.newBuilder() when (declaration) { is IrAnonymousInitializer -> - declarator.irAnonymousInit = serializeIrAnonymousInit(declaration) + proto.irAnonymousInit = serializeIrAnonymousInit(declaration) is IrConstructor -> - declarator.irConstructor = serializeIrConstructor(declaration) + proto.irConstructor = serializeIrConstructor(declaration) is IrField -> - declarator.irField = serializeIrField(declaration) + proto.irField = serializeIrField(declaration) is IrSimpleFunction -> - declarator.irFunction = serializeIrFunction(declaration) + proto.irFunction = serializeIrFunction(declaration) is IrTypeParameter -> - declarator.irTypeParameter = serializeIrTypeParameter(declaration) + proto.irTypeParameter = serializeIrTypeParameter(declaration) is IrVariable -> - declarator.irVariable = serializeIrVariable(declaration) + proto.irVariable = serializeIrVariable(declaration) is IrValueParameter -> - declarator.irValueParameter = serializeIrValueParameter(declaration) + proto.irValueParameter = serializeIrValueParameter(declaration) is IrClass -> - declarator.irClass = serializeIrClass(declaration) + proto.irClass = serializeIrClass(declaration) is IrEnumEntry -> - declarator.irEnumEntry = serializeIrEnumEntry(declaration) + proto.irEnumEntry = serializeIrEnumEntry(declaration) is IrProperty -> - declarator.irProperty = serializeIrProperty(declaration) + proto.irProperty = serializeIrProperty(declaration) is IrLocalDelegatedProperty -> - declarator.irLocalDelegatedProperty = serializeIrLocalDelegatedProperty(declaration) + proto.irLocalDelegatedProperty = serializeIrLocalDelegatedProperty(declaration) else -> TODO("Declaration serialization not supported yet: $declaration") } - val coordinates = serializeCoordinates(declaration.startOffset, declaration.endOffset) - val annotations = serializeAnnotations(declaration.annotations) - val origin = serializeIrDeclarationOrigin(declaration.origin) - val proto = KotlinIr.IrDeclaration.newBuilder() - .setCoordinates(coordinates) - .setAnnotations(annotations) - .setOrigin(origin) - - - proto.setDeclarator(declarator) - return proto.build() } diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java index 9fff85ed649..092224efae0 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java @@ -1047,7 +1047,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -2371,7 +2371,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -2817,7 +2817,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -3254,7 +3254,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -3658,7 +3658,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -4071,7 +4071,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -4614,7 +4614,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -5115,7 +5115,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -5707,7 +5707,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -6737,33 +6737,15 @@ public final class KotlinIr { /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ java.util.List getFileList(); /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile getFile(int index); /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ int getFileCount(); } @@ -6801,7 +6783,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -6894,24 +6876,12 @@ public final class KotlinIr { private java.util.List file_; /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ public java.util.List getFileList() { return file_; } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ public java.util.List getFileOrBuilderList() { @@ -6919,36 +6889,18 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ public int getFileCount() { return file_.size(); } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile getFile(int index) { return file_.get(index); } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-     *required IrSymbolTable symbol_table = 3;
-     *required IrTypeTable type_table = 4;
-     *required StringTable string_table = 5;
-     *
*/ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFileOrBuilder getFileOrBuilder( int index) { @@ -7271,48 +7223,24 @@ public final class KotlinIr { /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public java.util.List getFileList() { return java.util.Collections.unmodifiableList(file_); } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public int getFileCount() { return file_.size(); } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile getFile(int index) { return file_.get(index); } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder setFile( int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile value) { @@ -7326,12 +7254,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder setFile( int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile.Builder builderForValue) { @@ -7342,12 +7264,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder addFile(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile value) { if (value == null) { @@ -7360,12 +7276,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder addFile( int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile value) { @@ -7379,12 +7289,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder addFile( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile.Builder builderForValue) { @@ -7395,12 +7299,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder addFile( int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFile.Builder builderForValue) { @@ -7411,12 +7309,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder addAllFile( java.lang.Iterable values) { @@ -7428,12 +7320,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder clearFile() { file_ = java.util.Collections.emptyList(); @@ -7443,12 +7329,6 @@ public final class KotlinIr { } /** * repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2; - * - * 
-       *required IrSymbolTable symbol_table = 3;
-       *required IrTypeTable type_table = 4;
-       *required StringTable string_table = 5;
-       *
*/ public Builder removeFile(int index) { ensureFileIsMutable(); @@ -7515,7 +7395,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -7885,7 +7765,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -8365,7 +8245,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -9211,7 +9091,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -9576,7 +9456,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -10069,7 +9949,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -10562,7 +10442,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -11050,7 +10930,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -11411,7 +11291,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -11911,7 +11791,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -12507,7 +12387,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -13317,7 +13197,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -13721,7 +13601,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -14143,7 +14023,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -14846,7 +14726,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -15334,7 +15214,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -15703,7 +15583,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -16194,7 +16074,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -16834,7 +16714,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -17716,7 +17596,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -18645,7 +18525,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -19265,7 +19145,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -19943,7 +19823,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -20864,7 +20744,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -21871,7 +21751,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -22488,7 +22368,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -23094,7 +22974,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -24241,7 +24121,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -24727,7 +24607,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -25252,7 +25132,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -25665,7 +25545,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -26190,7 +26070,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -26594,7 +26474,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -27016,7 +26896,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -27663,7 +27543,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -28193,7 +28073,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -28714,7 +28594,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -29118,7 +28998,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -29558,7 +29438,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -30399,7 +30279,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -30942,7 +30822,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -31602,7 +31482,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -32253,7 +32133,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -32783,7 +32663,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -33271,7 +33151,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -33698,7 +33578,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -34445,7 +34325,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -35071,7 +34951,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -35692,7 +35572,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -36282,7 +36162,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -36890,7 +36770,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -37303,7 +37183,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -37851,7 +37731,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -39142,7 +39022,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -43401,7 +43281,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -44047,7 +43927,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -44400,284 +44280,8 @@ public final class KotlinIr { // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.NullableIrExpression) } - public interface IrTypeAliasOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias) - org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { - } - /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias} - * - * 
-   * Nothing for now.
-   *
- */ - public static final class IrTypeAlias extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias) - IrTypeAliasOrBuilder { - // Use IrTypeAlias.newBuilder() to construct. - private IrTypeAlias(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private IrTypeAlias(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - - private static final IrTypeAlias defaultInstance; - public static IrTypeAlias getDefaultInstance() { - return defaultInstance; - } - - public IrTypeAlias getDefaultInstanceForType() { - return defaultInstance; - } - - private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private IrTypeAlias( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } 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 PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public IrTypeAlias parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new IrTypeAlias(input, extensionRegistry); - } - }; - - @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { - return PARSER; - } - - private void initFields() { - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - output.writeRawBytes(unknownFields); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - 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.KotlinIr.IrTypeAlias 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.KotlinIr.IrTypeAlias 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.KotlinIr.IrTypeAlias parseFrom(byte[] data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias 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.KotlinIr.IrTypeAlias parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias 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.KotlinIr.IrTypeAlias parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias 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.KotlinIr.IrTypeAlias parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias 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.KotlinIr.IrTypeAlias prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias} - * - * 
-     * Nothing for now.
-     *
- */ - public static final class Builder extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias, Builder> - implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias) - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAliasOrBuilder { - // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias getDefaultInstanceForType() { - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.getDefaultInstance(); - } - - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias build() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias buildPartial() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias(this); - return result; - } - - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.getDefaultInstance()) return this; - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); - return this; - } - - public final boolean isInitialized() { - 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.KotlinIr.IrTypeAlias parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias) - } - - static { - defaultInstance = new IrTypeAlias(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias) - } - - public interface IrFunctionOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + public interface IrDeclarationBaseOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase) org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** @@ -44690,92 +44294,57 @@ public final class KotlinIr { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - boolean hasBase(); + boolean hasOrigin(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin getOrigin(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - boolean hasModality(); + boolean hasCoordinates(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind getModality(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates getCoordinates(); /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - boolean hasIsTailrec(); + boolean hasAnnotations(); /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - boolean getIsTailrec(); - - /** - * required bool is_suspend = 5; - */ - boolean hasIsSuspend(); - /** - * required bool is_suspend = 5; - */ - boolean getIsSuspend(); - - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - java.util.List - getOverriddenList(); - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getOverridden(int index); - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - int getOverriddenCount(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations getAnnotations(); } /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrFunction} + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase} */ - public static final class IrFunction extends + public static final class IrDeclarationBase extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrFunction) - IrFunctionOrBuilder { - // Use IrFunction.newBuilder() to construct. - private IrFunction(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase) + IrDeclarationBaseOrBuilder { + // Use IrDeclarationBase.newBuilder() to construct. + private IrDeclarationBase(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private IrFunction(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + private IrDeclarationBase(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - private static final IrFunction defaultInstance; - public static IrFunction getDefaultInstance() { + private static final IrDeclarationBase defaultInstance; + public static IrDeclarationBase getDefaultInstance() { return defaultInstance; } - public IrFunction getDefaultInstanceForType() { + public IrDeclarationBase getDefaultInstanceForType() { return defaultInstance; } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private IrFunction( + private IrDeclarationBase( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { @@ -44785,7 +44354,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -44815,46 +44384,42 @@ public final class KotlinIr { break; } case 18: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = base_.toBuilder(); + subBuilder = origin_.toBuilder(); } - base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.PARSER, extensionRegistry); + origin_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(base_); - base_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(origin_); + origin_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000002; break; } - case 24: { - int rawValue = input.readEnum(); - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind value = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.valueOf(rawValue); - if (value == null) { - unknownFieldsCodedOutput.writeRawVarint32(tag); - unknownFieldsCodedOutput.writeRawVarint32(rawValue); - } else { - bitField0_ |= 0x00000004; - modality_ = value; + case 26: { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.Builder subBuilder = null; + if (((bitField0_ & 0x00000004) == 0x00000004)) { + subBuilder = coordinates_.toBuilder(); } + coordinates_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(coordinates_); + coordinates_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000004; break; } - case 32: { + case 34: { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.Builder subBuilder = null; + if (((bitField0_ & 0x00000008) == 0x00000008)) { + subBuilder = annotations_.toBuilder(); + } + annotations_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(annotations_); + annotations_ = subBuilder.buildPartial(); + } bitField0_ |= 0x00000008; - isTailrec_ = input.readBool(); - break; - } - case 40: { - bitField0_ |= 0x00000010; - isSuspend_ = input.readBool(); - break; - } - case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - overridden_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; - } - overridden_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry)); break; } } @@ -44865,9 +44430,6 @@ public final class KotlinIr { throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - overridden_ = java.util.Collections.unmodifiableList(overridden_); - } try { unknownFieldsCodedOutput.flush(); } catch (java.io.IOException e) { @@ -44878,18 +44440,18 @@ public final class KotlinIr { makeExtensionsImmutable(); } } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public IrFunction parsePartialFrom( + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public IrDeclarationBase parsePartialFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new IrFunction(input, extensionRegistry); + return new IrDeclarationBase(input, extensionRegistry); } }; @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { return PARSER; } @@ -44909,128 +44471,56 @@ public final class KotlinIr { return symbol_; } - public static final int BASE_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_; + public static final int ORIGIN_FIELD_NUMBER = 2; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin origin_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public boolean hasBase() { + public boolean hasOrigin() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase() { - return base_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin getOrigin() { + return origin_; } - public static final int MODALITY_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind modality_; + public static final int COORDINATES_FIELD_NUMBER = 3; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates coordinates_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - public boolean hasModality() { + public boolean hasCoordinates() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind getModality() { - return modality_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates getCoordinates() { + return coordinates_; } - public static final int IS_TAILREC_FIELD_NUMBER = 4; - private boolean isTailrec_; + public static final int ANNOTATIONS_FIELD_NUMBER = 4; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations annotations_; /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - public boolean hasIsTailrec() { + public boolean hasAnnotations() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - public boolean getIsTailrec() { - return isTailrec_; - } - - public static final int IS_SUSPEND_FIELD_NUMBER = 5; - private boolean isSuspend_; - /** - * required bool is_suspend = 5; - */ - public boolean hasIsSuspend() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * required bool is_suspend = 5; - */ - public boolean getIsSuspend() { - return isSuspend_; - } - - public static final int OVERRIDDEN_FIELD_NUMBER = 6; - private java.util.List overridden_; - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - public java.util.List getOverriddenList() { - return overridden_; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - public java.util.List - getOverriddenOrBuilderList() { - return overridden_; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - public int getOverriddenCount() { - return overridden_.size(); - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getOverridden(int index) { - return overridden_.get(index); - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-     *optional UniqId corresponding_property = 7;
-     *
- */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbolOrBuilder getOverriddenOrBuilder( - int index) { - return overridden_.get(index); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations getAnnotations() { + return annotations_; } private void initFields() { symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); - modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; - isTailrec_ = false; - isSuspend_ = false; - overridden_ = java.util.Collections.emptyList(); + origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); + coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); + annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -45042,19 +44532,15 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!hasBase()) { + if (!hasOrigin()) { memoizedIsInitialized = 0; return false; } - if (!hasModality()) { + if (!hasCoordinates()) { memoizedIsInitialized = 0; return false; } - if (!hasIsTailrec()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasIsSuspend()) { + if (!hasAnnotations()) { memoizedIsInitialized = 0; return false; } @@ -45062,15 +44548,17 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getBase().isInitialized()) { + if (!getOrigin().isInitialized()) { memoizedIsInitialized = 0; return false; } - for (int i = 0; i < getOverriddenCount(); i++) { - if (!getOverridden(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } + if (!getCoordinates().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + if (!getAnnotations().isInitialized()) { + memoizedIsInitialized = 0; + return false; } memoizedIsInitialized = 1; return true; @@ -45083,19 +44571,13 @@ public final class KotlinIr { output.writeMessage(1, symbol_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, base_); + output.writeMessage(2, origin_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeEnum(3, modality_.getNumber()); + output.writeMessage(3, coordinates_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBool(4, isTailrec_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeBool(5, isSuspend_); - } - for (int i = 0; i < overridden_.size(); i++) { - output.writeMessage(6, overridden_.get(i)); + output.writeMessage(4, annotations_); } output.writeRawBytes(unknownFields); } @@ -45112,23 +44594,15 @@ public final class KotlinIr { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, base_); + .computeMessageSize(2, origin_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeEnumSize(3, modality_.getNumber()); + .computeMessageSize(3, coordinates_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBoolSize(4, isTailrec_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBoolSize(5, isSuspend_); - } - for (int i = 0; i < overridden_.size(); i++) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(6, overridden_.get(i)); + .computeMessageSize(4, annotations_); } size += unknownFields.size(); memoizedSerializedSize = size; @@ -45142,53 +44616,53 @@ public final class KotlinIr { return super.writeReplace(); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase 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.KotlinIr.IrFunction parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase 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.KotlinIr.IrFunction parseFrom(byte[] data) + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase 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.KotlinIr.IrFunction parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase 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.KotlinIr.IrFunction parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parseDelimitedFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase 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.KotlinIr.IrFunction parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -45197,21 +44671,21 @@ public final class KotlinIr { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrFunction} + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction, Builder> + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase, Builder> implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrFunction) - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionOrBuilder { - // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.newBuilder() + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase) + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBaseOrBuilder { + // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -45226,16 +44700,12 @@ public final class KotlinIr { super.clear(); symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); - base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); - modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; + coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); - isTailrec_ = false; + annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); - isSuspend_ = false; - bitField0_ = (bitField0_ & ~0x00000010); - overridden_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -45243,20 +44713,20 @@ public final class KotlinIr { return create().mergeFrom(buildPartial()); } - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getDefaultInstanceForType() { - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getDefaultInstanceForType() { + return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); } - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction build() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction result = buildPartial(); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase build() { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction buildPartial() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction(this); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase buildPartial() { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -45266,54 +44736,32 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.base_ = base_; + result.origin_ = origin_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.modality_ = modality_; + result.coordinates_ = coordinates_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.isTailrec_ = isTailrec_; - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000010; - } - result.isSuspend_ = isSuspend_; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - overridden_ = java.util.Collections.unmodifiableList(overridden_); - bitField0_ = (bitField0_ & ~0x00000020); - } - result.overridden_ = overridden_; + result.annotations_ = annotations_; result.bitField0_ = to_bitField0_; return result; } - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) return this; if (other.hasSymbol()) { mergeSymbol(other.getSymbol()); } - if (other.hasBase()) { - mergeBase(other.getBase()); + if (other.hasOrigin()) { + mergeOrigin(other.getOrigin()); } - if (other.hasModality()) { - setModality(other.getModality()); + if (other.hasCoordinates()) { + mergeCoordinates(other.getCoordinates()); } - if (other.hasIsTailrec()) { - setIsTailrec(other.getIsTailrec()); - } - if (other.hasIsSuspend()) { - setIsSuspend(other.getIsSuspend()); - } - if (!other.overridden_.isEmpty()) { - if (overridden_.isEmpty()) { - overridden_ = other.overridden_; - bitField0_ = (bitField0_ & ~0x00000020); - } else { - ensureOverriddenIsMutable(); - overridden_.addAll(other.overridden_); - } - + if (other.hasAnnotations()) { + mergeAnnotations(other.getAnnotations()); } setUnknownFields( getUnknownFields().concat(other.unknownFields)); @@ -45325,19 +44773,15 @@ public final class KotlinIr { return false; } - if (!hasBase()) { + if (!hasOrigin()) { return false; } - if (!hasModality()) { + if (!hasCoordinates()) { return false; } - if (!hasIsTailrec()) { - - return false; - } - if (!hasIsSuspend()) { + if (!hasAnnotations()) { return false; } @@ -45345,15 +44789,17 @@ public final class KotlinIr { return false; } - if (!getBase().isInitialized()) { + if (!getOrigin().isInitialized()) { return false; } - for (int i = 0; i < getOverriddenCount(); i++) { - if (!getOverridden(i).isInitialized()) { - - return false; - } + if (!getCoordinates().isInitialized()) { + + return false; + } + if (!getAnnotations().isInitialized()) { + + return false; } return true; } @@ -45362,11 +44808,11 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parsedMessage = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -45437,347 +44883,195 @@ public final class KotlinIr { return this; } - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public boolean hasBase() { + public boolean hasOrigin() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase() { - return base_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin getOrigin() { + return origin_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase value) { + public Builder setOrigin(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin value) { if (value == null) { throw new NullPointerException(); } - base_ = value; + origin_ = value; bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public Builder setBase( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.Builder builderForValue) { - base_ = builderForValue.build(); + public Builder setOrigin( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.Builder builderForValue) { + origin_ = builderForValue.build(); bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase value) { + public Builder mergeOrigin(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin value) { if (((bitField0_ & 0x00000002) == 0x00000002) && - base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance()) { - base_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.newBuilder(base_).mergeFrom(value).buildPartial(); + origin_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance()) { + origin_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.newBuilder(origin_).mergeFrom(value).buildPartial(); } else { - base_ = value; + origin_ = value; } bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 2; */ - public Builder clearBase() { - base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + public Builder clearOrigin() { + origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); return this; } - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - public boolean hasModality() { + public boolean hasCoordinates() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind getModality() { - return modality_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates getCoordinates() { + return coordinates_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - public Builder setModality(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind value) { + public Builder setCoordinates(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates value) { if (value == null) { throw new NullPointerException(); } + coordinates_ = value; + bitField0_ |= 0x00000004; - modality_ = value; - return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 3; + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; */ - public Builder clearModality() { + public Builder setCoordinates( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.Builder builderForValue) { + coordinates_ = builderForValue.build(); + + bitField0_ |= 0x00000004; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; + */ + public Builder mergeCoordinates(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates value) { + if (((bitField0_ & 0x00000004) == 0x00000004) && + coordinates_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance()) { + coordinates_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.newBuilder(coordinates_).mergeFrom(value).buildPartial(); + } else { + coordinates_ = value; + } + + bitField0_ |= 0x00000004; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 3; + */ + public Builder clearCoordinates() { + coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000004); - modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; - return this; } - private boolean isTailrec_ ; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - public boolean hasIsTailrec() { + public boolean hasAnnotations() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - public boolean getIsTailrec() { - return isTailrec_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations getAnnotations() { + return annotations_; } /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - public Builder setIsTailrec(boolean value) { + public Builder setAnnotations(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations value) { + if (value == null) { + throw new NullPointerException(); + } + annotations_ = value; + bitField0_ |= 0x00000008; - isTailrec_ = value; - return this; } /** - * required bool is_tailrec = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; */ - public Builder clearIsTailrec() { + public Builder setAnnotations( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.Builder builderForValue) { + annotations_ = builderForValue.build(); + + bitField0_ |= 0x00000008; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; + */ + public Builder mergeAnnotations(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations value) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + annotations_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance()) { + annotations_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.newBuilder(annotations_).mergeFrom(value).buildPartial(); + } else { + annotations_ = value; + } + + bitField0_ |= 0x00000008; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 4; + */ + public Builder clearAnnotations() { + annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000008); - isTailrec_ = false; - return this; } - private boolean isSuspend_ ; - /** - * required bool is_suspend = 5; - */ - public boolean hasIsSuspend() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * required bool is_suspend = 5; - */ - public boolean getIsSuspend() { - return isSuspend_; - } - /** - * required bool is_suspend = 5; - */ - public Builder setIsSuspend(boolean value) { - bitField0_ |= 0x00000010; - isSuspend_ = value; - - return this; - } - /** - * required bool is_suspend = 5; - */ - public Builder clearIsSuspend() { - bitField0_ = (bitField0_ & ~0x00000010); - isSuspend_ = false; - - return this; - } - - private java.util.List overridden_ = - java.util.Collections.emptyList(); - private void ensureOverriddenIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { - overridden_ = new java.util.ArrayList(overridden_); - bitField0_ |= 0x00000020; - } - } - - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public java.util.List getOverriddenList() { - return java.util.Collections.unmodifiableList(overridden_); - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public int getOverriddenCount() { - return overridden_.size(); - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getOverridden(int index) { - return overridden_.get(index); - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder setOverridden( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (value == null) { - throw new NullPointerException(); - } - ensureOverriddenIsMutable(); - overridden_.set(index, value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder setOverridden( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - ensureOverriddenIsMutable(); - overridden_.set(index, builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder addOverridden(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (value == null) { - throw new NullPointerException(); - } - ensureOverriddenIsMutable(); - overridden_.add(value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder addOverridden( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (value == null) { - throw new NullPointerException(); - } - ensureOverriddenIsMutable(); - overridden_.add(index, value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder addOverridden( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - ensureOverriddenIsMutable(); - overridden_.add(builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder addOverridden( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - ensureOverriddenIsMutable(); - overridden_.add(index, builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder addAllOverridden( - java.lang.Iterable values) { - ensureOverriddenIsMutable(); - org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( - values, overridden_); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder clearOverridden() { - overridden_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 6; - * - * 
-       *optional UniqId corresponding_property = 7;
-       *
- */ - public Builder removeOverridden(int index) { - ensureOverriddenIsMutable(); - overridden_.remove(index); - - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase) } static { - defaultInstance = new IrFunction(true); + defaultInstance = new IrDeclarationBase(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase) } public interface IrFunctionBaseOrBuilder extends @@ -45785,97 +45079,106 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + boolean hasBase(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ boolean hasName(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ boolean hasVisibility(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility getVisibility(); /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ boolean hasIsInline(); /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ boolean getIsInline(); /** - * required bool is_external = 4; + * required bool is_external = 5; */ boolean hasIsExternal(); /** - * required bool is_external = 4; + * required bool is_external = 5; */ boolean getIsExternal(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ boolean hasTypeParameters(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer getTypeParameters(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ boolean hasDispatchReceiver(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getDispatchReceiver(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getDispatchReceiver(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; */ boolean hasExtensionReceiver(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getExtensionReceiver(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getExtensionReceiver(); /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - java.util.List + java.util.List getValueParameterList(); /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getValueParameter(int index); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getValueParameter(int index); /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ int getValueParameterCount(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ boolean hasBody(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement getBody(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ boolean hasReturnType(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex getReturnType(); } @@ -45913,7 +45216,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -45930,8 +45233,21 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = base_.toBuilder(); + } + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = name_.toBuilder(); } name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry); @@ -45939,12 +45255,12 @@ public final class KotlinIr { subBuilder.mergeFrom(name_); name_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; break; } - case 18: { + case 26: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = visibility_.toBuilder(); } visibility_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.PARSER, extensionRegistry); @@ -45952,22 +45268,22 @@ public final class KotlinIr { subBuilder.mergeFrom(visibility_); visibility_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000002; - break; - } - case 24: { bitField0_ |= 0x00000004; - isInline_ = input.readBool(); break; } case 32: { bitField0_ |= 0x00000008; + isInline_ = input.readBool(); + break; + } + case 40: { + bitField0_ |= 0x00000010; isExternal_ = input.readBool(); break; } - case 42: { + case 50: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = typeParameters_.toBuilder(); } typeParameters_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.PARSER, extensionRegistry); @@ -45975,46 +45291,46 @@ public final class KotlinIr { subBuilder.mergeFrom(typeParameters_); typeParameters_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; - break; - } - case 50: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - subBuilder = dispatchReceiver_.toBuilder(); - } - dispatchReceiver_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(dispatchReceiver_); - dispatchReceiver_ = subBuilder.buildPartial(); - } bitField0_ |= 0x00000020; break; } case 58: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { - subBuilder = extensionReceiver_.toBuilder(); + subBuilder = dispatchReceiver_.toBuilder(); } - extensionReceiver_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry); + dispatchReceiver_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(extensionReceiver_); - extensionReceiver_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(dispatchReceiver_); + dispatchReceiver_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000040; break; } case 66: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000080; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder subBuilder = null; + if (((bitField0_ & 0x00000080) == 0x00000080)) { + subBuilder = extensionReceiver_.toBuilder(); } - valueParameter_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry)); + extensionReceiver_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(extensionReceiver_); + extensionReceiver_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000080; break; } case 74: { + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + valueParameter_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000100; + } + valueParameter_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.PARSER, extensionRegistry)); + break; + } + case 82: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.Builder subBuilder = null; - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = body_.toBuilder(); } body_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.PARSER, extensionRegistry); @@ -46022,12 +45338,12 @@ public final class KotlinIr { subBuilder.mergeFrom(body_); body_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; break; } - case 82: { + case 90: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.Builder subBuilder = null; - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = returnType_.toBuilder(); } returnType_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.PARSER, extensionRegistry); @@ -46035,7 +45351,7 @@ public final class KotlinIr { subBuilder.mergeFrom(returnType_); returnType_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; break; } } @@ -46046,7 +45362,7 @@ public final class KotlinIr { throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); } try { @@ -46075,184 +45391,200 @@ public final class KotlinIr { } private int bitField0_; - public static final int NAME_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasName() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; + } + + public static final int NAME_FIELD_NUMBER = 2; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_; + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { return name_; } - public static final int VISIBILITY_FIELD_NUMBER = 2; + public static final int VISIBILITY_FIELD_NUMBER = 3; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility visibility_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public boolean hasVisibility() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility getVisibility() { return visibility_; } - public static final int IS_INLINE_FIELD_NUMBER = 3; + public static final int IS_INLINE_FIELD_NUMBER = 4; private boolean isInline_; /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ public boolean hasIsInline() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ public boolean getIsInline() { return isInline_; } - public static final int IS_EXTERNAL_FIELD_NUMBER = 4; + public static final int IS_EXTERNAL_FIELD_NUMBER = 5; private boolean isExternal_; /** - * required bool is_external = 4; + * required bool is_external = 5; */ public boolean hasIsExternal() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * required bool is_external = 4; + * required bool is_external = 5; */ public boolean getIsExternal() { return isExternal_; } - public static final int TYPE_PARAMETERS_FIELD_NUMBER = 5; + public static final int TYPE_PARAMETERS_FIELD_NUMBER = 6; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer typeParameters_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public boolean hasTypeParameters() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer getTypeParameters() { return typeParameters_; } - public static final int DISPATCH_RECEIVER_FIELD_NUMBER = 6; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration dispatchReceiver_; + public static final int DISPATCH_RECEIVER_FIELD_NUMBER = 7; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter dispatchReceiver_; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ public boolean hasDispatchReceiver() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getDispatchReceiver() { - return dispatchReceiver_; - } - - public static final int EXTENSION_RECEIVER_FIELD_NUMBER = 7; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration extensionReceiver_; - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; - */ - public boolean hasExtensionReceiver() { return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getExtensionReceiver() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getDispatchReceiver() { + return dispatchReceiver_; + } + + public static final int EXTENSION_RECEIVER_FIELD_NUMBER = 8; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter extensionReceiver_; + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public boolean hasExtensionReceiver() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getExtensionReceiver() { return extensionReceiver_; } - public static final int VALUE_PARAMETER_FIELD_NUMBER = 8; - private java.util.List valueParameter_; + public static final int VALUE_PARAMETER_FIELD_NUMBER = 9; + private java.util.List valueParameter_; /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public java.util.List getValueParameterList() { + public java.util.List getValueParameterList() { return valueParameter_; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public java.util.List + public java.util.List getValueParameterOrBuilderList() { return valueParameter_; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public int getValueParameterCount() { return valueParameter_.size(); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getValueParameter(int index) { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getValueParameter(int index) { return valueParameter_.get(index); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrBuilder getValueParameterOrBuilder( + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameterOrBuilder getValueParameterOrBuilder( int index) { return valueParameter_.get(index); } - public static final int BODY_FIELD_NUMBER = 9; + public static final int BODY_FIELD_NUMBER = 10; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement body_; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public boolean hasBody() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement getBody() { return body_; } - public static final int RETURN_TYPE_FIELD_NUMBER = 10; + public static final int RETURN_TYPE_FIELD_NUMBER = 11; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex returnType_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex getReturnType() { return returnType_; } private void initFields() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); isInline_ = false; isExternal_ = false; typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); - dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); - extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); + extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); valueParameter_ = java.util.Collections.emptyList(); body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); returnType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); @@ -46263,6 +45595,10 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; + if (!hasBase()) { + memoizedIsInitialized = 0; + return false; + } if (!hasName()) { memoizedIsInitialized = 0; return false; @@ -46287,6 +45623,10 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } + if (!getBase().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } if (!getName().isInitialized()) { memoizedIsInitialized = 0; return false; @@ -46335,34 +45675,37 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, name_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, visibility_); + output.writeMessage(2, name_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, isInline_); + output.writeMessage(3, visibility_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBool(4, isExternal_); + output.writeBool(4, isInline_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, typeParameters_); + output.writeBool(5, isExternal_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(6, dispatchReceiver_); + output.writeMessage(6, typeParameters_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(7, extensionReceiver_); - } - for (int i = 0; i < valueParameter_.size(); i++) { - output.writeMessage(8, valueParameter_.get(i)); + output.writeMessage(7, dispatchReceiver_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { - output.writeMessage(9, body_); + output.writeMessage(8, extensionReceiver_); + } + for (int i = 0; i < valueParameter_.size(); i++) { + output.writeMessage(9, valueParameter_.get(i)); } if (((bitField0_ & 0x00000100) == 0x00000100)) { - output.writeMessage(10, returnType_); + output.writeMessage(10, body_); + } + if (((bitField0_ & 0x00000200) == 0x00000200)) { + output.writeMessage(11, returnType_); } output.writeRawBytes(unknownFields); } @@ -46375,43 +45718,47 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, name_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, visibility_); + .computeMessageSize(2, name_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBoolSize(3, isInline_); + .computeMessageSize(3, visibility_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBoolSize(4, isExternal_); + .computeBoolSize(4, isInline_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(5, typeParameters_); + .computeBoolSize(5, isExternal_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(6, dispatchReceiver_); + .computeMessageSize(6, typeParameters_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(7, extensionReceiver_); - } - for (int i = 0; i < valueParameter_.size(); i++) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(8, valueParameter_.get(i)); + .computeMessageSize(7, dispatchReceiver_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(9, body_); + .computeMessageSize(8, extensionReceiver_); + } + for (int i = 0; i < valueParameter_.size(); i++) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(9, valueParameter_.get(i)); } if (((bitField0_ & 0x00000100) == 0x00000100)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(10, returnType_); + .computeMessageSize(10, body_); + } + if (((bitField0_ & 0x00000200) == 0x00000200)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(11, returnType_); } size += unknownFields.size(); memoizedSerializedSize = size; @@ -46507,26 +45854,28 @@ public final class KotlinIr { public Builder clear() { super.clear(); - name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); - visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); + name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); - isInline_ = false; + visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); - isExternal_ = false; + isInline_ = false; bitField0_ = (bitField0_ & ~0x00000008); - typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); + isExternal_ = false; bitField0_ = (bitField0_ & ~0x00000010); - dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000020); - extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000040); - valueParameter_ = java.util.Collections.emptyList(); + extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000080); - body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); + valueParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000100); - returnType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); + body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000200); + returnType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000400); return this; } @@ -46553,43 +45902,47 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.visibility_ = visibility_; + result.name_ = name_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.isInline_ = isInline_; + result.visibility_ = visibility_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.isExternal_ = isExternal_; + result.isInline_ = isInline_; if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.typeParameters_ = typeParameters_; + result.isExternal_ = isExternal_; if (((from_bitField0_ & 0x00000020) == 0x00000020)) { to_bitField0_ |= 0x00000020; } - result.dispatchReceiver_ = dispatchReceiver_; + result.typeParameters_ = typeParameters_; if (((from_bitField0_ & 0x00000040) == 0x00000040)) { to_bitField0_ |= 0x00000040; } - result.extensionReceiver_ = extensionReceiver_; - if (((bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); - bitField0_ = (bitField0_ & ~0x00000080); - } - result.valueParameter_ = valueParameter_; - if (((from_bitField0_ & 0x00000100) == 0x00000100)) { + result.dispatchReceiver_ = dispatchReceiver_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { to_bitField0_ |= 0x00000080; } - result.body_ = body_; + result.extensionReceiver_ = extensionReceiver_; + if (((bitField0_ & 0x00000100) == 0x00000100)) { + valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); + bitField0_ = (bitField0_ & ~0x00000100); + } + result.valueParameter_ = valueParameter_; if (((from_bitField0_ & 0x00000200) == 0x00000200)) { to_bitField0_ |= 0x00000100; } + result.body_ = body_; + if (((from_bitField0_ & 0x00000400) == 0x00000400)) { + to_bitField0_ |= 0x00000200; + } result.returnType_ = returnType_; result.bitField0_ = to_bitField0_; return result; @@ -46597,6 +45950,9 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance()) return this; + if (other.hasBase()) { + mergeBase(other.getBase()); + } if (other.hasName()) { mergeName(other.getName()); } @@ -46621,7 +45977,7 @@ public final class KotlinIr { if (!other.valueParameter_.isEmpty()) { if (valueParameter_.isEmpty()) { valueParameter_ = other.valueParameter_; - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureValueParameterIsMutable(); valueParameter_.addAll(other.valueParameter_); @@ -46640,6 +45996,10 @@ public final class KotlinIr { } public final boolean isInitialized() { + if (!hasBase()) { + + return false; + } if (!hasName()) { return false; @@ -46664,6 +46024,10 @@ public final class KotlinIr { return false; } + if (!getBase().isInitialized()) { + + return false; + } if (!getName().isInitialized()) { return false; @@ -46726,21 +46090,81 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasName() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { + if (value == null) { + throw new NullPointerException(); + } + base_ = value; + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); + } else { + base_ = value; + } + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { return name_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) { if (value == null) { @@ -46748,24 +46172,24 @@ public final class KotlinIr { } name_ = value; - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder setName( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) { name_ = builderForValue.build(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) { - if (((bitField0_ & 0x00000001) == 0x00000001) && + if (((bitField0_ & 0x00000002) == 0x00000002) && name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) { name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial(); @@ -46773,34 +46197,34 @@ public final class KotlinIr { name_ = value; } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder clearName() { name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public boolean hasVisibility() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility getVisibility() { return visibility_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public Builder setVisibility(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility value) { if (value == null) { @@ -46808,24 +46232,24 @@ public final class KotlinIr { } visibility_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public Builder setVisibility( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.Builder builderForValue) { visibility_ = builderForValue.build(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public Builder mergeVisibility(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && + if (((bitField0_ & 0x00000004) == 0x00000004) && visibility_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance()) { visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.newBuilder(visibility_).mergeFrom(value).buildPartial(); @@ -46833,46 +46257,46 @@ public final class KotlinIr { visibility_ = value; } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3; */ public Builder clearVisibility() { visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); return this; } private boolean isInline_ ; /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ public boolean hasIsInline() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ public boolean getIsInline() { return isInline_; } /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ public Builder setIsInline(boolean value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; isInline_ = value; return this; } /** - * required bool is_inline = 3; + * required bool is_inline = 4; */ public Builder clearIsInline() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); isInline_ = false; return this; @@ -46880,31 +46304,31 @@ public final class KotlinIr { private boolean isExternal_ ; /** - * required bool is_external = 4; + * required bool is_external = 5; */ public boolean hasIsExternal() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * required bool is_external = 4; + * required bool is_external = 5; */ public boolean getIsExternal() { return isExternal_; } /** - * required bool is_external = 4; + * required bool is_external = 5; */ public Builder setIsExternal(boolean value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; isExternal_ = value; return this; } /** - * required bool is_external = 4; + * required bool is_external = 5; */ public Builder clearIsExternal() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); isExternal_ = false; return this; @@ -46912,19 +46336,19 @@ public final class KotlinIr { private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public boolean hasTypeParameters() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer getTypeParameters() { return typeParameters_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public Builder setTypeParameters(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer value) { if (value == null) { @@ -46932,24 +46356,24 @@ public final class KotlinIr { } typeParameters_ = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public Builder setTypeParameters( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.Builder builderForValue) { typeParameters_ = builderForValue.build(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public Builder mergeTypeParameters(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer value) { - if (((bitField0_ & 0x00000010) == 0x00000010) && + if (((bitField0_ & 0x00000020) == 0x00000020) && typeParameters_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance()) { typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.newBuilder(typeParameters_).mergeFrom(value).buildPartial(); @@ -46957,171 +46381,171 @@ public final class KotlinIr { typeParameters_ = value; } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 5; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 6; */ public Builder clearTypeParameters() { typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000010); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public boolean hasDispatchReceiver() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getDispatchReceiver() { - return dispatchReceiver_; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public Builder setDispatchReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { - if (value == null) { - throw new NullPointerException(); - } - dispatchReceiver_ = value; - - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public Builder setDispatchReceiver( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { - dispatchReceiver_ = builderForValue.build(); - - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public Builder mergeDispatchReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { - if (((bitField0_ & 0x00000020) == 0x00000020) && - dispatchReceiver_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) { - dispatchReceiver_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder(dispatchReceiver_).mergeFrom(value).buildPartial(); - } else { - dispatchReceiver_ = value; - } - - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration dispatch_receiver = 6; - */ - public Builder clearDispatchReceiver() { - dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); return this; } - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public boolean hasExtensionReceiver() { + public boolean hasDispatchReceiver() { return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getExtensionReceiver() { - return extensionReceiver_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getDispatchReceiver() { + return dispatchReceiver_; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public Builder setExtensionReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder setDispatchReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (value == null) { throw new NullPointerException(); } - extensionReceiver_ = value; + dispatchReceiver_ = value; bitField0_ |= 0x00000040; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public Builder setExtensionReceiver( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { - extensionReceiver_ = builderForValue.build(); + public Builder setDispatchReceiver( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { + dispatchReceiver_ = builderForValue.build(); bitField0_ |= 0x00000040; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public Builder mergeExtensionReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder mergeDispatchReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (((bitField0_ & 0x00000040) == 0x00000040) && - extensionReceiver_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) { - extensionReceiver_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder(extensionReceiver_).mergeFrom(value).buildPartial(); + dispatchReceiver_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance()) { + dispatchReceiver_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.newBuilder(dispatchReceiver_).mergeFrom(value).buildPartial(); } else { - extensionReceiver_ = value; + dispatchReceiver_ = value; } bitField0_ |= 0x00000040; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration extension_receiver = 7; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter dispatch_receiver = 7; */ - public Builder clearExtensionReceiver() { - extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + public Builder clearDispatchReceiver() { + dispatchReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000040); return this; } - private java.util.List valueParameter_ = + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public boolean hasExtensionReceiver() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getExtensionReceiver() { + return extensionReceiver_; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public Builder setExtensionReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { + if (value == null) { + throw new NullPointerException(); + } + extensionReceiver_ = value; + + bitField0_ |= 0x00000080; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public Builder setExtensionReceiver( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { + extensionReceiver_ = builderForValue.build(); + + bitField0_ |= 0x00000080; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public Builder mergeExtensionReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { + if (((bitField0_ & 0x00000080) == 0x00000080) && + extensionReceiver_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance()) { + extensionReceiver_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.newBuilder(extensionReceiver_).mergeFrom(value).buildPartial(); + } else { + extensionReceiver_ = value; + } + + bitField0_ |= 0x00000080; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter extension_receiver = 8; + */ + public Builder clearExtensionReceiver() { + extensionReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000080); + return this; + } + + private java.util.List valueParameter_ = java.util.Collections.emptyList(); private void ensureValueParameterIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = new java.util.ArrayList(valueParameter_); - bitField0_ |= 0x00000080; + if (!((bitField0_ & 0x00000100) == 0x00000100)) { + valueParameter_ = new java.util.ArrayList(valueParameter_); + bitField0_ |= 0x00000100; } } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public java.util.List getValueParameterList() { + public java.util.List getValueParameterList() { return java.util.Collections.unmodifiableList(valueParameter_); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public int getValueParameterCount() { return valueParameter_.size(); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getValueParameter(int index) { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getValueParameter(int index) { return valueParameter_.get(index); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder setValueParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (value == null) { throw new NullPointerException(); } @@ -47131,19 +46555,19 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder setValueParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { ensureValueParameterIsMutable(); valueParameter_.set(index, builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ - public Builder addValueParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder addValueParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (value == null) { throw new NullPointerException(); } @@ -47153,10 +46577,10 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder addValueParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (value == null) { throw new NullPointerException(); } @@ -47166,30 +46590,30 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder addValueParameter( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { ensureValueParameterIsMutable(); valueParameter_.add(builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder addValueParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { ensureValueParameterIsMutable(); valueParameter_.add(index, builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder addAllValueParameter( - java.lang.Iterable values) { + java.lang.Iterable values) { ensureValueParameterIsMutable(); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( values, valueParameter_); @@ -47197,16 +46621,16 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder clearValueParameter() { valueParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration value_parameter = 8; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter value_parameter = 9; */ public Builder removeValueParameter(int index) { ensureValueParameterIsMutable(); @@ -47217,19 +46641,19 @@ public final class KotlinIr { private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public boolean hasBody() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement getBody() { return body_; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public Builder setBody(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement value) { if (value == null) { @@ -47237,24 +46661,24 @@ public final class KotlinIr { } body_ = value; - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public Builder setBody( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.Builder builderForValue) { body_ = builderForValue.build(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public Builder mergeBody(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement value) { - if (((bitField0_ & 0x00000100) == 0x00000100) && + if (((bitField0_ & 0x00000200) == 0x00000200) && body_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance()) { body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.newBuilder(body_).mergeFrom(value).buildPartial(); @@ -47262,34 +46686,34 @@ public final class KotlinIr { body_ = value; } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 10; */ public Builder clearBody() { body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); return this; } private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex returnType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public boolean hasReturnType() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000400) == 0x00000400); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex getReturnType() { return returnType_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public Builder setReturnType(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex value) { if (value == null) { @@ -47297,24 +46721,24 @@ public final class KotlinIr { } returnType_ = value; - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public Builder setReturnType( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.Builder builderForValue) { returnType_ = builderForValue.build(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public Builder mergeReturnType(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex value) { - if (((bitField0_ & 0x00000200) == 0x00000200) && + if (((bitField0_ & 0x00000400) == 0x00000400) && returnType_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance()) { returnType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.newBuilder(returnType_).mergeFrom(value).buildPartial(); @@ -47322,16 +46746,16 @@ public final class KotlinIr { returnType_ = value; } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 10; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex return_type = 11; */ public Builder clearReturnType() { returnType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); return this; } @@ -47346,34 +46770,999 @@ public final class KotlinIr { // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase) } + public interface IrFunctionOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + boolean hasBase(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase(); + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + boolean hasModality(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind getModality(); + + /** + * required bool is_tailrec = 3; + */ + boolean hasIsTailrec(); + /** + * required bool is_tailrec = 3; + */ + boolean getIsTailrec(); + + /** + * required bool is_suspend = 4; + */ + boolean hasIsSuspend(); + /** + * required bool is_suspend = 4; + */ + boolean getIsSuspend(); + + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + java.util.List + getOverriddenList(); + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getOverridden(int index); + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + int getOverriddenCount(); + } + /** + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrFunction} + */ + public static final class IrFunction extends + org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + IrFunctionOrBuilder { + // Use IrFunction.newBuilder() to construct. + private IrFunction(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private IrFunction(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + + private static final IrFunction defaultInstance; + public static IrFunction getDefaultInstance() { + return defaultInstance; + } + + public IrFunction getDefaultInstanceForType() { + return defaultInstance; + } + + private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; + private IrFunction( + 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 10: { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = base_.toBuilder(); + } + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 16: { + int rawValue = input.readEnum(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind value = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.valueOf(rawValue); + if (value == null) { + unknownFieldsCodedOutput.writeRawVarint32(tag); + unknownFieldsCodedOutput.writeRawVarint32(rawValue); + } else { + bitField0_ |= 0x00000002; + modality_ = value; + } + break; + } + case 24: { + bitField0_ |= 0x00000004; + isTailrec_ = input.readBool(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + isSuspend_ = input.readBool(); + break; + } + case 42: { + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + overridden_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; + } + overridden_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry)); + break; + } + } + } + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + overridden_ = java.util.Collections.unmodifiableList(overridden_); + } + try { + unknownFieldsCodedOutput.flush(); + } catch (java.io.IOException e) { + // Should not happen + } finally { + unknownFields = unknownFieldsOutput.toByteString(); + } + makeExtensionsImmutable(); + } + } + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public IrFunction parsePartialFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return new IrFunction(input, extensionRegistry); + } + }; + + @java.lang.Override + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_; + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public boolean hasBase() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase() { + return base_; + } + + public static final int MODALITY_FIELD_NUMBER = 2; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind modality_; + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + public boolean hasModality() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind getModality() { + return modality_; + } + + public static final int IS_TAILREC_FIELD_NUMBER = 3; + private boolean isTailrec_; + /** + * required bool is_tailrec = 3; + */ + public boolean hasIsTailrec() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * required bool is_tailrec = 3; + */ + public boolean getIsTailrec() { + return isTailrec_; + } + + public static final int IS_SUSPEND_FIELD_NUMBER = 4; + private boolean isSuspend_; + /** + * required bool is_suspend = 4; + */ + public boolean hasIsSuspend() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * required bool is_suspend = 4; + */ + public boolean getIsSuspend() { + return isSuspend_; + } + + public static final int OVERRIDDEN_FIELD_NUMBER = 5; + private java.util.List overridden_; + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + public java.util.List getOverriddenList() { + return overridden_; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + public java.util.List + getOverriddenOrBuilderList() { + return overridden_; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + public int getOverriddenCount() { + return overridden_.size(); + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getOverridden(int index) { + return overridden_.get(index); + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+     *optional UniqId corresponding_property = 7;
+     *
+ */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbolOrBuilder getOverriddenOrBuilder( + int index) { + return overridden_.get(index); + } + + private void initFields() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; + isTailrec_ = false; + isSuspend_ = false; + overridden_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + if (!hasBase()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasModality()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasIsTailrec()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasIsSuspend()) { + memoizedIsInitialized = 0; + return false; + } + if (!getBase().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + for (int i = 0; i < getOverriddenCount(); i++) { + if (!getOverridden(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, base_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeEnum(2, modality_.getNumber()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBool(3, isTailrec_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeBool(4, isSuspend_); + } + for (int i = 0; i < overridden_.size(); i++) { + output.writeMessage(5, overridden_.get(i)); + } + 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 + .computeMessageSize(1, base_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeEnumSize(2, modality_.getNumber()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeBoolSize(3, isTailrec_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeBoolSize(4, isSuspend_); + } + for (int i = 0; i < overridden_.size(); i++) { + size += org.jetbrains.kotlin.protobuf.CodedOutputStream + .computeMessageSize(5, overridden_.get(i)); + } + 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.KotlinIr.IrFunction 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.KotlinIr.IrFunction 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.KotlinIr.IrFunction parseFrom(byte[] data) + throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction 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.KotlinIr.IrFunction parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction 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.KotlinIr.IrFunction parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction 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.KotlinIr.IrFunction parseFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction 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.KotlinIr.IrFunction prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + /** + * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrFunction} + */ + public static final class Builder extends + org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction, Builder> + implements + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionOrBuilder { + // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000001); + modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; + bitField0_ = (bitField0_ & ~0x00000002); + isTailrec_ = false; + bitField0_ = (bitField0_ & ~0x00000004); + isSuspend_ = false; + bitField0_ = (bitField0_ & ~0x00000008); + overridden_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getDefaultInstanceForType() { + return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); + } + + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction build() { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction buildPartial() { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.base_ = base_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.modality_ = modality_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.isTailrec_ = isTailrec_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.isSuspend_ = isSuspend_; + if (((bitField0_ & 0x00000010) == 0x00000010)) { + overridden_ = java.util.Collections.unmodifiableList(overridden_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.overridden_ = overridden_; + result.bitField0_ = to_bitField0_; + return result; + } + + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance()) return this; + if (other.hasBase()) { + mergeBase(other.getBase()); + } + if (other.hasModality()) { + setModality(other.getModality()); + } + if (other.hasIsTailrec()) { + setIsTailrec(other.getIsTailrec()); + } + if (other.hasIsSuspend()) { + setIsSuspend(other.getIsSuspend()); + } + if (!other.overridden_.isEmpty()) { + if (overridden_.isEmpty()) { + overridden_ = other.overridden_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureOverriddenIsMutable(); + overridden_.addAll(other.overridden_); + } + + } + setUnknownFields( + getUnknownFields().concat(other.unknownFields)); + return this; + } + + public final boolean isInitialized() { + if (!hasBase()) { + + return false; + } + if (!hasModality()) { + + return false; + } + if (!hasIsTailrec()) { + + return false; + } + if (!hasIsSuspend()) { + + return false; + } + if (!getBase().isInitialized()) { + + return false; + } + for (int i = 0; i < getOverriddenCount(); i++) { + if (!getOverridden(i).isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + org.jetbrains.kotlin.protobuf.CodedInputStream input, + org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public boolean hasBase() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase() { + return base_; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase value) { + if (value == null) { + throw new NullPointerException(); + } + base_ = value; + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.Builder builderForValue) { + base_ = builderForValue.build(); + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase value) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.newBuilder(base_).mergeFrom(value).buildPartial(); + } else { + base_ = value; + } + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; + */ + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + public boolean hasModality() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind getModality() { + return modality_; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + public Builder setModality(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + modality_ = value; + + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.ModalityKind modality = 2; + */ + public Builder clearModality() { + bitField0_ = (bitField0_ & ~0x00000002); + modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; + + return this; + } + + private boolean isTailrec_ ; + /** + * required bool is_tailrec = 3; + */ + public boolean hasIsTailrec() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * required bool is_tailrec = 3; + */ + public boolean getIsTailrec() { + return isTailrec_; + } + /** + * required bool is_tailrec = 3; + */ + public Builder setIsTailrec(boolean value) { + bitField0_ |= 0x00000004; + isTailrec_ = value; + + return this; + } + /** + * required bool is_tailrec = 3; + */ + public Builder clearIsTailrec() { + bitField0_ = (bitField0_ & ~0x00000004); + isTailrec_ = false; + + return this; + } + + private boolean isSuspend_ ; + /** + * required bool is_suspend = 4; + */ + public boolean hasIsSuspend() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * required bool is_suspend = 4; + */ + public boolean getIsSuspend() { + return isSuspend_; + } + /** + * required bool is_suspend = 4; + */ + public Builder setIsSuspend(boolean value) { + bitField0_ |= 0x00000008; + isSuspend_ = value; + + return this; + } + /** + * required bool is_suspend = 4; + */ + public Builder clearIsSuspend() { + bitField0_ = (bitField0_ & ~0x00000008); + isSuspend_ = false; + + return this; + } + + private java.util.List overridden_ = + java.util.Collections.emptyList(); + private void ensureOverriddenIsMutable() { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { + overridden_ = new java.util.ArrayList(overridden_); + bitField0_ |= 0x00000010; + } + } + + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public java.util.List getOverriddenList() { + return java.util.Collections.unmodifiableList(overridden_); + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public int getOverriddenCount() { + return overridden_.size(); + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getOverridden(int index) { + return overridden_.get(index); + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder setOverridden( + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + if (value == null) { + throw new NullPointerException(); + } + ensureOverriddenIsMutable(); + overridden_.set(index, value); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder setOverridden( + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { + ensureOverriddenIsMutable(); + overridden_.set(index, builderForValue.build()); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder addOverridden(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + if (value == null) { + throw new NullPointerException(); + } + ensureOverriddenIsMutable(); + overridden_.add(value); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder addOverridden( + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + if (value == null) { + throw new NullPointerException(); + } + ensureOverriddenIsMutable(); + overridden_.add(index, value); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder addOverridden( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { + ensureOverriddenIsMutable(); + overridden_.add(builderForValue.build()); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder addOverridden( + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { + ensureOverriddenIsMutable(); + overridden_.add(index, builderForValue.build()); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder addAllOverridden( + java.lang.Iterable values) { + ensureOverriddenIsMutable(); + org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( + values, overridden_); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder clearOverridden() { + overridden_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrSymbol overridden = 5; + * + * 
+       *optional UniqId corresponding_property = 7;
+       *
+ */ + public Builder removeOverridden(int index) { + ensureOverriddenIsMutable(); + overridden_.remove(index); + + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + } + + static { + defaultInstance = new IrFunction(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrFunction) + } + public interface IrConstructorOrBuilder extends // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrConstructor) org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - boolean hasSymbol(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); - - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase(); /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ boolean hasIsPrimary(); /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ boolean getIsPrimary(); } @@ -47411,7 +47800,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -47428,21 +47817,8 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); - } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = base_.toBuilder(); } base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.PARSER, extensionRegistry); @@ -47450,11 +47826,11 @@ public final class KotlinIr { subBuilder.mergeFrom(base_); base_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; break; } - case 24: { - bitField0_ |= 0x00000004; + case 16: { + bitField0_ |= 0x00000002; isPrimary_ = input.readBool(); break; } @@ -47492,53 +47868,37 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; - } - - public static final int BASE_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_; - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; - */ - public boolean hasBase() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase() { return base_; } - public static final int IS_PRIMARY_FIELD_NUMBER = 3; + public static final int IS_PRIMARY_FIELD_NUMBER = 2; private boolean isPrimary_; /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ public boolean hasIsPrimary() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ public boolean getIsPrimary() { return isPrimary_; } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); isPrimary_ = false; } @@ -47548,10 +47908,6 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { - memoizedIsInitialized = 0; - return false; - } if (!hasBase()) { memoizedIsInitialized = 0; return false; @@ -47560,10 +47916,6 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; @@ -47576,13 +47928,10 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, base_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, isPrimary_); + output.writeBool(2, isPrimary_); } output.writeRawBytes(unknownFields); } @@ -47595,15 +47944,11 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, base_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBoolSize(3, isPrimary_); + .computeBoolSize(2, isPrimary_); } size += unknownFields.size(); memoizedSerializedSize = size; @@ -47699,12 +48044,10 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); isPrimary_ = false; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -47731,14 +48074,10 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.base_ = base_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } result.isPrimary_ = isPrimary_; result.bitField0_ = to_bitField0_; return result; @@ -47746,9 +48085,6 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrConstructor other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrConstructor.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); - } if (other.hasBase()) { mergeBase(other.getBase()); } @@ -47761,10 +48097,6 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { - - return false; - } if (!hasBase()) { return false; @@ -47773,10 +48105,6 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { - - return false; - } if (!getBase().isInitialized()) { return false; @@ -47803,81 +48131,21 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (value == null) { - throw new NullPointerException(); - } - symbol_ = value; - - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); - - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); - } else { - symbol_ = value; - } - - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; - */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; - */ - public boolean hasBase() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase getBase() { return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase value) { if (value == null) { @@ -47885,24 +48153,24 @@ public final class KotlinIr { } base_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ public Builder setBase( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.Builder builderForValue) { base_ = builderForValue.build(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && + if (((bitField0_ & 0x00000001) == 0x00000001) && base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance()) { base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.newBuilder(base_).mergeFrom(value).buildPartial(); @@ -47910,46 +48178,46 @@ public final class KotlinIr { base_ = value; } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrFunctionBase base = 1; */ public Builder clearBase() { base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunctionBase.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); return this; } private boolean isPrimary_ ; /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ public boolean hasIsPrimary() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ public boolean getIsPrimary() { return isPrimary_; } /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ public Builder setIsPrimary(boolean value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; isPrimary_ = value; return this; } /** - * required bool is_primary = 3; + * required bool is_primary = 2; */ public Builder clearIsPrimary() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); isPrimary_ = false; return this; @@ -47971,13 +48239,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * optional .org.jetbrains.kotlin.backend.common.serialization.IrExpression initializer = 2; @@ -48076,7 +48344,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -48093,14 +48361,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -48206,19 +48474,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int INITIALIZER_FIELD_NUMBER = 2; @@ -48327,7 +48595,7 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); @@ -48342,7 +48610,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -48370,7 +48638,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -48400,7 +48668,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, initializer_); @@ -48434,7 +48702,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -48558,7 +48826,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -48600,7 +48868,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -48635,8 +48903,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrField other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrField.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasInitializer()) { mergeInitializer(other.getInitializer()); @@ -48665,7 +48933,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -48693,7 +48961,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -48737,61 +49005,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -49149,67 +49417,67 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + boolean hasBase(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ boolean hasName(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ boolean hasType(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex getType(); /** - * required bool is_var = 3; + * required bool is_var = 4; */ boolean hasIsVar(); /** - * required bool is_var = 3; + * required bool is_var = 4; */ boolean getIsVar(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ boolean hasDelegate(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getDelegate(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ boolean hasGetter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getGetter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ boolean hasSetter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getSetter(); - - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - boolean hasSymbol(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); } /** * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty} @@ -49245,7 +49513,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -49262,8 +49530,21 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = base_.toBuilder(); + } + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = name_.toBuilder(); } name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry); @@ -49271,12 +49552,12 @@ public final class KotlinIr { subBuilder.mergeFrom(name_); name_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; break; } - case 18: { + case 26: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = type_.toBuilder(); } type_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.PARSER, extensionRegistry); @@ -49284,17 +49565,17 @@ public final class KotlinIr { subBuilder.mergeFrom(type_); type_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; break; } - case 24: { - bitField0_ |= 0x00000004; + case 32: { + bitField0_ |= 0x00000008; isVar_ = input.readBool(); break; } - case 34: { + case 42: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = delegate_.toBuilder(); } delegate_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.PARSER, extensionRegistry); @@ -49302,12 +49583,12 @@ public final class KotlinIr { subBuilder.mergeFrom(delegate_); delegate_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; break; } - case 42: { + case 50: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = getter_.toBuilder(); } getter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.PARSER, extensionRegistry); @@ -49315,12 +49596,12 @@ public final class KotlinIr { subBuilder.mergeFrom(getter_); getter_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } - case 50: { + case 58: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = setter_.toBuilder(); } setter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.PARSER, extensionRegistry); @@ -49328,19 +49609,6 @@ public final class KotlinIr { subBuilder.mergeFrom(setter_); setter_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000020; - break; - } - case 58: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { - subBuilder = symbol_.toBuilder(); - } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); - } bitField0_ |= 0x00000040; break; } @@ -49378,119 +49646,119 @@ public final class KotlinIr { } private int bitField0_; - public static final int NAME_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasName() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; + } + + public static final int NAME_FIELD_NUMBER = 2; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_; + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { return name_; } - public static final int TYPE_FIELD_NUMBER = 2; + public static final int TYPE_FIELD_NUMBER = 3; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex type_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex getType() { return type_; } - public static final int IS_VAR_FIELD_NUMBER = 3; + public static final int IS_VAR_FIELD_NUMBER = 4; private boolean isVar_; /** - * required bool is_var = 3; + * required bool is_var = 4; */ public boolean hasIsVar() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required bool is_var = 3; + * required bool is_var = 4; */ public boolean getIsVar() { return isVar_; } - public static final int DELEGATE_FIELD_NUMBER = 4; + public static final int DELEGATE_FIELD_NUMBER = 5; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable delegate_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public boolean hasDelegate() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getDelegate() { return delegate_; } - public static final int GETTER_FIELD_NUMBER = 5; + public static final int GETTER_FIELD_NUMBER = 6; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getter_; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public boolean hasGetter() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getGetter() { return getter_; } - public static final int SETTER_FIELD_NUMBER = 6; + public static final int SETTER_FIELD_NUMBER = 7; private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction setter_; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public boolean hasSetter() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getSetter() { return setter_; } - public static final int SYMBOL_FIELD_NUMBER = 7; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public boolean hasSymbol() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; - } - private void initFields() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); isVar_ = false; delegate_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); getter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); setter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -49498,6 +49766,10 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; + if (!hasBase()) { + memoizedIsInitialized = 0; + return false; + } if (!hasName()) { memoizedIsInitialized = 0; return false; @@ -49514,7 +49786,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!hasSymbol()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -49542,10 +49814,6 @@ public final class KotlinIr { return false; } } - if (!getSymbol().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } memoizedIsInitialized = 1; return true; } @@ -49554,25 +49822,25 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, name_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, type_); + output.writeMessage(2, name_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, isVar_); + output.writeMessage(3, type_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, delegate_); + output.writeBool(4, isVar_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, getter_); + output.writeMessage(5, delegate_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(6, setter_); + output.writeMessage(6, getter_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(7, symbol_); + output.writeMessage(7, setter_); } output.writeRawBytes(unknownFields); } @@ -49585,31 +49853,31 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, name_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, type_); + .computeMessageSize(2, name_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBoolSize(3, isVar_); + .computeMessageSize(3, type_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(4, delegate_); + .computeBoolSize(4, isVar_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(5, getter_); + .computeMessageSize(5, delegate_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(6, setter_); + .computeMessageSize(6, getter_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(7, symbol_); + .computeMessageSize(7, setter_); } size += unknownFields.size(); memoizedSerializedSize = size; @@ -49705,19 +49973,19 @@ public final class KotlinIr { public Builder clear() { super.clear(); - name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); + name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); - isVar_ = false; + type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); - delegate_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); + isVar_ = false; bitField0_ = (bitField0_ & ~0x00000008); - getter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); + delegate_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000010); - setter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); + getter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000020); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + setter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -49745,37 +50013,40 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.type_ = type_; + result.name_ = name_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.isVar_ = isVar_; + result.type_ = type_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.delegate_ = delegate_; + result.isVar_ = isVar_; if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.getter_ = getter_; + result.delegate_ = delegate_; if (((from_bitField0_ & 0x00000020) == 0x00000020)) { to_bitField0_ |= 0x00000020; } - result.setter_ = setter_; + result.getter_ = getter_; if (((from_bitField0_ & 0x00000040) == 0x00000040)) { to_bitField0_ |= 0x00000040; } - result.symbol_ = symbol_; + result.setter_ = setter_; result.bitField0_ = to_bitField0_; return result; } public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.getDefaultInstance()) return this; + if (other.hasBase()) { + mergeBase(other.getBase()); + } if (other.hasName()) { mergeName(other.getName()); } @@ -49794,15 +50065,16 @@ public final class KotlinIr { if (other.hasSetter()) { mergeSetter(other.getSetter()); } - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); - } setUnknownFields( getUnknownFields().concat(other.unknownFields)); return this; } public final boolean isInitialized() { + if (!hasBase()) { + + return false; + } if (!hasName()) { return false; @@ -49819,7 +50091,7 @@ public final class KotlinIr { return false; } - if (!hasSymbol()) { + if (!getBase().isInitialized()) { return false; } @@ -49847,10 +50119,6 @@ public final class KotlinIr { return false; } } - if (!getSymbol().isInitialized()) { - - return false; - } return true; } @@ -49873,21 +50141,81 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasName() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { + if (value == null) { + throw new NullPointerException(); + } + base_ = value; + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); + } else { + base_ = value; + } + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { return name_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) { if (value == null) { @@ -49895,24 +50223,24 @@ public final class KotlinIr { } name_ = value; - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder setName( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) { name_ = builderForValue.build(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) { - if (((bitField0_ & 0x00000001) == 0x00000001) && + if (((bitField0_ & 0x00000002) == 0x00000002) && name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) { name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial(); @@ -49920,34 +50248,34 @@ public final class KotlinIr { name_ = value; } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder clearName() { name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex getType() { return type_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public Builder setType(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex value) { if (value == null) { @@ -49955,24 +50283,24 @@ public final class KotlinIr { } type_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public Builder setType( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.Builder builderForValue) { type_ = builderForValue.build(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public Builder mergeType(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && + if (((bitField0_ & 0x00000004) == 0x00000004) && type_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance()) { type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.newBuilder(type_).mergeFrom(value).buildPartial(); @@ -49980,46 +50308,46 @@ public final class KotlinIr { type_ = value; } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ public Builder clearType() { type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); return this; } private boolean isVar_ ; /** - * required bool is_var = 3; + * required bool is_var = 4; */ public boolean hasIsVar() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required bool is_var = 3; + * required bool is_var = 4; */ public boolean getIsVar() { return isVar_; } /** - * required bool is_var = 3; + * required bool is_var = 4; */ public Builder setIsVar(boolean value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; isVar_ = value; return this; } /** - * required bool is_var = 3; + * required bool is_var = 4; */ public Builder clearIsVar() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); isVar_ = false; return this; @@ -50027,19 +50355,19 @@ public final class KotlinIr { private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable delegate_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public boolean hasDelegate() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getDelegate() { return delegate_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public Builder setDelegate(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { if (value == null) { @@ -50047,24 +50375,24 @@ public final class KotlinIr { } delegate_ = value; - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public Builder setDelegate( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder builderForValue) { delegate_ = builderForValue.build(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public Builder mergeDelegate(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { - if (((bitField0_ & 0x00000008) == 0x00000008) && + if (((bitField0_ & 0x00000010) == 0x00000010) && delegate_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance()) { delegate_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.newBuilder(delegate_).mergeFrom(value).buildPartial(); @@ -50072,34 +50400,34 @@ public final class KotlinIr { delegate_ = value; } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 4; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable delegate = 5; */ public Builder clearDelegate() { delegate_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); return this; } private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public boolean hasGetter() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getGetter() { return getter_; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public Builder setGetter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction value) { if (value == null) { @@ -50107,24 +50435,24 @@ public final class KotlinIr { } getter_ = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public Builder setGetter( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.Builder builderForValue) { getter_ = builderForValue.build(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public Builder mergeGetter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction value) { - if (((bitField0_ & 0x00000010) == 0x00000010) && + if (((bitField0_ & 0x00000020) == 0x00000020) && getter_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance()) { getter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.newBuilder(getter_).mergeFrom(value).buildPartial(); @@ -50132,34 +50460,34 @@ public final class KotlinIr { getter_ = value; } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 5; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction getter = 6; */ public Builder clearGetter() { getter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); return this; } private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction setter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public boolean hasSetter() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction getSetter() { return setter_; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public Builder setSetter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction value) { if (value == null) { @@ -50167,24 +50495,24 @@ public final class KotlinIr { } setter_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public Builder setSetter( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.Builder builderForValue) { setter_ = builderForValue.build(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public Builder mergeSetter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction value) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000040) == 0x00000040) && setter_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance()) { setter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.newBuilder(setter_).mergeFrom(value).buildPartial(); @@ -50192,75 +50520,15 @@ public final class KotlinIr { setter_ = value; } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 6; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrFunction setter = 7; */ public Builder clearSetter() { setter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrFunction.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public boolean hasSymbol() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (value == null) { - throw new NullPointerException(); - } - symbol_ = value; - - bitField0_ |= 0x00000040; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); - - bitField0_ |= 0x00000040; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (((bitField0_ & 0x00000040) == 0x00000040) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); - } else { - symbol_ = value; - } - - bitField0_ |= 0x00000040; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 7; - */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000040); return this; } @@ -50281,13 +50549,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; @@ -50422,7 +50690,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -50439,14 +50707,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -50587,19 +50855,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int NAME_FIELD_NUMBER = 2; @@ -50768,7 +51036,7 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY; @@ -50787,7 +51055,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -50823,7 +51091,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -50861,7 +51129,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, name_); @@ -50907,7 +51175,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -51047,7 +51315,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -51097,7 +51365,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -51148,8 +51416,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrProperty other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrProperty.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasName()) { mergeName(other.getName()); @@ -51190,7 +51458,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -51226,7 +51494,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -51278,61 +51546,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -51849,23 +52117,23 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + boolean hasBase(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); + + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ boolean hasName(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - boolean hasSymbol(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); - /** * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeIndex type = 3; */ @@ -51945,7 +52213,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -51962,8 +52230,21 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = base_.toBuilder(); + } + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = name_.toBuilder(); } name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry); @@ -51971,19 +52252,6 @@ public final class KotlinIr { subBuilder.mergeFrom(name_); name_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000001; - break; - } - case 18: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = symbol_.toBuilder(); - } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); - } bitField0_ |= 0x00000002; break; } @@ -52062,34 +52330,34 @@ public final class KotlinIr { } private int bitField0_; - public static final int NAME_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasName() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { - return name_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } - public static final int SYMBOL_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int NAME_FIELD_NUMBER = 2; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ - public boolean hasSymbol() { + public boolean hasName() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { + return name_; } public static final int TYPE_FIELD_NUMBER = 3; @@ -52168,8 +52436,8 @@ public final class KotlinIr { } private void initFields() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); isVar_ = false; isConst_ = false; @@ -52182,11 +52450,11 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasName()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } - if (!hasSymbol()) { + if (!hasName()) { memoizedIsInitialized = 0; return false; } @@ -52206,11 +52474,11 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getName().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getName().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -52232,10 +52500,10 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, name_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, symbol_); + output.writeMessage(2, name_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeMessage(3, type_); @@ -52263,11 +52531,11 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, name_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, symbol_); + .computeMessageSize(2, name_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -52383,9 +52651,9 @@ public final class KotlinIr { public Builder clear() { super.clear(); - name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); @@ -52423,11 +52691,11 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.name_ = name_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.symbol_ = symbol_; + result.name_ = name_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } @@ -52454,12 +52722,12 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance()) return this; + if (other.hasBase()) { + mergeBase(other.getBase()); + } if (other.hasName()) { mergeName(other.getName()); } - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); - } if (other.hasType()) { mergeType(other.getType()); } @@ -52481,11 +52749,11 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasName()) { + if (!hasBase()) { return false; } - if (!hasSymbol()) { + if (!hasName()) { return false; } @@ -52505,11 +52773,11 @@ public final class KotlinIr { return false; } - if (!getName().isInitialized()) { + if (!getBase().isInitialized()) { return false; } - if (!getSymbol().isInitialized()) { + if (!getName().isInitialized()) { return false; } @@ -52545,21 +52813,81 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasName() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { + if (value == null) { + throw new NullPointerException(); + } + base_ = value; + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); + } else { + base_ = value; + } + + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; + */ + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() { return name_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) { if (value == null) { @@ -52567,24 +52895,24 @@ public final class KotlinIr { } name_ = value; - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder setName( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) { name_ = builderForValue.build(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) { - if (((bitField0_ & 0x00000001) == 0x00000001) && + if (((bitField0_ & 0x00000002) == 0x00000002) && name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) { name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial(); @@ -52592,75 +52920,15 @@ public final class KotlinIr { name_ = value; } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.String name = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; */ public Builder clearName() { name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - public boolean hasSymbol() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (value == null) { - throw new NullPointerException(); - } - symbol_ = value; - - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); - - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); - } else { - symbol_ = value; - } - - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2; - */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -52897,13 +53165,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; @@ -53002,7 +53270,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -53019,14 +53287,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -53132,19 +53400,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int NAME_FIELD_NUMBER = 2; @@ -53253,7 +53521,7 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); index_ = 0; type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance(); @@ -53268,7 +53536,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -53292,7 +53560,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -53324,7 +53592,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, name_); @@ -53358,7 +53626,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -53482,7 +53750,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -53524,7 +53792,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -53559,8 +53827,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasName()) { mergeName(other.getName()); @@ -53589,7 +53857,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -53613,7 +53881,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -53659,61 +53927,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -54071,13 +54339,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; @@ -54163,7 +54431,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -54180,14 +54448,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -54272,19 +54540,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int NAME_FIELD_NUMBER = 2; @@ -54383,7 +54651,7 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); index_ = 0; variance_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeVariance.IN; @@ -54396,7 +54664,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -54416,7 +54684,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -54438,7 +54706,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, name_); @@ -54466,7 +54734,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -54582,7 +54850,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -54620,7 +54888,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -54648,8 +54916,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasName()) { mergeName(other.getName()); @@ -54679,7 +54947,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -54699,7 +54967,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -54735,61 +55003,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -55095,16 +55363,16 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - java.util.List + java.util.List getTypeParameterList(); /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getTypeParameter(int index); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter getTypeParameter(int index); /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ int getTypeParameterCount(); } @@ -55142,7 +55410,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -55160,10 +55428,10 @@ public final class KotlinIr { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - typeParameter_ = new java.util.ArrayList(); + typeParameter_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - typeParameter_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry)); + typeParameter_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.PARSER, extensionRegistry)); break; } } @@ -55203,36 +55471,36 @@ public final class KotlinIr { } public static final int TYPE_PARAMETER_FIELD_NUMBER = 1; - private java.util.List typeParameter_; + private java.util.List typeParameter_; /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public java.util.List getTypeParameterList() { + public java.util.List getTypeParameterList() { return typeParameter_; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public java.util.List + public java.util.List getTypeParameterOrBuilderList() { return typeParameter_; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public int getTypeParameterCount() { return typeParameter_.size(); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getTypeParameter(int index) { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter getTypeParameter(int index) { return typeParameter_.get(index); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrBuilder getTypeParameterOrBuilder( + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterOrBuilder getTypeParameterOrBuilder( int index) { return typeParameter_.get(index); } @@ -55447,38 +55715,38 @@ public final class KotlinIr { } private int bitField0_; - private java.util.List typeParameter_ = + private java.util.List typeParameter_ = java.util.Collections.emptyList(); private void ensureTypeParameterIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - typeParameter_ = new java.util.ArrayList(typeParameter_); + typeParameter_ = new java.util.ArrayList(typeParameter_); bitField0_ |= 0x00000001; } } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public java.util.List getTypeParameterList() { + public java.util.List getTypeParameterList() { return java.util.Collections.unmodifiableList(typeParameter_); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public int getTypeParameterCount() { return typeParameter_.size(); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getTypeParameter(int index) { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter getTypeParameter(int index) { return typeParameter_.get(index); } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder setTypeParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter value) { if (value == null) { throw new NullPointerException(); } @@ -55488,19 +55756,19 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder setTypeParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.Builder builderForValue) { ensureTypeParameterIsMutable(); typeParameter_.set(index, builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ - public Builder addTypeParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder addTypeParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter value) { if (value == null) { throw new NullPointerException(); } @@ -55510,10 +55778,10 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder addTypeParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter value) { if (value == null) { throw new NullPointerException(); } @@ -55523,30 +55791,30 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder addTypeParameter( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.Builder builderForValue) { ensureTypeParameterIsMutable(); typeParameter_.add(builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder addTypeParameter( - int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + int index, org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.Builder builderForValue) { ensureTypeParameterIsMutable(); typeParameter_.add(index, builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder addAllTypeParameter( - java.lang.Iterable values) { + java.lang.Iterable values) { ensureTypeParameterIsMutable(); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( values, typeParameter_); @@ -55554,7 +55822,7 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder clearTypeParameter() { typeParameter_ = java.util.Collections.emptyList(); @@ -55563,7 +55831,7 @@ public final class KotlinIr { return this; } /** - * repeated .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration type_parameter = 1; + * repeated .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter type_parameter = 1; */ public Builder removeTypeParameter(int index) { ensureTypeParameterIsMutable(); @@ -55588,13 +55856,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * required .org.jetbrains.kotlin.backend.common.serialization.String name = 2; @@ -55686,13 +55954,13 @@ public final class KotlinIr { boolean getIsInline(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ boolean hasThisReceiver(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getThisReceiver(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getThisReceiver(); /** * required .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameterContainer type_parameters = 12; @@ -55760,7 +56028,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -55777,14 +56045,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -55865,11 +56133,11 @@ public final class KotlinIr { break; } case 90: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder subBuilder = null; if (((bitField0_ & 0x00000400) == 0x00000400)) { subBuilder = thisReceiver_.toBuilder(); } - thisReceiver_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry); + thisReceiver_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(thisReceiver_); thisReceiver_ = subBuilder.buildPartial(); @@ -55948,19 +56216,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int NAME_FIELD_NUMBER = 2; @@ -56107,17 +56375,17 @@ public final class KotlinIr { } public static final int THIS_RECEIVER_FIELD_NUMBER = 11; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration thisReceiver_; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter thisReceiver_; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ public boolean hasThisReceiver() { return ((bitField0_ & 0x00000400) == 0x00000400); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getThisReceiver() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getThisReceiver() { return thisReceiver_; } @@ -56187,7 +56455,7 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); kind_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ClassKind.CLASS; visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance(); @@ -56197,7 +56465,7 @@ public final class KotlinIr { isData_ = false; isExternal_ = false; isInline_ = false; - thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); declarationContainer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationContainer.getDefaultInstance(); superType_ = java.util.Collections.emptyList(); @@ -56208,7 +56476,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -56256,7 +56524,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -56296,7 +56564,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, name_); @@ -56348,7 +56616,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -56496,7 +56764,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -56516,7 +56784,7 @@ public final class KotlinIr { bitField0_ = (bitField0_ & ~0x00000100); isInline_ = false; bitField0_ = (bitField0_ & ~0x00000200); - thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000400); typeParameters_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameterContainer.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000800); @@ -56550,7 +56818,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -56610,8 +56878,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasName()) { mergeName(other.getName()); @@ -56665,7 +56933,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -56713,7 +56981,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -56767,61 +57035,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -57193,23 +57461,23 @@ public final class KotlinIr { return this; } - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ public boolean hasThisReceiver() { return ((bitField0_ & 0x00000400) == 0x00000400); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getThisReceiver() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getThisReceiver() { return thisReceiver_; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ - public Builder setThisReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder setThisReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (value == null) { throw new NullPointerException(); } @@ -57219,23 +57487,23 @@ public final class KotlinIr { return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ public Builder setThisReceiver( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { thisReceiver_ = builderForValue.build(); bitField0_ |= 0x00000400; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ - public Builder mergeThisReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder mergeThisReceiver(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (((bitField0_ & 0x00000400) == 0x00000400) && - thisReceiver_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) { + thisReceiver_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance()) { thisReceiver_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder(thisReceiver_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.newBuilder(thisReceiver_).mergeFrom(value).buildPartial(); } else { thisReceiver_ = value; } @@ -57244,10 +57512,10 @@ public final class KotlinIr { return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration this_receiver = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter this_receiver = 11; */ public Builder clearThisReceiver() { - thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + thisReceiver_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000400); return this; @@ -57514,13 +57782,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * optional .org.jetbrains.kotlin.backend.common.serialization.IrExpression initializer = 2; @@ -57532,13 +57800,13 @@ public final class KotlinIr { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression getInitializer(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ boolean hasCorrespondingClass(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCorrespondingClass(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass getCorrespondingClass(); /** * required .org.jetbrains.kotlin.backend.common.serialization.String name = 4; @@ -57583,7 +57851,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -57600,14 +57868,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -57626,11 +57894,11 @@ public final class KotlinIr { break; } case 26: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = correspondingClass_.toBuilder(); } - correspondingClass_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry); + correspondingClass_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(correspondingClass_); correspondingClass_ = subBuilder.buildPartial(); @@ -57685,19 +57953,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int INITIALIZER_FIELD_NUMBER = 2; @@ -57716,17 +57984,17 @@ public final class KotlinIr { } public static final int CORRESPONDING_CLASS_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration correspondingClass_; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass correspondingClass_; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ public boolean hasCorrespondingClass() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCorrespondingClass() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass getCorrespondingClass() { return correspondingClass_; } @@ -57746,9 +58014,9 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance(); - correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.getDefaultInstance(); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -57757,7 +58025,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -57765,7 +58033,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -57793,7 +58061,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, initializer_); @@ -57815,7 +58083,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -57923,11 +58191,11 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); - correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); @@ -57957,7 +58225,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -57976,8 +58244,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrEnumEntry other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrEnumEntry.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasInitializer()) { mergeInitializer(other.getInitializer()); @@ -57994,7 +58262,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -58002,7 +58270,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -58044,61 +58312,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -58164,23 +58432,23 @@ public final class KotlinIr { return this; } - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ public boolean hasCorrespondingClass() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCorrespondingClass() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass getCorrespondingClass() { return correspondingClass_; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ - public Builder setCorrespondingClass(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder setCorrespondingClass(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass value) { if (value == null) { throw new NullPointerException(); } @@ -58190,23 +58458,23 @@ public final class KotlinIr { return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ public Builder setCorrespondingClass( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.Builder builderForValue) { correspondingClass_ = builderForValue.build(); bitField0_ |= 0x00000004; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ - public Builder mergeCorrespondingClass(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder mergeCorrespondingClass(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass value) { if (((bitField0_ & 0x00000004) == 0x00000004) && - correspondingClass_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) { + correspondingClass_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.getDefaultInstance()) { correspondingClass_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder(correspondingClass_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.newBuilder(correspondingClass_).mergeFrom(value).buildPartial(); } else { correspondingClass_ = value; } @@ -58215,10 +58483,10 @@ public final class KotlinIr { return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration corresponding_class = 3; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrClass corresponding_class = 3; */ public Builder clearCorrespondingClass() { - correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrClass.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); return this; @@ -58300,13 +58568,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - boolean hasSymbol(); + boolean hasBase(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase(); /** * required .org.jetbrains.kotlin.backend.common.serialization.IrStatement body = 2; @@ -58351,7 +58619,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -58368,14 +58636,14 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = symbol_.toBuilder(); + subBuilder = base_.toBuilder(); } - symbol_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.PARSER, extensionRegistry); + base_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(symbol_); - symbol_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(base_); + base_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000001; break; @@ -58427,19 +58695,19 @@ public final class KotlinIr { } private int bitField0_; - public static final int SYMBOL_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_; + public static final int BASE_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } public static final int BODY_FIELD_NUMBER = 2; @@ -58458,7 +58726,7 @@ public final class KotlinIr { } private void initFields() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -58467,7 +58735,7 @@ public final class KotlinIr { if (isInitialized == 1) return true; if (isInitialized == 0) return false; - if (!hasSymbol()) { + if (!hasBase()) { memoizedIsInitialized = 0; return false; } @@ -58475,7 +58743,7 @@ public final class KotlinIr { memoizedIsInitialized = 0; return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -58491,7 +58759,7 @@ public final class KotlinIr { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, symbol_); + output.writeMessage(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, body_); @@ -58507,7 +58775,7 @@ public final class KotlinIr { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, symbol_); + .computeMessageSize(1, base_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -58607,7 +58875,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); body_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrStatement.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -58637,7 +58905,7 @@ public final class KotlinIr { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.symbol_ = symbol_; + result.base_ = base_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -58648,8 +58916,8 @@ public final class KotlinIr { public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrAnonymousInit other) { if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrAnonymousInit.getDefaultInstance()) return this; - if (other.hasSymbol()) { - mergeSymbol(other.getSymbol()); + if (other.hasBase()) { + mergeBase(other.getBase()); } if (other.hasBody()) { mergeBody(other.getBody()); @@ -58660,7 +58928,7 @@ public final class KotlinIr { } public final boolean isInitialized() { - if (!hasSymbol()) { + if (!hasBase()) { return false; } @@ -58668,7 +58936,7 @@ public final class KotlinIr { return false; } - if (!getSymbol().isInitialized()) { + if (!getBase().isInitialized()) { return false; } @@ -58698,61 +58966,61 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public boolean hasSymbol() { + public boolean hasBase() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol() { - return symbol_; + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase getBase() { + return base_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder setBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (value == null) { throw new NullPointerException(); } - symbol_ = value; + base_ = value; bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder setSymbol( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.Builder builderForValue) { - symbol_ = builderForValue.build(); + public Builder setBase( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.Builder builderForValue) { + base_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder mergeSymbol(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol value) { + public Builder mergeBase(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - symbol_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance()) { - symbol_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.newBuilder(symbol_).mergeFrom(value).buildPartial(); + base_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance()) { + base_ = + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.newBuilder(base_).mergeFrom(value).buildPartial(); } else { - symbol_ = value; + base_ = value; } bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationBase base = 1; */ - public Builder clearSymbol() { - symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance(); + public Builder clearBase() { + base_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationBase.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -58829,8 +59097,8 @@ public final class KotlinIr { // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrAnonymousInit) } - public interface IrDeclaratorOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrDeclarator) + public interface IrDeclarationOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** @@ -58897,80 +59165,66 @@ public final class KotlinIr { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrProperty getIrProperty(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - boolean hasIrTypeAlias(); - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias getIrTypeAlias(); - - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ boolean hasIrTypeParameter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter getIrTypeParameter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ boolean hasIrVariable(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getIrVariable(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ boolean hasIrValueParameter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getIrValueParameter(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ boolean hasIrLocalDelegatedProperty(); /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty getIrLocalDelegatedProperty(); } /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclarator} - * - * 
-   * TODO: we need an extension mechanism to accomodate new
-   * IR operators in upcoming releases.
-   *
+ * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclaration} */ - public static final class IrDeclarator extends + public static final class IrDeclaration extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclarator) - IrDeclaratorOrBuilder { - // Use IrDeclarator.newBuilder() to construct. - private IrDeclarator(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) + IrDeclarationOrBuilder { + // Use IrDeclaration.newBuilder() to construct. + private IrDeclaration(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private IrDeclarator(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + private IrDeclaration(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - private static final IrDeclarator defaultInstance; - public static IrDeclarator getDefaultInstance() { + private static final IrDeclaration defaultInstance; + public static IrDeclaration getDefaultInstance() { return defaultInstance; } - public IrDeclarator getDefaultInstanceForType() { + public IrDeclaration getDefaultInstanceForType() { return defaultInstance; } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private IrDeclarator( + private IrDeclaration( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { @@ -58980,7 +59234,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -59088,21 +59342,8 @@ public final class KotlinIr { break; } case 66: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.Builder subBuilder = null; - if (declaratorCase_ == 8) { - subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_).toBuilder(); - } - declarator_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_); - declarator_ = subBuilder.buildPartial(); - } - declaratorCase_ = 8; - break; - } - case 74: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.Builder subBuilder = null; - if (declaratorCase_ == 9) { + if (declaratorCase_ == 8) { subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_).toBuilder(); } declarator_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.PARSER, extensionRegistry); @@ -59110,12 +59351,12 @@ public final class KotlinIr { subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_); declarator_ = subBuilder.buildPartial(); } - declaratorCase_ = 9; + declaratorCase_ = 8; break; } - case 82: { + case 74: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder subBuilder = null; - if (declaratorCase_ == 10) { + if (declaratorCase_ == 9) { subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_).toBuilder(); } declarator_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.PARSER, extensionRegistry); @@ -59123,12 +59364,12 @@ public final class KotlinIr { subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_); declarator_ = subBuilder.buildPartial(); } - declaratorCase_ = 10; + declaratorCase_ = 9; break; } - case 90: { + case 82: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder subBuilder = null; - if (declaratorCase_ == 11) { + if (declaratorCase_ == 10) { subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_).toBuilder(); } declarator_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.PARSER, extensionRegistry); @@ -59136,12 +59377,12 @@ public final class KotlinIr { subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_); declarator_ = subBuilder.buildPartial(); } - declaratorCase_ = 11; + declaratorCase_ = 10; break; } - case 98: { + case 90: { org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.Builder subBuilder = null; - if (declaratorCase_ == 12) { + if (declaratorCase_ == 11) { subBuilder = ((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_).toBuilder(); } declarator_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.PARSER, extensionRegistry); @@ -59149,7 +59390,7 @@ public final class KotlinIr { subBuilder.mergeFrom((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_); declarator_ = subBuilder.buildPartial(); } - declaratorCase_ = 12; + declaratorCase_ = 11; break; } } @@ -59170,18 +59411,18 @@ public final class KotlinIr { makeExtensionsImmutable(); } } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public IrDeclarator parsePartialFrom( + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public IrDeclaration parsePartialFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new IrDeclarator(input, extensionRegistry); + return new IrDeclaration(input, extensionRegistry); } }; @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { return PARSER; } @@ -59197,11 +59438,10 @@ public final class KotlinIr { IR_FIELD(5), IR_FUNCTION(6), IR_PROPERTY(7), - IR_TYPE_ALIAS(8), - IR_TYPE_PARAMETER(9), - IR_VARIABLE(10), - IR_VALUE_PARAMETER(11), - IR_LOCAL_DELEGATED_PROPERTY(12), + IR_TYPE_PARAMETER(8), + IR_VARIABLE(9), + IR_VALUE_PARAMETER(10), + IR_LOCAL_DELEGATED_PROPERTY(11), DECLARATOR_NOT_SET(0); private int value = 0; private DeclaratorCase(int value) { @@ -59216,11 +59456,10 @@ public final class KotlinIr { case 5: return IR_FIELD; case 6: return IR_FUNCTION; case 7: return IR_PROPERTY; - case 8: return IR_TYPE_ALIAS; - case 9: return IR_TYPE_PARAMETER; - case 10: return IR_VARIABLE; - case 11: return IR_VALUE_PARAMETER; - case 12: return IR_LOCAL_DELEGATED_PROPERTY; + case 8: return IR_TYPE_PARAMETER; + case 9: return IR_VARIABLE; + case 10: return IR_VALUE_PARAMETER; + case 11: return IR_LOCAL_DELEGATED_PROPERTY; case 0: return DECLARATOR_NOT_SET; default: throw new java.lang.IllegalArgumentException( "Value is undefined for this oneof enum."); @@ -59356,86 +59595,69 @@ public final class KotlinIr { return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrProperty.getDefaultInstance(); } - public static final int IR_TYPE_ALIAS_FIELD_NUMBER = 8; + public static final int IR_TYPE_PARAMETER_FIELD_NUMBER = 8; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ - public boolean hasIrTypeAlias() { + public boolean hasIrTypeParameter() { return declaratorCase_ == 8; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias getIrTypeAlias() { - if (declaratorCase_ == 8) { - return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_; - } - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.getDefaultInstance(); - } - - public static final int IR_TYPE_PARAMETER_FIELD_NUMBER = 9; - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; - */ - public boolean hasIrTypeParameter() { - return declaratorCase_ == 9; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter getIrTypeParameter() { - if (declaratorCase_ == 9) { + if (declaratorCase_ == 8) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.getDefaultInstance(); } - public static final int IR_VARIABLE_FIELD_NUMBER = 10; + public static final int IR_VARIABLE_FIELD_NUMBER = 9; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ public boolean hasIrVariable() { - return declaratorCase_ == 10; + return declaratorCase_ == 9; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getIrVariable() { - if (declaratorCase_ == 10) { + if (declaratorCase_ == 9) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); } - public static final int IR_VALUE_PARAMETER_FIELD_NUMBER = 11; + public static final int IR_VALUE_PARAMETER_FIELD_NUMBER = 10; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public boolean hasIrValueParameter() { - return declaratorCase_ == 11; + return declaratorCase_ == 10; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getIrValueParameter() { - if (declaratorCase_ == 11) { + if (declaratorCase_ == 10) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); } - public static final int IR_LOCAL_DELEGATED_PROPERTY_FIELD_NUMBER = 12; + public static final int IR_LOCAL_DELEGATED_PROPERTY_FIELD_NUMBER = 11; /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public boolean hasIrLocalDelegatedProperty() { - return declaratorCase_ == 12; + return declaratorCase_ == 11; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty getIrLocalDelegatedProperty() { - if (declaratorCase_ == 12) { + if (declaratorCase_ == 11) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.getDefaultInstance(); @@ -59544,19 +59766,16 @@ public final class KotlinIr { output.writeMessage(7, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrProperty) declarator_); } if (declaratorCase_ == 8) { - output.writeMessage(8, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_); + output.writeMessage(8, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_); } if (declaratorCase_ == 9) { - output.writeMessage(9, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_); + output.writeMessage(9, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_); } if (declaratorCase_ == 10) { - output.writeMessage(10, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_); + output.writeMessage(10, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_); } if (declaratorCase_ == 11) { - output.writeMessage(11, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_); - } - if (declaratorCase_ == 12) { - output.writeMessage(12, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_); + output.writeMessage(11, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_); } output.writeRawBytes(unknownFields); } @@ -59597,23 +59816,19 @@ public final class KotlinIr { } if (declaratorCase_ == 8) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(8, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_); + .computeMessageSize(8, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_); } if (declaratorCase_ == 9) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(9, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_); + .computeMessageSize(9, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_); } if (declaratorCase_ == 10) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(10, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_); + .computeMessageSize(10, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_); } if (declaratorCase_ == 11) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(11, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_); - } - if (declaratorCase_ == 12) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(12, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_); + .computeMessageSize(11, (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_); } size += unknownFields.size(); memoizedSerializedSize = size; @@ -59627,53 +59842,53 @@ public final class KotlinIr { return super.writeReplace(); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclarator parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclarator parseFrom(byte[] data) + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclarator parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclarator parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator parseDelimitedFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclarator parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator parseFrom( + public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -59682,26 +59897,21 @@ public final class KotlinIr { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclarator} - * - * 
-     * TODO: we need an extension mechanism to accomodate new
-     * IR operators in upcoming releases.
-     *
+ * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclaration} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator, Builder> + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration, Builder> implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclarator) - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaratorOrBuilder { - // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.newBuilder() + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrBuilder { + // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -59723,20 +59933,20 @@ public final class KotlinIr { return create().mergeFrom(buildPartial()); } - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator getDefaultInstanceForType() { - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance(); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getDefaultInstanceForType() { + return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); } - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator build() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator result = buildPartial(); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration build() { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator buildPartial() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator(this); + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration buildPartial() { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (declaratorCase_ == 1) { @@ -59772,16 +59982,13 @@ public final class KotlinIr { if (declaratorCase_ == 11) { result.declarator_ = declarator_; } - if (declaratorCase_ == 12) { - result.declarator_ = declarator_; - } result.bitField0_ = to_bitField0_; result.declaratorCase_ = declaratorCase_; return result; } - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration other) { + if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) return this; switch (other.getDeclaratorCase()) { case IR_ANONYMOUS_INIT: { mergeIrAnonymousInit(other.getIrAnonymousInit()); @@ -59811,10 +60018,6 @@ public final class KotlinIr { mergeIrProperty(other.getIrProperty()); break; } - case IR_TYPE_ALIAS: { - mergeIrTypeAlias(other.getIrTypeAlias()); - break; - } case IR_TYPE_PARAMETER: { mergeIrTypeParameter(other.getIrTypeParameter()); break; @@ -59914,11 +60117,11 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator parsedMessage = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -60392,86 +60595,22 @@ public final class KotlinIr { } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ - public boolean hasIrTypeAlias() { + public boolean hasIrTypeParameter() { return declaratorCase_ == 8; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias getIrTypeAlias() { - if (declaratorCase_ == 8) { - return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_; - } - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.getDefaultInstance(); - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - public Builder setIrTypeAlias(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias value) { - if (value == null) { - throw new NullPointerException(); - } - declarator_ = value; - - declaratorCase_ = 8; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - public Builder setIrTypeAlias( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.Builder builderForValue) { - declarator_ = builderForValue.build(); - - declaratorCase_ = 8; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - public Builder mergeIrTypeAlias(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias value) { - if (declaratorCase_ == 8 && - declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.getDefaultInstance()) { - declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeAlias) declarator_) - .mergeFrom(value).buildPartial(); - } else { - declarator_ = value; - } - - declaratorCase_ = 8; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeAlias ir_type_alias = 8; - */ - public Builder clearIrTypeAlias() { - if (declaratorCase_ == 8) { - declaratorCase_ = 0; - declarator_ = null; - - } - return this; - } - - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; - */ - public boolean hasIrTypeParameter() { - return declaratorCase_ == 9; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter getIrTypeParameter() { - if (declaratorCase_ == 9) { + if (declaratorCase_ == 8) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.getDefaultInstance(); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; */ public Builder setIrTypeParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter value) { if (value == null) { @@ -60479,26 +60618,90 @@ public final class KotlinIr { } declarator_ = value; + declaratorCase_ = 8; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; + */ + public Builder setIrTypeParameter( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.Builder builderForValue) { + declarator_ = builderForValue.build(); + + declaratorCase_ = 8; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; + */ + public Builder mergeIrTypeParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter value) { + if (declaratorCase_ == 8 && + declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.getDefaultInstance()) { + declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_) + .mergeFrom(value).buildPartial(); + } else { + declarator_ = value; + } + + declaratorCase_ = 8; + return this; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 8; + */ + public Builder clearIrTypeParameter() { + if (declaratorCase_ == 8) { + declaratorCase_ = 0; + declarator_ = null; + + } + return this; + } + + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; + */ + public boolean hasIrVariable() { + return declaratorCase_ == 9; + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; + */ + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getIrVariable() { + if (declaratorCase_ == 9) { + return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_; + } + return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); + } + /** + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; + */ + public Builder setIrVariable(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { + if (value == null) { + throw new NullPointerException(); + } + declarator_ = value; + declaratorCase_ = 9; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ - public Builder setIrTypeParameter( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.Builder builderForValue) { + public Builder setIrVariable( + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder builderForValue) { declarator_ = builderForValue.build(); declaratorCase_ = 9; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ - public Builder mergeIrTypeParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter value) { + public Builder mergeIrVariable(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { if (declaratorCase_ == 9 && - declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.getDefaultInstance()) { - declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeParameter) declarator_) + declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance()) { + declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_) .mergeFrom(value).buildPartial(); } else { declarator_ = value; @@ -60508,9 +60711,9 @@ public final class KotlinIr { return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrTypeParameter ir_type_parameter = 9; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 9; */ - public Builder clearIrTypeParameter() { + public Builder clearIrVariable() { if (declaratorCase_ == 9) { declaratorCase_ = 0; declarator_ = null; @@ -60520,86 +60723,22 @@ public final class KotlinIr { } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ - public boolean hasIrVariable() { + public boolean hasIrValueParameter() { return declaratorCase_ == 10; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getIrVariable() { - if (declaratorCase_ == 10) { - return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_; - } - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; - */ - public Builder setIrVariable(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { - if (value == null) { - throw new NullPointerException(); - } - declarator_ = value; - - declaratorCase_ = 10; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; - */ - public Builder setIrVariable( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder builderForValue) { - declarator_ = builderForValue.build(); - - declaratorCase_ = 10; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; - */ - public Builder mergeIrVariable(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { - if (declaratorCase_ == 10 && - declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance()) { - declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable) declarator_) - .mergeFrom(value).buildPartial(); - } else { - declarator_ = value; - } - - declaratorCase_ = 10; - return this; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrVariable ir_variable = 10; - */ - public Builder clearIrVariable() { - if (declaratorCase_ == 10) { - declaratorCase_ = 0; - declarator_ = null; - - } - return this; - } - - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; - */ - public boolean hasIrValueParameter() { - return declaratorCase_ == 11; - } - /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter getIrValueParameter() { - if (declaratorCase_ == 11) { + if (declaratorCase_ == 10) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance(); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public Builder setIrValueParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { if (value == null) { @@ -60607,24 +60746,24 @@ public final class KotlinIr { } declarator_ = value; - declaratorCase_ = 11; + declaratorCase_ = 10; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public Builder setIrValueParameter( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.Builder builderForValue) { declarator_ = builderForValue.build(); - declaratorCase_ = 11; + declaratorCase_ = 10; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public Builder mergeIrValueParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter value) { - if (declaratorCase_ == 11 && + if (declaratorCase_ == 10 && declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.getDefaultInstance()) { declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrValueParameter) declarator_) .mergeFrom(value).buildPartial(); @@ -60632,14 +60771,14 @@ public final class KotlinIr { declarator_ = value; } - declaratorCase_ = 11; + declaratorCase_ = 10; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 11; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrValueParameter ir_value_parameter = 10; */ public Builder clearIrValueParameter() { - if (declaratorCase_ == 11) { + if (declaratorCase_ == 10) { declaratorCase_ = 0; declarator_ = null; @@ -60648,22 +60787,22 @@ public final class KotlinIr { } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public boolean hasIrLocalDelegatedProperty() { - return declaratorCase_ == 12; + return declaratorCase_ == 11; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty getIrLocalDelegatedProperty() { - if (declaratorCase_ == 12) { + if (declaratorCase_ == 11) { return (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_; } return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.getDefaultInstance(); } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public Builder setIrLocalDelegatedProperty(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty value) { if (value == null) { @@ -60671,24 +60810,24 @@ public final class KotlinIr { } declarator_ = value; - declaratorCase_ = 12; + declaratorCase_ = 11; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public Builder setIrLocalDelegatedProperty( org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.Builder builderForValue) { declarator_ = builderForValue.build(); - declaratorCase_ = 12; + declaratorCase_ = 11; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public Builder mergeIrLocalDelegatedProperty(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty value) { - if (declaratorCase_ == 12 && + if (declaratorCase_ == 11 && declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.getDefaultInstance()) { declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty.newBuilder((org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrLocalDelegatedProperty) declarator_) .mergeFrom(value).buildPartial(); @@ -60696,14 +60835,14 @@ public final class KotlinIr { declarator_ = value; } - declaratorCase_ = 12; + declaratorCase_ = 11; return this; } /** - * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 12; + * optional .org.jetbrains.kotlin.backend.common.serialization.IrLocalDelegatedProperty ir_local_delegated_property = 11; */ public Builder clearIrLocalDelegatedProperty() { - if (declaratorCase_ == 12) { + if (declaratorCase_ == 11) { declaratorCase_ = 0; declarator_ = null; @@ -60711,800 +60850,6 @@ public final class KotlinIr { return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.IrDeclarator) - } - - static { - defaultInstance = new IrDeclarator(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrDeclarator) - } - - public interface IrDeclarationOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) - org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { - - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - boolean hasOrigin(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin getOrigin(); - - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - boolean hasCoordinates(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates getCoordinates(); - - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - boolean hasAnnotations(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations getAnnotations(); - - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - boolean hasDeclarator(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator getDeclarator(); - } - /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclaration} - */ - public static final class IrDeclaration extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) - IrDeclarationOrBuilder { - // Use IrDeclaration.newBuilder() to construct. - private IrDeclaration(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private IrDeclaration(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - - private static final IrDeclaration defaultInstance; - public static IrDeclaration getDefaultInstance() { - return defaultInstance; - } - - public IrDeclaration getDefaultInstanceForType() { - return defaultInstance; - } - - private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private IrDeclaration( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = origin_.toBuilder(); - } - origin_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(origin_); - origin_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = coordinates_.toBuilder(); - } - coordinates_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(coordinates_); - coordinates_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = annotations_.toBuilder(); - } - annotations_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(annotations_); - annotations_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = declarator_.toBuilder(); - } - declarator_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(declarator_); - declarator_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - 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 PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public IrDeclaration parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new IrDeclaration(input, extensionRegistry); - } - }; - - @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - public static final int ORIGIN_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin origin_; - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public boolean hasOrigin() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin getOrigin() { - return origin_; - } - - public static final int COORDINATES_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates coordinates_; - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public boolean hasCoordinates() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates getCoordinates() { - return coordinates_; - } - - public static final int ANNOTATIONS_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations annotations_; - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public boolean hasAnnotations() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations getAnnotations() { - return annotations_; - } - - public static final int DECLARATOR_FIELD_NUMBER = 4; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator declarator_; - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public boolean hasDeclarator() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator getDeclarator() { - return declarator_; - } - - private void initFields() { - origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); - coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); - annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); - declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - if (!hasOrigin()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasCoordinates()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasAnnotations()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasDeclarator()) { - memoizedIsInitialized = 0; - return false; - } - if (!getOrigin().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (!getCoordinates().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (!getAnnotations().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (!getDeclarator().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, origin_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, coordinates_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, annotations_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, declarator_); - } - 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 - .computeMessageSize(1, origin_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(2, coordinates_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(3, annotations_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(4, declarator_); - } - 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.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclaration parseFrom(byte[] data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclaration parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclaration parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclaration parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration 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.KotlinIr.IrDeclaration prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - /** - * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrDeclaration} - */ - public static final class Builder extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration, Builder> - implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrBuilder { - // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000001); - coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); - annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000004); - declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getDefaultInstanceForType() { - return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); - } - - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration build() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration buildPartial() { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.origin_ = origin_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.coordinates_ = coordinates_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.annotations_ = annotations_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - result.declarator_ = declarator_; - result.bitField0_ = to_bitField0_; - return result; - } - - public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration other) { - if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) return this; - if (other.hasOrigin()) { - mergeOrigin(other.getOrigin()); - } - if (other.hasCoordinates()) { - mergeCoordinates(other.getCoordinates()); - } - if (other.hasAnnotations()) { - mergeAnnotations(other.getAnnotations()); - } - if (other.hasDeclarator()) { - mergeDeclarator(other.getDeclarator()); - } - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); - return this; - } - - public final boolean isInitialized() { - if (!hasOrigin()) { - - return false; - } - if (!hasCoordinates()) { - - return false; - } - if (!hasAnnotations()) { - - return false; - } - if (!hasDeclarator()) { - - return false; - } - if (!getOrigin().isInitialized()) { - - return false; - } - if (!getCoordinates().isInitialized()) { - - return false; - } - if (!getAnnotations().isInitialized()) { - - return false; - } - if (!getDeclarator().isInitialized()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public boolean hasOrigin() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin getOrigin() { - return origin_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public Builder setOrigin(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin value) { - if (value == null) { - throw new NullPointerException(); - } - origin_ = value; - - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public Builder setOrigin( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.Builder builderForValue) { - origin_ = builderForValue.build(); - - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public Builder mergeOrigin(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin value) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - origin_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance()) { - origin_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.newBuilder(origin_).mergeFrom(value).buildPartial(); - } else { - origin_ = value; - } - - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin origin = 1; - */ - public Builder clearOrigin() { - origin_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarationOrigin.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public boolean hasCoordinates() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates getCoordinates() { - return coordinates_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public Builder setCoordinates(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates value) { - if (value == null) { - throw new NullPointerException(); - } - coordinates_ = value; - - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public Builder setCoordinates( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.Builder builderForValue) { - coordinates_ = builderForValue.build(); - - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public Builder mergeCoordinates(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - coordinates_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance()) { - coordinates_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.newBuilder(coordinates_).mergeFrom(value).buildPartial(); - } else { - coordinates_ = value; - } - - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Coordinates coordinates = 2; - */ - public Builder clearCoordinates() { - coordinates_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Coordinates.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public boolean hasAnnotations() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations getAnnotations() { - return annotations_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public Builder setAnnotations(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations value) { - if (value == null) { - throw new NullPointerException(); - } - annotations_ = value; - - bitField0_ |= 0x00000004; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public Builder setAnnotations( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.Builder builderForValue) { - annotations_ = builderForValue.build(); - - bitField0_ |= 0x00000004; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public Builder mergeAnnotations(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations value) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - annotations_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance()) { - annotations_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.newBuilder(annotations_).mergeFrom(value).buildPartial(); - } else { - annotations_ = value; - } - - bitField0_ |= 0x00000004; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.Annotations annotations = 3; - */ - public Builder clearAnnotations() { - annotations_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Annotations.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance(); - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public boolean hasDeclarator() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator getDeclarator() { - return declarator_; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public Builder setDeclarator(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator value) { - if (value == null) { - throw new NullPointerException(); - } - declarator_ = value; - - bitField0_ |= 0x00000008; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public Builder setDeclarator( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.Builder builderForValue) { - declarator_ = builderForValue.build(); - - bitField0_ |= 0x00000008; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public Builder mergeDeclarator(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator value) { - if (((bitField0_ & 0x00000008) == 0x00000008) && - declarator_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance()) { - declarator_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.newBuilder(declarator_).mergeFrom(value).buildPartial(); - } else { - declarator_ = value; - } - - bitField0_ |= 0x00000008; - return this; - } - /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclarator declarator = 4; - */ - public Builder clearDeclarator() { - declarator_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.IrDeclaration) } @@ -61572,7 +60917,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -62102,7 +61447,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -62548,13 +61893,13 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ boolean hasCatchParameter(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCatchParameter(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getCatchParameter(); /** * required .org.jetbrains.kotlin.backend.common.serialization.IrExpression result = 2; @@ -62599,7 +61944,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -62616,11 +61961,11 @@ public final class KotlinIr { break; } case 10: { - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder subBuilder = null; + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = catchParameter_.toBuilder(); } - catchParameter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.PARSER, extensionRegistry); + catchParameter_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(catchParameter_); catchParameter_ = subBuilder.buildPartial(); @@ -62676,17 +62021,17 @@ public final class KotlinIr { private int bitField0_; public static final int CATCH_PARAMETER_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration catchParameter_; + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable catchParameter_; /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ public boolean hasCatchParameter() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCatchParameter() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getCatchParameter() { return catchParameter_; } @@ -62706,7 +62051,7 @@ public final class KotlinIr { } private void initFields() { - catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); result_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -62855,7 +62200,7 @@ public final class KotlinIr { public Builder clear() { super.clear(); - catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); result_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -62946,23 +62291,23 @@ public final class KotlinIr { } private int bitField0_; - private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ public boolean hasCatchParameter() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ - public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCatchParameter() { + public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable getCatchParameter() { return catchParameter_; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ - public Builder setCatchParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder setCatchParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { if (value == null) { throw new NullPointerException(); } @@ -62972,23 +62317,23 @@ public final class KotlinIr { return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ public Builder setCatchParameter( - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.Builder builderForValue) { + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.Builder builderForValue) { catchParameter_ = builderForValue.build(); bitField0_ |= 0x00000001; return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ - public Builder mergeCatchParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration value) { + public Builder mergeCatchParameter(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable value) { if (((bitField0_ & 0x00000001) == 0x00000001) && - catchParameter_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance()) { + catchParameter_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance()) { catchParameter_ = - org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.newBuilder(catchParameter_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.newBuilder(catchParameter_).mergeFrom(value).buildPartial(); } else { catchParameter_ = value; } @@ -62997,10 +62342,10 @@ public final class KotlinIr { return this; } /** - * required .org.jetbrains.kotlin.backend.common.serialization.IrDeclaration catch_parameter = 1; + * required .org.jetbrains.kotlin.backend.common.serialization.IrVariable catch_parameter = 1; */ public Builder clearCatchParameter() { - catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance(); + catchParameter_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVariable.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000001); return this; @@ -63124,7 +62469,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -63552,7 +62897,7 @@ public final class KotlinIr { org.jetbrains.kotlin.protobuf.ByteString.newOutput(); org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); + unknownFieldsOutput); try { boolean done = false; while (!done) { @@ -64699,4 +64044,4 @@ public final class KotlinIr { } // @@protoc_insertion_point(outer_class_scope) -} \ No newline at end of file +} diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt index a5f0d9ca872..fcfa9adc44e 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt @@ -271,9 +271,7 @@ abstract class KotlinIrLinker( val files = proto.fileList.map { deserializeIrFile(it) } - val module = IrModuleFragmentImpl(moduleDescriptor, builtIns, files) - module.patchDeclarationParents(null) - return module + return IrModuleFragmentImpl(moduleDescriptor, builtIns, files) } } @@ -362,7 +360,6 @@ abstract class KotlinIrLinker( val reachable = deserializeTopLevelDeclaration(key) val file = reversedFileIndex[key]!! file.declarations.add(reachable) - reachable.patchDeclarationParents(file) deserializeFileAnnotationsIfFirstUse(moduleOfOrigin, file) reachableTopLevels.remove(key)