From a6057fb4998fc198b8ff0021726094a146b3bc87 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 4 May 2018 18:23:44 +0300 Subject: [PATCH] IR: {IrClass, IrFunction, IrProperty, IrField}.isExternal --- .../kotlin/ir/declarations/IrClass.kt | 1 + .../kotlin/ir/declarations/IrField.kt | 2 + .../kotlin/ir/declarations/IrFunction.kt | 1 + .../kotlin/ir/declarations/IrProperty.kt | 1 + .../ir/declarations/impl/IrClassImpl.kt | 7 +- .../ir/declarations/impl/IrConstructorImpl.kt | 9 +- .../ir/declarations/impl/IrFieldImpl.kt | 15 ++- .../ir/declarations/impl/IrFunctionBase.kt | 1 + .../ir/declarations/impl/IrFunctionImpl.kt | 4 +- .../ir/declarations/impl/IrPropertyImpl.kt | 31 +++++-- .../kotlin/ir/util/RenderIrElement.kt | 40 +++++--- .../constExpressionsInAnnotationArguments.txt | 2 +- .../delegateFieldWithAnnotations.txt | 2 +- ...egatedPropertyAccessorsWithAnnotations.txt | 4 +- .../declarations/classLevelProperties.txt | 4 +- .../declarations/delegatedProperties.txt | 8 +- .../declarations/packageLevelProperties.txt | 4 +- .../provideDelegate/differentReceivers.txt | 4 +- .../declarations/provideDelegate/member.txt | 2 +- .../provideDelegate/memberExtension.txt | 2 +- .../declarations/provideDelegate/topLevel.txt | 2 +- .../builtinMap__dependenciesoftestmodule.txt | 92 +++++++++---------- .../irText/stubs/simple__builtinsmodule.txt | 4 +- 23 files changed, 144 insertions(+), 98 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt index 0e99e98be99..0c099ad028c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt @@ -35,6 +35,7 @@ interface IrClass : IrSymbolDeclaration, IrDeclarationContainer, val modality: Modality val isCompanion: Boolean val isData: Boolean + val isExternal: Boolean // NB type parameters can't be top-level classifiers in supetypes of a class val superClasses: MutableList diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt index 6715e61f201..4ef2d569676 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt @@ -22,5 +22,7 @@ interface IrField : IrSymbolDeclaration { val type: KotlinType val visibility: Visibility val isFinal: Boolean + val isExternal: Boolean + var initializer: IrExpressionBody? } \ No newline at end of file diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFunction.kt index 49947087a5b..c32a5b79216 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFunction.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrFunction.kt @@ -30,6 +30,7 @@ interface IrFunction : IrDeclaration, IrTypeParametersContainer, IrSymbolOwner, val visibility: Visibility val isInline: Boolean // NB: there's an inline constructor for Array and each primitive array class + val isExternal: Boolean val returnType: KotlinType var dispatchReceiverParameter: IrValueParameter? diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt index d90a37c5cf3..aba31db3dfc 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt @@ -33,6 +33,7 @@ interface IrProperty : IrDeclaration { val isConst: Boolean val isLateinit: Boolean val isDelegated: Boolean + val isExternal: Boolean val typeParameters: MutableList diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt index 1b40222ef7e..a021bcd4e3b 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.ir.util.transform import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal import org.jetbrains.kotlin.utils.SmartList class IrClassImpl( @@ -39,7 +40,8 @@ class IrClassImpl( override val visibility: Visibility, override val modality: Modality, override val isCompanion: Boolean, - override val isData: Boolean + override val isData: Boolean, + override val isExternal: Boolean ) : IrDeclarationBase(startOffset, endOffset, origin), IrClass { @@ -48,7 +50,8 @@ class IrClassImpl( startOffset, endOffset, origin, symbol, symbol.descriptor.name, symbol.descriptor.kind, symbol.descriptor.visibility, symbol.descriptor.modality, - symbol.descriptor.isCompanionObject, symbol.descriptor.isData + symbol.descriptor.isCompanionObject, symbol.descriptor.isData, + symbol.descriptor.isEffectivelyExternal() ) constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor) : diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt index 907182c15a9..72b1384c860 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrConstructorImpl.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.ir.expressions.IrBody import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol import org.jetbrains.kotlin.ir.symbols.impl.IrConstructorSymbolImpl import org.jetbrains.kotlin.ir.visitors.IrElementVisitor +import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal import org.jetbrains.kotlin.types.KotlinType class IrConstructorImpl( @@ -33,9 +34,10 @@ class IrConstructorImpl( override val symbol: IrConstructorSymbol, visibility: Visibility, returnType: KotlinType, - isInline: Boolean + isInline: Boolean, + isExternal: Boolean ) : - IrFunctionBase(startOffset, endOffset, origin, visibility, isInline, returnType), + IrFunctionBase(startOffset, endOffset, origin, visibility, isInline, isExternal, returnType), IrConstructor { constructor( @@ -48,7 +50,8 @@ class IrConstructorImpl( startOffset, endOffset, origin, symbol, symbol.descriptor.visibility, symbol.descriptor.returnType, - symbol.descriptor.isInline + symbol.descriptor.isInline, + symbol.descriptor.isEffectivelyExternal() ) { this.body = body } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index d6b2add7b09..f2262682cf0 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal import org.jetbrains.kotlin.types.KotlinType @@ -38,20 +39,16 @@ class IrFieldImpl( override val name: Name, override val type: KotlinType, override val visibility: Visibility, - override val isFinal: Boolean + override val isFinal: Boolean, + override val isExternal: Boolean ) : IrDeclarationBase(startOffset, endOffset, origin), IrField { - constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, symbol: IrFieldSymbol, isFinal: Boolean) : - this( - startOffset, endOffset, origin, symbol, - symbol.descriptor.name, symbol.descriptor.type, symbol.descriptor.visibility, - isFinal - ) - constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, symbol: IrFieldSymbol) : this( startOffset, endOffset, origin, symbol, - symbol.descriptor.modality == Modality.FINAL + symbol.descriptor.name, symbol.descriptor.type, symbol.descriptor.visibility, + symbol.descriptor.modality == Modality.FINAL, + symbol.descriptor.isEffectivelyExternal() ) constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: PropertyDescriptor) : diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionBase.kt index c8e21c05541..221400fe725 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionBase.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionBase.kt @@ -34,6 +34,7 @@ abstract class IrFunctionBase( origin: IrDeclarationOrigin, override val visibility: Visibility, override val isInline: Boolean, + override val isExternal: Boolean, override val returnType: KotlinType ) : IrDeclarationBase(startOffset, endOffset, origin), IrFunction { override val typeParameters: MutableList = SmartList() diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt index b41211d2c75..2c62aee4854 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt @@ -39,10 +39,11 @@ class IrFunctionImpl( override val modality: Modality, returnType: KotlinType, isInline: Boolean, + isExternal: Boolean, override val isTailrec: Boolean, override val isSuspend: Boolean ) : - IrFunctionBase(startOffset, endOffset, origin, visibility, isInline, returnType), + IrFunctionBase(startOffset, endOffset, origin, visibility, isInline, isExternal, returnType), IrSimpleFunction { constructor( @@ -57,6 +58,7 @@ class IrFunctionImpl( symbol.descriptor.modality, symbol.descriptor.returnType!!, symbol.descriptor.isInline, + symbol.descriptor.isExternal, symbol.descriptor.isTailrec, symbol.descriptor.isSuspend ) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt index 2911e4465a3..68c47260b06 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.ir.util.transform import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.utils.SmartList @@ -39,7 +40,8 @@ class IrPropertyImpl( override val isVar: Boolean, override val isConst: Boolean, override val isLateinit: Boolean, - override val isDelegated: Boolean + override val isDelegated: Boolean, + override val isExternal: Boolean ) : IrDeclarationBase(startOffset, endOffset, origin), IrProperty { @@ -52,25 +54,40 @@ class IrPropertyImpl( ) : this( startOffset, endOffset, origin, descriptor, descriptor.name, descriptor.type, descriptor.visibility, descriptor.modality, - descriptor.isVar, descriptor.isConst, descriptor.isLateInit, - isDelegated + isVar = descriptor.isVar, + isConst = descriptor.isConst, + isLateinit = descriptor.isLateInit, + isDelegated = isDelegated, + isExternal = descriptor.isEffectivelyExternal() ) constructor( - startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, descriptor: PropertyDescriptor ) : this(startOffset, endOffset, origin, descriptor.isDelegated, descriptor) constructor( - startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, isDelegated: Boolean, descriptor: PropertyDescriptor, + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + isDelegated: Boolean, + descriptor: PropertyDescriptor, backingField: IrField? ) : this(startOffset, endOffset, origin, isDelegated, descriptor) { this.backingField = backingField } constructor( - startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, isDelegated: Boolean, descriptor: PropertyDescriptor, - backingField: IrField?, getter: IrFunction?, setter: IrFunction? + startOffset: Int, + endOffset: Int, + origin: IrDeclarationOrigin, + isDelegated: Boolean, + descriptor: PropertyDescriptor, + backingField: IrField?, + getter: IrFunction?, + setter: IrFunction? ) : this(startOffset, endOffset, origin, isDelegated, descriptor, backingField) { this.getter = getter this.setter = setter diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt index 5fde3086a91..b535a49b9dc 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt @@ -60,12 +60,16 @@ class RenderIrElementVisitor : IrElementVisitor { "flags:${renderSimpleFunctionFlags()}" } + private fun renderFlagsList(vararg flags: String?) = + flags.filterNotNull().joinToString(separator = ",") + private fun IrSimpleFunction.renderSimpleFunctionFlags(): String = - listOfNotNull( + renderFlagsList( "tailrec".takeIf { isTailrec }, "inline".takeIf { isInline }, + "external".takeIf { isExternal }, "suspend".takeIf { isSuspend } - ).joinToString(separator = ",") + ) private fun IrFunction.renderTypeParameters(): String = typeParameters.joinToString(separator = ", ", prefix = "<", postfix = ">") { it.name.toString() } @@ -84,9 +88,15 @@ class RenderIrElementVisitor : IrElementVisitor { renderTypeParameters() + " " + renderValueParameterTypes() + " " + "returnType:${returnType.render()} " + - "flags:${if (isInline) "inline" else ""}" + "flags:${renderConstructorFlags()}" } + private fun IrConstructor.renderConstructorFlags() = + renderFlagsList( + "inline".takeIf { isInline }, + "external".takeIf { isExternal } + ) + override fun visitProperty(declaration: IrProperty, data: Nothing?): String = declaration.run { "PROPERTY ${renderOriginIfNonTrivial()}" + @@ -95,12 +105,13 @@ class RenderIrElementVisitor : IrElementVisitor { } private fun IrProperty.renderPropertyFlags() = - listOfNotNull( + renderFlagsList( + "external".takeIf { isExternal }, "const".takeIf { isConst }, "lateinit".takeIf { isLateinit }, "delegated".takeIf { isDelegated }, if (isVar) "var" else "val" - ).joinToString(separator = "m") + ) override fun visitField(declaration: IrField, data: Nothing?): String = "FIELD ${declaration.renderOriginIfNonTrivial()}" + @@ -108,7 +119,10 @@ class RenderIrElementVisitor : IrElementVisitor { "flags:${declaration.renderFieldFlags()}" private fun IrField.renderFieldFlags() = - if (isFinal) "final" else "" + renderFlagsList( + "final".takeIf { isFinal }, + "external".takeIf { isExternal } + ) override fun visitClass(declaration: IrClass, data: Nothing?): String = declaration.run { @@ -118,7 +132,11 @@ class RenderIrElementVisitor : IrElementVisitor { } private fun IrClass.renderClassFlags() = - listOfNotNull("companion".takeIf { isCompanion }, "data".takeIf { isData }).joinToString(separator = ",") + renderFlagsList( + "companion".takeIf { isCompanion }, + "data".takeIf { isData }, + "external".takeIf { isExternal } + ) override fun visitTypeAlias(declaration: IrTypeAlias, data: Nothing?): String = "TYPEALIAS ${declaration.renderOriginIfNonTrivial()}${declaration.descriptor.ref()} type=${declaration.descriptor.underlyingType.render()}" @@ -128,11 +146,11 @@ class RenderIrElementVisitor : IrElementVisitor { "name:${declaration.name} type:${declaration.type.render()} flags:${declaration.renderVariableFlags()}" private fun IrVariable.renderVariableFlags(): String = - listOfNotNull( + renderFlagsList( "const".takeIf { isConst }, "lateinit".takeIf { isLateinit }, if (isVar) "var" else "val" - ).joinToString(separator = " ") + ) override fun visitEnumEntry(declaration: IrEnumEntry, data: Nothing?): String = "ENUM_ENTRY ${declaration.renderOriginIfNonTrivial()}name:${declaration.name}" @@ -158,11 +176,11 @@ class RenderIrElementVisitor : IrElementVisitor { } private fun IrValueParameter.renderValueParameterFlags(): String = - listOfNotNull( + renderFlagsList( "vararg".takeIf { varargElementType != null }, "crossinline".takeIf { isCrossinline }, "noinline".takeIf { isNoinline } - ).joinToString(separator = ",") + ) override fun visitLocalDelegatedProperty(declaration: IrLocalDelegatedProperty, data: Nothing?): String = declaration.run { diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt index 62669b79cec..3fc5db7e88b 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.txt @@ -1,5 +1,5 @@ FILE fqName: fileName:/constExpressionsInAnnotationArguments.kt - PROPERTY name:ONE type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY name:ONE type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD PROPERTY_BACKING_FIELD name:ONE type:kotlin.Int visibility:public flags:final EXPRESSION_BODY CONST Int type=kotlin.Int value=1 diff --git a/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt index 04e271d4868..6ae7c45b68a 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.txt @@ -17,7 +17,7 @@ FILE fqName: fileName:/delegateFieldWithAnnotations.kt overridden: FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: $this: VALUE_PARAMETER name: type:kotlin.Any flags: - PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:test1$delegate type:kotlin.Lazy visibility:private flags:final annotations: CALL 'constructor Ann()' type=Ann origin=null diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt index 20a7cf8555c..8dd990a201e 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt @@ -84,7 +84,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt overridden: FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: $this: VALUE_PARAMETER name: type:kotlin.Any flags: - PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:test1$delegate type:Cell visibility:private flags:final EXPRESSION_BODY CALL 'constructor Cell(Int)' type=Cell origin=null @@ -99,7 +99,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt $this: GET_FIELD '`test1$delegate`: Cell' type=Cell origin=null thisRef: CONST Null type=kotlin.Nothing? value=null kProp: PROPERTY_REFERENCE 'test1: Int' field=null getter='(): Int' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE - PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmvar + PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var FIELD DELEGATE name:test2$delegate type:Cell visibility:private flags:final EXPRESSION_BODY CALL 'constructor Cell(Int)' type=Cell origin=null diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt index 22532f1b0f9..bdf15a1491a 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt @@ -84,7 +84,7 @@ FILE fqName: fileName:/classLevelProperties.kt RETURN type=kotlin.Nothing from='(): Int' GET_FIELD 'test6: Int' type=kotlin.Int origin=null receiver: GET_VAR 'this@C: C' type=C origin=null - PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:test7$delegate type:kotlin.Lazy visibility:private flags:final EXPRESSION_BODY CALL 'lazy(() -> Int): Lazy' type=kotlin.Lazy origin=null @@ -105,7 +105,7 @@ FILE fqName: fileName:/classLevelProperties.kt receiver: GET_VAR 'this@C: C' type=C origin=null thisRef: GET_VAR 'this@C: C' type=C origin=null property: PROPERTY_REFERENCE 'test7: Int' field=null getter='(): Int' setter=null type=kotlin.reflect.KProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE - PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmvar + PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var FIELD DELEGATE name:test8$delegate type:kotlin.collections.HashMap /* = java.util.HashMap */ visibility:private flags:final EXPRESSION_BODY CALL 'hashMapOf(): HashMap /* = HashMap */' type=kotlin.collections.HashMap /* = java.util.HashMap */ origin=null diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.txt index 1c372f744dc..ddc1a6c5c98 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.txt @@ -1,5 +1,5 @@ FILE fqName: fileName:/delegatedProperties.kt - PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:test1 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:test1$delegate type:kotlin.Lazy visibility:private flags:final EXPRESSION_BODY CALL 'lazy(() -> Int): Lazy' type=kotlin.Lazy origin=null @@ -37,7 +37,7 @@ FILE fqName: fileName:/delegatedProperties.kt RETURN type=kotlin.Nothing from='(): MutableMap' GET_FIELD 'map: MutableMap' type=kotlin.collections.MutableMap origin=null receiver: GET_VAR 'this@C: C' type=C origin=null - PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:test2$delegate type:kotlin.Lazy visibility:private flags:final EXPRESSION_BODY CALL 'lazy(() -> Int): Lazy' type=kotlin.Lazy origin=null @@ -58,7 +58,7 @@ FILE fqName: fileName:/delegatedProperties.kt receiver: GET_VAR 'this@C: C' type=C origin=null thisRef: GET_VAR 'this@C: C' type=C origin=null property: PROPERTY_REFERENCE 'test2: Int' field=null getter='(): Int' setter=null type=kotlin.reflect.KProperty1 origin=PROPERTY_REFERENCE_FOR_DELEGATE - PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:delegatedmvar + PROPERTY name:test3 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var FIELD DELEGATE name:test3$delegate type:kotlin.collections.MutableMap visibility:private flags:final EXPRESSION_BODY CALL '(): MutableMap' type=kotlin.collections.MutableMap origin=GET_PROPERTY @@ -99,7 +99,7 @@ FILE fqName: fileName:/delegatedProperties.kt overridden: FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: $this: VALUE_PARAMETER name: type:kotlin.Any flags: - PROPERTY name:test4 type:kotlin.Any visibility:public modality:FINAL flags:delegatedmvar + PROPERTY name:test4 type:kotlin.Any visibility:public modality:FINAL flags:delegated,var FIELD DELEGATE name:test4$delegate type:kotlin.collections.HashMap /* = java.util.HashMap */ visibility:private flags:final EXPRESSION_BODY CALL 'hashMapOf(): HashMap /* = HashMap */' type=kotlin.collections.HashMap /* = java.util.HashMap */ origin=null diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt index 453f4128d92..1360129289d 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt @@ -59,7 +59,7 @@ FILE fqName: fileName:/packageLevelProperties.kt BLOCK_BODY RETURN type=kotlin.Nothing from='(): Int' GET_FIELD 'test6: Int' type=kotlin.Int origin=null - PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:test7 type:kotlin.Int visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:test7$delegate type:kotlin.Lazy visibility:private flags:final EXPRESSION_BODY CALL 'lazy(() -> Int): Lazy' type=kotlin.Lazy origin=null @@ -78,7 +78,7 @@ FILE fqName: fileName:/packageLevelProperties.kt $receiver: GET_FIELD '`test7$delegate`: Lazy' type=kotlin.Lazy origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'test7: Int' field=null getter='(): Int' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE - PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegatedmvar + PROPERTY name:test8 type:kotlin.Int visibility:public modality:FINAL flags:delegated,var FIELD DELEGATE name:test8$delegate type:kotlin.collections.HashMap /* = java.util.HashMap */ visibility:private flags:final EXPRESSION_BODY CALL 'hashMapOf(): HashMap /* = HashMap */' type=kotlin.collections.HashMap /* = java.util.HashMap */ origin=null diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt index 3d4520afc86..311f4ca59d9 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.txt @@ -46,7 +46,7 @@ FILE fqName: fileName:/differentReceivers.kt BLOCK_BODY RETURN type=kotlin.Nothing from='getValue(Any?, Any) on String: String' GET_VAR 'this@getValue: String' type=kotlin.String origin=null - PROPERTY name:testO type:kotlin.String visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:testO type:kotlin.String visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:testO$delegate type:kotlin.String visibility:private flags:final EXPRESSION_BODY CALL 'provideDelegate(Any?, Any) on MyClass: String' type=kotlin.String origin=null @@ -61,7 +61,7 @@ FILE fqName: fileName:/differentReceivers.kt $receiver: GET_FIELD '`testO$delegate`: String' type=kotlin.String origin=null receiver: CONST Null type=kotlin.Nothing? value=null p: PROPERTY_REFERENCE 'testO: String' field=null getter='(): String' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE - PROPERTY name:testK type:kotlin.String visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:testK type:kotlin.String visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:testK$delegate type:kotlin.String visibility:private flags:final EXPRESSION_BODY CONST String type=kotlin.String value=K diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt index 71bc0c19e23..d8065877a54 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/member.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.txt @@ -88,7 +88,7 @@ FILE fqName: fileName:/member.kt BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='Host' - PROPERTY name:testMember type:kotlin.String visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:testMember type:kotlin.String visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:testMember$delegate type:Delegate visibility:private flags:final EXPRESSION_BODY CALL 'provideDelegate(Any?, Any?): Delegate' type=Delegate origin=null diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt index 47b356e852b..b4147f4537d 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.txt @@ -58,7 +58,7 @@ FILE fqName: fileName:/memberExtension.kt RETURN type=kotlin.Nothing from='provideDelegate(Any?, Any) on String: Host.StringDelegate' CALL 'constructor StringDelegate(String)' type=Host.StringDelegate origin=null s: GET_VAR 'this@provideDelegate: String' type=kotlin.String origin=null - PROPERTY name:plusK type:kotlin.String visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:plusK type:kotlin.String visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:plusK$delegate type:Host.StringDelegate visibility:private flags:final EXPRESSION_BODY CALL 'provideDelegate(Any?, Any) on String: Host.StringDelegate' type=Host.StringDelegate origin=null diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt index 465c09ea4ab..40cdc38e4ef 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.txt @@ -80,7 +80,7 @@ FILE fqName: fileName:/topLevel.kt overridden: FUN IR_EXTERNAL_DECLARATION_STUB name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: $this: VALUE_PARAMETER name: type:kotlin.Any flags: - PROPERTY name:testTopLevel type:kotlin.String visibility:public modality:FINAL flags:delegatedmval + PROPERTY name:testTopLevel type:kotlin.String visibility:public modality:FINAL flags:delegated,val FIELD DELEGATE name:testTopLevel$delegate type:Delegate visibility:private flags:final EXPRESSION_BODY CALL 'provideDelegate(Any?, Any?): Delegate' type=Delegate origin=null diff --git a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt index 51072e7d9c3..df77dae1e74 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt @@ -393,7 +393,7 @@ MODULE_FRAGMENT name: overridden: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractCollection!> flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array?) flags: overridden: @@ -560,7 +560,7 @@ MODULE_FRAGMENT name: overridden: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractCollection flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array?) flags: overridden: @@ -727,7 +727,7 @@ MODULE_FRAGMENT name: overridden: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractCollection flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array?) flags: overridden: @@ -917,19 +917,19 @@ MODULE_FRAGMENT name: FUN FAKE_OVERRIDE name:eq visibility:invisible_fake modality:OPEN <> (p0:kotlin.Any!, p1:kotlin.Any!) returnType:Boolean flags: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Any! flags: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p1 index:1 type:kotlin.Any! flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final FUN FAKE_OVERRIDE name:hash visibility:public/*package*/ modality:FINAL <> (p0:kotlin.Any!) returnType:Int flags: overridden: @@ -1261,21 +1261,21 @@ MODULE_FRAGMENT name: FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public flags:final CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeySpliterator modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.KeySpliterator flags: @@ -1358,21 +1358,21 @@ MODULE_FRAGMENT name: FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public flags:final CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:TreeNode modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.TreeNode flags: @@ -1583,21 +1583,21 @@ MODULE_FRAGMENT name: FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:CONCURRENT type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DISTINCT type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:IMMUTABLE type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:NONNULL type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:ORDERED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SORTED type:kotlin.Int visibility:public flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:SUBSIZED type:kotlin.Int visibility:public flags:final FUN IR_EXTERNAL_DECLARATION_STUB name:capacity visibility:public/*package*/ modality:FINAL <> ($this:java.util.HashMap) returnType:Int flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap flags: @@ -1788,7 +1788,7 @@ MODULE_FRAGMENT name: overridden: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractCollection!> flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array?) flags: overridden: @@ -1957,7 +1957,7 @@ MODULE_FRAGMENT name: overridden: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractCollection flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array?) flags: overridden: @@ -2126,7 +2126,7 @@ MODULE_FRAGMENT name: overridden: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractCollection flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAX_ARRAY_SIZE type:kotlin.Int visibility:invisible_fake flags:final FUN FAKE_OVERRIDE name:finishToArray visibility:invisible_fake modality:OPEN (p0:kotlin.Array<(out) T!>!, p1:kotlin.collections.(Mutable)Iterator<*>!) returnType:(kotlin.Array<(T..T?)>..kotlin.Array?) flags: overridden: @@ -2281,19 +2281,19 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:eq visibility:private modality:OPEN <> (p0:kotlin.Any!, p1:kotlin.Any!) returnType:Boolean flags: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Any! flags: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p1 index:1 type:kotlin.Any! flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_INITIAL_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:DEFAULT_LOAD_FACTOR type:kotlin.Float visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MAXIMUM_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:MIN_TREEIFY_CAPACITY type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:TREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:UNTREEIFY_THRESHOLD type:kotlin.Int visibility:public/*package*/ flags:final FUN IR_EXTERNAL_DECLARATION_STUB name:hash visibility:public/*package*/ modality:FINAL <> (p0:kotlin.Any!) returnType:Int flags: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Any! flags: @@ -2378,7 +2378,7 @@ MODULE_FRAGMENT name: FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractMap.SimpleEntry flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:SimpleImmutableEntry modality:OPEN visibility:public flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractMap.SimpleImmutableEntry flags: @@ -2427,7 +2427,7 @@ MODULE_FRAGMENT name: FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:String flags: UNBOUND: fun toString(): kotlin.String $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractMap.SimpleImmutableEntry flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private modality:FINAL flags:const,val FIELD IR_EXTERNAL_DECLARATION_STUB name:serialVersionUID type:kotlin.Long visibility:private flags:final FUN FAKE_OVERRIDE name:compute visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap, p0:K!, p1:java.util.function.BiFunction) returnType:V? flags: overridden: diff --git a/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt b/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt index b2f0d6d1db5..126aca1be4e 100644 --- a/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt +++ b/compiler/testData/ir/irText/stubs/simple__builtinsmodule.txt @@ -48,10 +48,10 @@ MODULE_FRAGMENT name: superClasses: UNBOUND: class Any CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:private <> () returnType:kotlin.Int.Companion flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_VALUE type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MAX_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val FUN IR_EXTERNAL_DECLARATION_STUB name: visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:Int flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int.Companion flags: - PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_VALUE type:kotlin.Int visibility:public modality:FINAL flags:constmval + PROPERTY IR_EXTERNAL_DECLARATION_STUB name:MIN_VALUE type:kotlin.Int visibility:public modality:FINAL flags:const,val FUN IR_EXTERNAL_DECLARATION_STUB name: visibility:public modality:FINAL <> ($this:kotlin.Int.Companion) returnType:Int flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int.Companion flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: