From 93f5fe2451cf9739820ec7f42fc016256d485161 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 10 May 2018 11:27:55 +0300 Subject: [PATCH] IrField is 'final' if corresponding property is 'val' --- .../ir/declarations/impl/IrFieldImpl.kt | 3 +- .../ir/irText/classes/classMembers.txt | 3 +- .../classes/delegatedImplementation.txt | 2 +- .../testData/ir/irText/classes/initVar.txt | 12 +- .../testData/ir/irText/classes/superCalls.txt | 2 +- ...egatedPropertyAccessorsWithAnnotations.txt | 2 +- .../annotations/fieldsWithAnnotations.txt | 3 +- ...ccessorsFromClassHeaderWithAnnotations.txt | 3 +- .../propertyAccessorsWithAnnotations.txt | 3 +- ...propertySetterParameterWithAnnotations.txt | 5 +- .../declarations/classLevelProperties.txt | 6 +- .../ir/irText/declarations/fakeOverrides.txt | 2 +- .../declarations/localClassWithOverrides.txt | 2 +- ...lDelegatedPropertyWithSuspendOperators.txt | 2 +- .../declarations/packageLevelProperties.txt | 6 +- .../parameters/defaultPropertyAccessors.txt | 6 +- .../declarations/primaryCtorProperties.txt | 2 +- .../ir/irText/expressions/assignments.txt | 2 +- .../expressions/augmentedAssignment1.txt | 2 +- .../complexAugmentedAssignment.txt | 8 +- .../expressions/enumEntryAsReceiver.txt | 2 +- .../testData/ir/irText/expressions/field.txt | 4 +- .../expressions/forWithImplicitReceivers.txt | 2 +- .../irText/expressions/incrementDecrement.txt | 2 +- .../expressions/jvmInstanceFieldReference.txt | 2 +- .../ir/irText/expressions/kt16904.txt | 4 +- .../ir/irText/expressions/safeAssignment.txt | 2 +- .../ir/irText/expressions/safeCalls.txt | 2 +- .../expressions/setFieldWithImplicitCast.txt | 2 +- .../irText/expressions/useImportedMember.txt | 2 +- .../irText/lambdas/destructuringInLambda.txt | 2 +- .../builtinMap__dependenciesoftestmodule.txt | 164 +++++++++--------- .../ir/irText/stubs/javaInnerClass.txt | 2 +- .../stubs/javaInnerClass__testmodule.txt | 4 +- 34 files changed, 133 insertions(+), 139 deletions(-) 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 f2262682cf0..47d5855bef5 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 @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.ir.declarations.impl -import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin @@ -47,7 +46,7 @@ class IrFieldImpl( this( startOffset, endOffset, origin, symbol, symbol.descriptor.name, symbol.descriptor.type, symbol.descriptor.visibility, - symbol.descriptor.modality == Modality.FINAL, + !symbol.descriptor.isVar, symbol.descriptor.isEffectivelyExternal() ) diff --git a/compiler/testData/ir/irText/classes/classMembers.txt b/compiler/testData/ir/irText/classes/classMembers.txt index a2464a8d103..f8827461d93 100644 --- a/compiler/testData/ir/irText/classes/classMembers.txt +++ b/compiler/testData/ir/irText/classes/classMembers.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/classMembers.kt GET_FIELD 'y: Int' type=kotlin.Int origin=null receiver: GET_VAR 'this@C: C' type=C origin=null PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter z: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: @@ -177,4 +177,3 @@ FILE fqName: fileName:/classMembers.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: - diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.txt index 442f6a8b021..1c3886086a2 100644 --- a/compiler/testData/ir/irText/classes/delegatedImplementation.txt +++ b/compiler/testData/ir/irText/classes/delegatedImplementation.txt @@ -119,7 +119,7 @@ FILE fqName: fileName:/delegatedImplementation.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='' PROPERTY name:x type:kotlin.String visibility:public modality:OPEN flags:val - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public flags: + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public flags:final EXPRESSION_BODY GET_VAR 'value-parameter x0: String' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:otherImpl.) returnType:String flags: diff --git a/compiler/testData/ir/irText/classes/initVar.txt b/compiler/testData/ir/irText/classes/initVar.txt index 70bf9ddb8cd..f57bd4348ff 100644 --- a/compiler/testData/ir/irText/classes/initVar.txt +++ b/compiler/testData/ir/irText/classes/initVar.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='TestInitVarFromParameter' PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:TestInitVarFromParameter) returnType:Int flags: @@ -47,7 +47,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='TestInitVarInClass' PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:TestInitVarInClass) returnType:Int flags: @@ -85,7 +85,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='TestInitVarInInitBlock' PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:TestInitVarInInitBlock) returnType:Int flags: $this: VALUE_PARAMETER name: type:TestInitVarInInitBlock flags: BLOCK_BODY @@ -126,7 +126,7 @@ FILE fqName: fileName:/initVar.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='TestInitVarWithCustomSetter' PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetter) returnType:Int flags: @@ -160,7 +160,7 @@ FILE fqName: fileName:/initVar.kt superClasses: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetterWithExplicitCtor) returnType:Int flags: $this: VALUE_PARAMETER name: type:TestInitVarWithCustomSetterWithExplicitCtor flags: BLOCK_BODY @@ -201,7 +201,7 @@ FILE fqName: fileName:/initVar.kt superClasses: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags: PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:TestInitVarWithCustomSetterInCtor) returnType:Int flags: $this: VALUE_PARAMETER name: type:TestInitVarWithCustomSetterInCtor flags: BLOCK_BODY diff --git a/compiler/testData/ir/irText/classes/superCalls.txt b/compiler/testData/ir/irText/classes/superCalls.txt index e785f589e91..0c7ca4d2a06 100644 --- a/compiler/testData/ir/irText/classes/superCalls.txt +++ b/compiler/testData/ir/irText/classes/superCalls.txt @@ -11,7 +11,7 @@ FILE fqName: fileName:/superCalls.kt $this: VALUE_PARAMETER name: type:Base flags: BLOCK_BODY PROPERTY name:bar type:kotlin.String visibility:public modality:OPEN flags:val - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:public flags: + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.String visibility:public flags:final EXPRESSION_BODY CONST String type=kotlin.String value= FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:Base) returnType:String flags: diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt index 627bc7de87a..ab9b7083af0 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.txt @@ -38,7 +38,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='Cell' PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:Cell) returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt index 7c391f2a09a..6566479ece4 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.txt @@ -40,7 +40,7 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt RETURN type=kotlin.Nothing from='(): String' GET_FIELD 'testVal: String' type=kotlin.String origin=null PROPERTY name:testVar type:kotlin.String visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public flags: annotations: CALL 'constructor TestAnn(String)' type=TestAnn origin=null x: CONST String type=kotlin.String value=testVar.field @@ -55,4 +55,3 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt BLOCK_BODY SET_FIELD 'testVar: String' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : String' type=kotlin.String origin=null - diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt index 9cd5a68d84d..02d64e03702 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.txt @@ -52,7 +52,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt GET_FIELD 'x: Int' type=kotlin.Int origin=null receiver: GET_VAR 'this@C: C' type=C origin=null PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter y: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: @@ -87,4 +87,3 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.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: - diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt index 3191a8aab5d..e513845c1b1 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.txt @@ -62,7 +62,7 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt RETURN type=kotlin.Nothing from='(): String' GET_FIELD 'test3: String' type=kotlin.String origin=null PROPERTY name:test4 type:kotlin.String visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public flags: EXPRESSION_BODY CONST String type=kotlin.String value= FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:String flags: @@ -80,4 +80,3 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt BLOCK_BODY SET_FIELD 'test4: String' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : String' type=kotlin.String origin=null - diff --git a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt index 73ead3f6f8c..576a851d637 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.txt @@ -18,7 +18,7 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.kt 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:p type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: @@ -42,7 +42,7 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='C' PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter p: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: @@ -73,4 +73,3 @@ FILE fqName: fileName:/propertySetterParameterWithAnnotations.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: - diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.txt index 148dfbd6a80..eadf248ac14 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/classLevelProperties.kt RETURN type=kotlin.Nothing from='(): Int' CONST Int type=kotlin.Int value=0 PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: @@ -41,7 +41,7 @@ FILE fqName: fileName:/classLevelProperties.kt receiver: GET_VAR 'this@C: C' type=C origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: @@ -58,7 +58,7 @@ FILE fqName: fileName:/classLevelProperties.kt receiver: GET_VAR 'this@C: C' type=C origin=null value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY name:test5 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.txt index 31eb1a55fbf..54bb160dc19 100644 --- a/compiler/testData/ir/irText/declarations/fakeOverrides.txt +++ b/compiler/testData/ir/irText/declarations/fakeOverrides.txt @@ -79,7 +79,7 @@ FILE fqName: fileName:/fakeOverrides.kt : String INSTANCE_INITIALIZER_CALL classDescriptor='Test1' PROPERTY name:bar type:kotlin.Int visibility:public modality:OPEN flags:val - FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public flags: + FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public flags:final EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:Test1) returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt b/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt index d6131d1df42..8e7247ad865 100644 --- a/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt +++ b/compiler/testData/ir/irText/declarations/localClassWithOverrides.txt @@ -47,7 +47,7 @@ FILE fqName: fileName:/localClassWithOverrides.kt $this: VALUE_PARAMETER name: type:outer.Local flags: BLOCK_BODY PROPERTY name:aval type:kotlin.Int visibility:public modality:OPEN flags:val - FIELD PROPERTY_BACKING_FIELD name:aval type:kotlin.Int visibility:public flags: + FIELD PROPERTY_BACKING_FIELD name:aval type:kotlin.Int visibility:public flags:final EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:OPEN <> ($this:outer.Local) returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt index 1d111121713..53309774552 100644 --- a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt +++ b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/localDelegatedPropertyWithSuspendOperators.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='A' PROPERTY name:z type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:A) returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt index 1360129289d..46951b7a1cc 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.txt @@ -13,7 +13,7 @@ FILE fqName: fileName:/packageLevelProperties.kt RETURN type=kotlin.Nothing from='(): Int' CONST Int type=kotlin.Int value=0 PROPERTY name:test3 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: @@ -26,7 +26,7 @@ FILE fqName: fileName:/packageLevelProperties.kt SET_FIELD 'test3: Int' type=kotlin.Unit origin=null value: GET_VAR 'value-parameter : Int' type=kotlin.Int origin=null PROPERTY name:test4 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: @@ -39,7 +39,7 @@ FILE fqName: fileName:/packageLevelProperties.kt SET_FIELD 'test4: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY name:test5 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt index 4bfb77e66e5..7350fb33b72 100644 --- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt +++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt RETURN type=kotlin.Nothing from='(): Int' GET_FIELD 'test1: Int' type=kotlin.Int origin=null PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: @@ -39,7 +39,7 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt GET_FIELD 'testMember1: Int' type=kotlin.Int origin=null receiver: GET_VAR 'this@Host: Host' type=Host origin=null PROPERTY name:testMember2 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:testMember2 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:Host) returnType:Int flags: @@ -94,7 +94,7 @@ FILE fqName: fileName:/defaultPropertyAccessors.kt GET_FIELD 'testInPrimaryCtor1: T' type=T origin=null receiver: GET_VAR 'this@InPrimaryCtor: InPrimaryCtor' type=InPrimaryCtor origin=null PROPERTY name:testInPrimaryCtor2 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor2 type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter testInPrimaryCtor2: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:InPrimaryCtor) returnType:Int flags: diff --git a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt index 0f3800b2ce4..b20a622dcaf 100644 --- a/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt +++ b/compiler/testData/ir/irText/declarations/primaryCtorProperties.txt @@ -20,7 +20,7 @@ FILE fqName: fileName:/primaryCtorProperties.kt GET_FIELD 'test1: Int' type=kotlin.Int origin=null receiver: GET_VAR 'this@C: C' type=C origin=null PROPERTY name:test2 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter test2: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/assignments.txt b/compiler/testData/ir/irText/expressions/assignments.txt index 4d55569f7cf..333569aac7d 100644 --- a/compiler/testData/ir/irText/expressions/assignments.txt +++ b/compiler/testData/ir/irText/expressions/assignments.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/assignments.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='Ref' PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:Ref) returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt index 8d0f4e3ed30..a218bff47b6 100644 --- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt +++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/augmentedAssignment1.kt PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt index 0681377d216..1c2169d10a2 100644 --- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt +++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.txt @@ -8,7 +8,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='X1' PROPERTY name:x1 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:X1) returnType:Int flags: @@ -33,7 +33,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='X2' PROPERTY name:x2 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:X1.X2) returnType:Int flags: @@ -58,7 +58,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='X3' PROPERTY name:x3 type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:X1.X2.X3) returnType:Int flags: @@ -197,7 +197,7 @@ FILE fqName: fileName:/complexAugmentedAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='B' PROPERTY name:s type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter s: Int = ...' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:B) returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt index 4dff54cbccc..30da5b3f9f7 100644 --- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt +++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.txt @@ -29,7 +29,7 @@ FILE fqName: fileName:/enumEntryAsReceiver.kt GET_FIELD 'value2: String' type=kotlin.String origin=null receiver: GET_VAR 'this@B: B' type=X.B origin=null PROPERTY name:value type:() -> kotlin.String visibility:public modality:OPEN flags:val - FIELD PROPERTY_BACKING_FIELD name:value type:() -> kotlin.String visibility:public flags: + FIELD PROPERTY_BACKING_FIELD name:value type:() -> kotlin.String visibility:public flags:final EXPRESSION_BODY BLOCK type=() -> kotlin.String origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:String flags: diff --git a/compiler/testData/ir/irText/expressions/field.txt b/compiler/testData/ir/irText/expressions/field.txt index 983043704ee..fae97c94c32 100644 --- a/compiler/testData/ir/irText/expressions/field.txt +++ b/compiler/testData/ir/irText/expressions/field.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/field.kt PROPERTY name:testSimple type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:testSimple type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: @@ -13,7 +13,7 @@ FILE fqName: fileName:/field.kt SET_FIELD 'testSimple: Int' type=kotlin.Unit origin=EQ value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY name:testAugmented type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt index 43c357a10ab..69e8c715514 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt @@ -30,7 +30,7 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='IntCell' PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:IntCell) returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.txt index 3119a2c03d7..25ac6895a3b 100644 --- a/compiler/testData/ir/irText/expressions/incrementDecrement.txt +++ b/compiler/testData/ir/irText/expressions/incrementDecrement.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/incrementDecrement.kt PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt index 85be39fb40c..12022456c1e 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.txt @@ -26,7 +26,7 @@ FILE fqName: fileName:/Derived.kt receiver: GET_VAR 'this@Derived: Derived' type=Derived origin=null value: GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=null PROPERTY FAKE_OVERRIDE name:value type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD FAKE_OVERRIDE name:value type:kotlin.Int visibility:public flags:final + FIELD FAKE_OVERRIDE name:value type:kotlin.Int visibility:public flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: overridden: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: diff --git a/compiler/testData/ir/irText/expressions/kt16904.txt b/compiler/testData/ir/irText/expressions/kt16904.txt index a441eeeda0d..03c6f32543d 100644 --- a/compiler/testData/ir/irText/expressions/kt16904.txt +++ b/compiler/testData/ir/irText/expressions/kt16904.txt @@ -18,7 +18,7 @@ FILE fqName: fileName:/kt16904.kt GET_FIELD 'x: B' type=B origin=null receiver: GET_VAR 'this@A: A' type=A origin=null PROPERTY name:y type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=0 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:A) returnType:Int flags: @@ -138,7 +138,7 @@ FILE fqName: fileName:/kt16904.kt receiver: GET_VAR 'this@Test2: Test2' type=Test2 origin=null value: CONST Int type=kotlin.Int value=42 PROPERTY FAKE_OVERRIDE name:field type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD FAKE_OVERRIDE name:field type:kotlin.Int visibility:public flags:final + FIELD FAKE_OVERRIDE name:field type:kotlin.Int visibility:public flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: overridden: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.txt b/compiler/testData/ir/irText/expressions/safeAssignment.txt index 1926fb2dc65..ab9c2f4d06a 100644 --- a/compiler/testData/ir/irText/expressions/safeAssignment.txt +++ b/compiler/testData/ir/irText/expressions/safeAssignment.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/safeAssignment.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='C' PROPERTY name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter x: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/safeCalls.txt b/compiler/testData/ir/irText/expressions/safeCalls.txt index 73bfe65a2bd..5e98c5d8c86 100644 --- a/compiler/testData/ir/irText/expressions/safeCalls.txt +++ b/compiler/testData/ir/irText/expressions/safeCalls.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/safeCalls.kt DELEGATING_CONSTRUCTOR_CALL 'constructor Any()' INSTANCE_INITIALIZER_CALL classDescriptor='Ref' PROPERTY name:value type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public flags: EXPRESSION_BODY GET_VAR 'value-parameter value: Int' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:Ref) returnType:Int flags: diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt index 6d18d727e71..dceb897b400 100644 --- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt +++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.txt @@ -23,7 +23,7 @@ FILE fqName: fileName:/Derived.kt typeOperand: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:String modality:FINAL visibility:public flags: GET_VAR 'value-parameter v: Any' type=kotlin.Any origin=null PROPERTY FAKE_OVERRIDE name:value type:kotlin.String! visibility:public modality:FINAL flags:var - FIELD FAKE_OVERRIDE name:value type:kotlin.String! visibility:public flags:final + FIELD FAKE_OVERRIDE name:value type:kotlin.String! visibility:public flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: overridden: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.txt b/compiler/testData/ir/irText/expressions/useImportedMember.txt index fba6d0f9dcf..ffbf1b4b9fb 100644 --- a/compiler/testData/ir/irText/expressions/useImportedMember.txt +++ b/compiler/testData/ir/irText/expressions/useImportedMember.txt @@ -93,7 +93,7 @@ FILE fqName: fileName:/useImportedMember.kt RETURN type=kotlin.Nothing from='f() on Boolean: Int' CONST Int type=kotlin.Int value=3 PROPERTY name:p type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public flags: EXPRESSION_BODY CONST Int type=kotlin.Int value=4 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:C) returnType:Int flags: diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt index 11bb015aae2..226d01595ba 100644 --- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt +++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.txt @@ -140,7 +140,7 @@ FILE fqName: fileName:/destructuringInLambda.kt RETURN type=kotlin.Nothing from='equals(Any?): Boolean' CONST Boolean type=kotlin.Boolean value=true PROPERTY name:fn type:(A) -> kotlin.Int visibility:public modality:FINAL flags:var - FIELD PROPERTY_BACKING_FIELD name:fn type:(A) -> kotlin.Int visibility:public flags:final + FIELD PROPERTY_BACKING_FIELD name:fn type:(A) -> kotlin.Int visibility:public flags: EXPRESSION_BODY BLOCK type=(A) -> kotlin.Int origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (:A) returnType:Int flags: diff --git a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt index c17b01a259a..c5c5b204610 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap__dependenciesoftestmodule.txt @@ -233,11 +233,11 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.LinkedHashMap.LinkedHashIterator) returnType:(java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>..java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedHashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedEntryIterator modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedEntryIterator flags: superClasses: @@ -285,11 +285,11 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.LinkedHashMap.LinkedHashIterator) returnType:(java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>..java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedHashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedEntrySet modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedEntrySet flags: superClasses: @@ -452,11 +452,11 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.LinkedHashMap.LinkedHashIterator) returnType:(java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>..java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedHashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedKeySet modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedKeySet flags: superClasses: @@ -619,11 +619,11 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.LinkedHashMap.LinkedHashIterator) returnType:(java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>..java.util.LinkedHashMap.Entry<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedHashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:LinkedValues modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.LinkedValues flags: superClasses: @@ -790,25 +790,25 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:loadFactor type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:loadFactor type:kotlin.Float visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entrySet type:kotlin.collections.(Mutable)Set!>! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:entrySet type:kotlin.collections.(Mutable)Set!>! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:entrySet type:kotlin.collections.(Mutable)Set!>! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:modCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:modCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:modCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:table type:kotlin.Array<(out) java.util.HashMap.Node!>! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:table type:kotlin.Array<(out) java.util.HashMap.Node!>! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:table type:kotlin.Array<(out) java.util.HashMap.Node!>! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:threshold type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:threshold type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:threshold type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:accessOrder type:kotlin.Boolean visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:accessOrder type:kotlin.Boolean visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:head type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:head type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:head type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:tail type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:tail type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:tail type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Entry modality:OPEN visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.LinkedHashMap.Entry flags: superClasses: @@ -853,13 +853,13 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:after type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:after type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:after type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:before type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:before type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:before type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: FUN IR_EXTERNAL_DECLARATION_STUB name:afterNodeAccess visibility:public/*package*/ modality:OPEN <> ($this:java.util.LinkedHashMap, p0:java.util.HashMap.Node!) returnType:Unit flags: overridden: FUN IR_EXTERNAL_DECLARATION_STUB name:afterNodeAccess visibility:public/*package*/ modality:OPEN <> ($this:java.util.HashMap, p0:java.util.HashMap.Node!) returnType:Unit flags: @@ -1173,13 +1173,13 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.HashMap.HashIterator) returnType:(java.util.HashMap.Node<(K..K?), (V..V?)>..java.util.HashMap.Node<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.HashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:EntrySpliterator modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.EntrySpliterator flags: superClasses: @@ -1252,15 +1252,15 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: 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:const,val @@ -1349,15 +1349,15 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: 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:const,val @@ -1453,23 +1453,23 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:after type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:after type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:after type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:before type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:before type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:before type:java.util.LinkedHashMap.Entry! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:left type:java.util.HashMap.TreeNode! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:left type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:left type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:parent type:java.util.HashMap.TreeNode! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:parent type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:parent type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:prev type:java.util.HashMap.TreeNode! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:prev type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:prev type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:red type:kotlin.Boolean visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:red type:kotlin.Boolean visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:red type:kotlin.Boolean visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:right type:java.util.HashMap.TreeNode! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:right type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:right type:java.util.HashMap.TreeNode! visibility:public/*package*/ flags: FUN IR_EXTERNAL_DECLARATION_STUB name:balanceDeletion visibility:public/*package*/ modality:OPEN (p0:java.util.HashMap.TreeNode!, p1:java.util.HashMap.TreeNode!) returnType:(java.util.HashMap.TreeNode<(K..K?), (V..V?)>..java.util.HashMap.TreeNode<(K..K?), (V..V?)>?) flags: TYPE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:K index:0 variance: upperBounds:[kotlin.Any!] TYPE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:V index:1 variance: upperBounds:[kotlin.Any!] @@ -1574,15 +1574,15 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: 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:const,val @@ -1678,13 +1678,13 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.HashMap.HashIterator) returnType:(java.util.HashMap.Node<(K..K?), (V..V?)>..java.util.HashMap.Node<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.HashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:EntrySet modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.EntrySet flags: superClasses: @@ -1847,13 +1847,13 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.HashMap.HashIterator) returnType:(java.util.HashMap.Node<(K..K?), (V..V?)>..java.util.HashMap.Node<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.HashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:KeySet modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.KeySet flags: superClasses: @@ -2016,13 +2016,13 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name:nextNode visibility:public/*package*/ modality:FINAL <> ($this:java.util.HashMap.HashIterator) returnType:(java.util.HashMap.Node<(K..K?), (V..V?)>..java.util.HashMap.Node<(K..K?), (V..V?)>?) flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.HashIterator flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Values modality:FINAL visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.Values flags: superClasses: @@ -2139,21 +2139,21 @@ MODULE_FRAGMENT name: UNBOUND: fun hugeCapacity(p0: kotlin.Int): kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:kotlin.Int flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:loadFactor type:kotlin.Float visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:loadFactor type:kotlin.Float visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:entrySet type:kotlin.collections.(Mutable)Set!>! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:entrySet type:kotlin.collections.(Mutable)Set!>! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:entrySet type:kotlin.collections.(Mutable)Set!>! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:modCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:modCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:modCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:size type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:table type:kotlin.Array<(out) java.util.HashMap.Node!>! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:table type:kotlin.Array<(out) java.util.HashMap.Node!>! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:table type:kotlin.Array<(out) java.util.HashMap.Node!>! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:threshold type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:threshold type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:threshold type:kotlin.Int visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:HashMapSpliterator modality:OPEN visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.HashMapSpliterator flags: superClasses: @@ -2186,15 +2186,15 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:map type:java.util.HashMap! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:current type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:est type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:expectedModCount type:kotlin.Int visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:fence type:kotlin.Int visibility:public/*package*/ flags: 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 + FIELD IR_EXTERNAL_DECLARATION_STUB name:index type:kotlin.Int visibility:public/*package*/ flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Node modality:OPEN visibility:public/*package*/ flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap.Node flags: superClasses: @@ -2239,9 +2239,9 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public/*package*/ modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:public/*package*/ flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:next type:java.util.HashMap.Node! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:public/*package*/ flags: FUN IR_EXTERNAL_DECLARATION_STUB name:afterNodeAccess visibility:public/*package*/ modality:OPEN <> ($this:java.util.HashMap, p0:java.util.HashMap.Node!) returnType:Unit flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.HashMap flags: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:p0 index:0 type:java.util.HashMap.Node! flags: @@ -2346,7 +2346,7 @@ MODULE_FRAGMENT name: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:private modality:FINAL flags:val FIELD IR_EXTERNAL_DECLARATION_STUB name:key type:K! visibility:private flags:final PROPERTY IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:private modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:private flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:value type:V! visibility:private flags: FUN IR_EXTERNAL_DECLARATION_STUB name:setValue visibility:public modality:OPEN <> ($this:java.util.AbstractMap.SimpleEntry, newValue:V!) returnType:(V..V?) flags: overridden: FUN IR_EXTERNAL_DECLARATION_STUB name:setValue visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap.MutableEntry, newValue:V) returnType:V flags: @@ -2551,9 +2551,9 @@ MODULE_FRAGMENT name: FUN IR_EXTERNAL_DECLARATION_STUB name: visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableMap) returnType:MutableCollection flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:java.util.AbstractMap flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:keySet type:kotlin.collections.(Mutable)Set! visibility:public/*package*/ flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:values type:kotlin.collections.(Mutable)Collection! visibility:public/*package*/ flags: 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: diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.txt index dacab94b4b2..62cea62725d 100644 --- a/compiler/testData/ir/irText/stubs/javaInnerClass.txt +++ b/compiler/testData/ir/irText/stubs/javaInnerClass.txt @@ -19,7 +19,7 @@ FILE fqName: fileName:/javaInnerClass.kt GET_FIELD 'test: J.JInner' type=J.JInner origin=null receiver: GET_VAR 'this@Test1: Test1' type=Test1 origin=null PROPERTY FAKE_OVERRIDE name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public flags:final + FIELD FAKE_OVERRIDE name:x type:kotlin.Int visibility:public flags: FUN FAKE_OVERRIDE name:bar visibility:public modality:OPEN <> ($this:J) returnType:Unit flags: overridden: FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:J) returnType:Unit flags: diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt b/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt index c8c90dbb7b5..7d785149c3c 100644 --- a/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt +++ b/compiler/testData/ir/irText/stubs/javaInnerClass__testmodule.txt @@ -6,7 +6,7 @@ MODULE_FRAGMENT name: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Any modality:OPEN visibility:public flags: CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> () returnType:J flags:primary PROPERTY IR_EXTERNAL_DECLARATION_STUB name:x type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:x type:kotlin.Int visibility:public flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:x type:kotlin.Int visibility:public flags: FUN IR_EXTERNAL_DECLARATION_STUB name:bar visibility:public modality:OPEN <> ($this:J) returnType:Unit flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:J flags: CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:JInner modality:OPEN visibility:public flags: @@ -16,7 +16,7 @@ MODULE_FRAGMENT name: CONSTRUCTOR IR_EXTERNAL_DECLARATION_STUB visibility:public <> ($this:J) returnType:J.JInner flags:primary $outer: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:J flags: PROPERTY IR_EXTERNAL_DECLARATION_STUB name:z type:kotlin.Int visibility:public modality:FINAL flags:var - FIELD IR_EXTERNAL_DECLARATION_STUB name:z type:kotlin.Int visibility:public flags:final + FIELD IR_EXTERNAL_DECLARATION_STUB name:z type:kotlin.Int visibility:public flags: FUN IR_EXTERNAL_DECLARATION_STUB name:foo visibility:public modality:OPEN <> ($this:J.JInner) returnType:Unit flags: $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:J.JInner flags: FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:Boolean flags: