diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsage.ir.txt b/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsage.ir.txt index b9b90217a93..19325f0f17b 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsage.ir.txt +++ b/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsage.ir.txt @@ -46,5 +46,5 @@ MODULE_FRAGMENT VALUE_PARAMETER name:it index:0 type:kotlin.Int BLOCK_BODY CALL 'public open fun println (p0: kotlin.Int): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: GET_VAR 'it: kotlin.Int declared in .CodeFragment.run.' type=kotlin.Int origin=null diff --git a/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsageSource.ir.txt b/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsageSource.ir.txt index 6fc00127769..122a3cca260 100644 --- a/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsageSource.ir.txt +++ b/analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/inlineFunctionUsageSource.ir.txt @@ -4,7 +4,7 @@ MODULE_FRAGMENT VALUE_PARAMETER name:block index:0 type:kotlin.Function1 BLOCK_BODY CALL 'public open fun println (p0: kotlin.Int): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 [operator] declared in kotlin.Function1' type=kotlin.Int origin=INVOKE $this: GET_VAR 'block: kotlin.Function1 declared in .call' type=kotlin.Function1 origin=VARIABLE_AS_FUNCTION p1: CONST Int type=kotlin.Int value=5 diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt index 997ca90a966..ab4da19d91d 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt @@ -538,8 +538,7 @@ class CallAndReferenceGenerator( is IrFieldSymbol -> IrGetFieldImpl( startOffset, endOffset, symbol, irType, - origin = IrStatementOrigin.GET_PROPERTY.takeIf { calleeReference !is FirDelegateFieldReference }, - superQualifierSymbol = dispatchReceiver?.superQualifierSymbol() + superQualifierSymbol = dispatchReceiver?.superQualifierSymbol() ) is IrValueSymbol -> { diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/CallGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/CallGenerator.kt index fabe95663dc..c1fc509263b 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/CallGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/CallGenerator.kt @@ -214,8 +214,7 @@ internal class CallGenerator(statementGenerator: StatementGenerator) : Statement fieldSymbol, irType, dispatchReceiverValue?.load() ?: extensionReceiverValue?.load(), - IrStatementOrigin.GET_PROPERTY, - superQualifierSymbol + superQualifierSymbol = superQualifierSymbol ).also { context.callToSubstitutedDescriptorMap[it] = descriptor } } } else { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrStatementOrigin.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrStatementOrigin.kt index 0b28e3bccaf..617348232f8 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrStatementOrigin.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrStatementOrigin.kt @@ -75,7 +75,11 @@ interface IrStatementOrigin { val ARGUMENTS_REORDERING_FOR_CALL by IrStatementOriginImpl val DESTRUCTURING_DECLARATION by IrStatementOriginImpl + /** + * Used on an [IrCall] expression to indicate that it's a call to a property getter. + */ val GET_PROPERTY by IrStatementOriginImpl + val GET_LOCAL_PROPERTY by IrStatementOriginImpl val IF by IrStatementOriginImpl diff --git a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt index 49f81a43073..a8336b398de 100644 --- a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt +++ b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt @@ -56,7 +56,7 @@ FILE fqName:foo fileName:/main.kt $this: GET_VAR ': foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo.Derived' CALL 'public final fun (): kotlin.String declared in foo.A' type=kotlin.String origin=GET_PROPERTY - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=null receiver: GET_VAR ': foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt index 6914e5e1c28..92c48ea35c4 100644 --- a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt +++ b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt @@ -57,7 +57,7 @@ FILE fqName:foo fileName:/main.kt RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in foo.Derived' CALL 'public final fun (): kotlin.String declared in foo.A' type=kotlin.String origin=GET_PROPERTY $this: TYPE_OP type=foo.A origin=IMPLICIT_NOTNULL typeOperand=foo.A - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' type=@[FlexibleNullability] foo.A? origin=null receiver: GET_VAR ': foo.Derived declared in foo.Derived.box' type=foo.Derived origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.fir.ir.txt b/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.fir.ir.txt index cab04570505..14de88f83f8 100644 --- a/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.fir.ir.txt +++ b/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.fir.ir.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/Child.kt $this: VALUE_PARAMETER name: type:.Child BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in .Child' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in javapackage.PublicParentClass diff --git a/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.ir.txt b/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.ir.txt index cab04570505..14de88f83f8 100644 --- a/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.ir.txt +++ b/compiler/testData/codegen/box/javaVisibility/package/cannotAccessInterfaceMemberViaReceiver.ir.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/Child.kt $this: VALUE_PARAMETER name: type:.Child BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in .Child' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:publicStaticField type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in javapackage.PublicParentClass diff --git a/compiler/testData/ir/irText/declarations/kt29833.fir.ir.txt b/compiler/testData/ir/irText/declarations/kt29833.fir.ir.txt index 587ea1f3dfb..c8dd32c716d 100644 --- a/compiler/testData/ir/irText/declarations/kt29833.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/kt29833.fir.ir.txt @@ -19,7 +19,7 @@ FILE fqName:interop fileName:/Definitions.kt PROPERTY name:ktValue visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String visibility:private [final] EXPRESSION_BODY - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:CONSTANT type:kotlin.String visibility:public [final,static]' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String correspondingProperty: PROPERTY name:ktValue visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:interop.Definitions diff --git a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.ir.txt b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.ir.txt index 355371f24cf..90ccbc896c6 100644 --- a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.fir.ir.txt @@ -22,7 +22,7 @@ FILE fqName:test fileName:/test.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in test.C.f' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:x type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:x type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=null receiver: GET_VAR ': test.C declared in test.C.f' type=test.C origin=null FUN name:g visibility:public modality:FINAL <> ($this:test.C) returnType:@[FlexibleNullability] kotlin.String? $this: VALUE_PARAMETER name: type:test.C @@ -34,7 +34,7 @@ FILE fqName:test fileName:/test.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in test.C.g' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:y type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:y type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=null receiver: GET_VAR ': test.C declared in test.C.g' type=test.C origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.ir.txt b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.ir.txt index ce1636efbfa..0e4f9310671 100644 --- a/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.ir.txt +++ b/compiler/testData/ir/irText/expressions/ambiguousFieldAccess.ir.txt @@ -22,7 +22,7 @@ FILE fqName:test fileName:/test.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in test.C.f' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:x type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:x type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=null receiver: GET_VAR ': test.C declared in test.C.f' type=test.C origin=null FUN name:g visibility:public modality:FINAL <> ($this:test.C) returnType:@[FlexibleNullability] kotlin.String? $this: VALUE_PARAMETER name: type:test.C @@ -34,7 +34,7 @@ FILE fqName:test fileName:/test.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): @[FlexibleNullability] kotlin.String? declared in test.C.g' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:y type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:y type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=null receiver: GET_VAR ': test.C declared in test.C.g' type=test.C origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.ir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.ir.txt index 8fea040be5d..28df52fda47 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.ir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/coercionToUnit.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:@[FlexibleNullability] java.io.PrintStream? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null WHEN type=kotlin.Unit? origin=null BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ @@ -39,7 +39,7 @@ FILE fqName: fileName:/coercionToUnit.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:@[FlexibleNullability] java.io.PrintStream? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null WHEN type=kotlin.Unit? origin=null BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.ir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.ir.txt index 904b7803c27..a6a0a2e8c90 100644 --- a/compiler/testData/ir/irText/expressions/coercionToUnit.ir.txt +++ b/compiler/testData/ir/irText/expressions/coercionToUnit.ir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/coercionToUnit.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:@[FlexibleNullability] java.io.PrintStream? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null WHEN type=kotlin.Unit? origin=null BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ @@ -40,7 +40,7 @@ FILE fqName: fileName:/coercionToUnit.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit BLOCK type=kotlin.Unit? origin=SAFE_CALL VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:@[FlexibleNullability] java.io.PrintStream? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null WHEN type=kotlin.Unit? origin=null BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ diff --git a/compiler/testData/ir/irText/expressions/equals.fir.ir.txt b/compiler/testData/ir/irText/expressions/equals.fir.ir.txt index a820bc0708f..a57ab950d5a 100644 --- a/compiler/testData/ir/irText/expressions/equals.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/equals.fir.ir.txt @@ -19,11 +19,11 @@ FILE fqName: fileName:/equals.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJEqeqNull (): kotlin.Boolean declared in ' CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=GET_PROPERTY + arg0: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=null arg1: CONST Null type=kotlin.Nothing? value=null FUN name:testJEqualsNull visibility:public modality:FINAL <> () returnType:kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJEqualsNull (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Int' type=kotlin.Boolean origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=null other: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/expressions/equals.ir.txt b/compiler/testData/ir/irText/expressions/equals.ir.txt index 3b78f65ab6b..b703d2f0097 100644 --- a/compiler/testData/ir/irText/expressions/equals.ir.txt +++ b/compiler/testData/ir/irText/expressions/equals.ir.txt @@ -19,12 +19,12 @@ FILE fqName: fileName:/equals.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJEqeqNull (): kotlin.Boolean declared in ' CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=GET_PROPERTY + arg0: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=null arg1: CONST Null type=kotlin.Nothing? value=null FUN name:testJEqualsNull visibility:public modality:FINAL <> () returnType:kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun testJEqualsNull (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Int' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Int origin=IMPLICIT_NOTNULL typeOperand=kotlin.Int - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:INT_NULL type:@[FlexibleNullability] kotlin.Int? visibility:public [static]' type=@[FlexibleNullability] kotlin.Int? origin=null other: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/expressions/field.fir.ir.txt b/compiler/testData/ir/irText/expressions/field.fir.ir.txt index a4c09552db4..336253dd059 100644 --- a/compiler/testData/ir/irText/expressions/field.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/field.fir.ir.txt @@ -29,5 +29,5 @@ FILE fqName: fileName:/field.kt BLOCK_BODY SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Unit origin=PLUSEQ value: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=GET_PROPERTY + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testAugmented type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null other: GET_VAR 'value: kotlin.Int declared in .' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.ir.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.ir.txt index 8be141ad5db..a1ba8e08466 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.fir.ir.txt @@ -141,7 +141,7 @@ FILE fqName: fileName:/jvmFieldWithIntersectionTypes.kt GET_VAR 'val k: kotlin.Any declared in .test' type=kotlin.Any origin=null value: CONST Int type=kotlin.Int value=42 TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=null receiver: TYPE_OP type=.JFieldOwner origin=IMPLICIT_CAST typeOperand=.JFieldOwner GET_VAR 'val k: kotlin.Any declared in .test' type=kotlin.Any origin=null VAR name:md1 type:.DerivedThroughMid1 [val] @@ -161,6 +161,6 @@ FILE fqName: fileName:/jvmFieldWithIntersectionTypes.kt GET_VAR 'val mk: kotlin.Any declared in .test' type=kotlin.Any origin=null value: CONST Int type=kotlin.Int value=44 TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=null receiver: TYPE_OP type=.Mid origin=IMPLICIT_CAST typeOperand=.Mid GET_VAR 'val mk: kotlin.Any declared in .test' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.ir.txt b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.ir.txt index b3e20e4a851..6fec7736ee7 100644 --- a/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.ir.txt +++ b/compiler/testData/ir/irText/expressions/jvmFieldReferenceWithIntersectionTypes.ir.txt @@ -156,7 +156,7 @@ FILE fqName: fileName:/jvmFieldWithIntersectionTypes.kt GET_VAR 'val k: kotlin.Any declared in .test' type=kotlin.Any origin=null value: CONST Int type=kotlin.Int value=42 TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=null receiver: TYPE_OP type=.JFieldOwner origin=IMPLICIT_CAST typeOperand=.JFieldOwner GET_VAR 'val k: kotlin.Any declared in .test' type=kotlin.Any origin=null VAR name:md1 type:.DerivedThroughMid1 [val] @@ -176,6 +176,6 @@ FILE fqName: fileName:/jvmFieldWithIntersectionTypes.kt GET_VAR 'val mk: kotlin.Any declared in .test' type=kotlin.Any origin=null value: CONST Int type=kotlin.Int value=44 TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:f type:kotlin.Int visibility:public' type=kotlin.Int origin=null receiver: TYPE_OP type=.Mid origin=IMPLICIT_CAST typeOperand=.Mid GET_VAR 'val mk: kotlin.Any declared in .test' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.ir.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.ir.txt index 4d95f78376d..cf6443599b0 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.ir.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/Derived.kt $this: VALUE_PARAMETER name: type:.Derived BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (): kotlin.Int declared in .Derived' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null receiver: GET_VAR ': .Derived declared in .Derived.getValue' type=.Derived origin=null FUN name:setValue visibility:public modality:FINAL <> ($this:.Derived, value:kotlin.Int) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Derived diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.ir.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.ir.txt index a9d44e75d0c..04903968105 100644 --- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.ir.txt @@ -14,7 +14,7 @@ FILE fqName: fileName:/Derived.kt $this: VALUE_PARAMETER name: type:.Derived BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun getValue (): kotlin.Int declared in .Derived' - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:kotlin.Int visibility:public' type=kotlin.Int origin=null receiver: GET_VAR ': .Derived declared in .Derived.getValue' type=.Derived origin=null FUN name:setValue visibility:public modality:FINAL <> ($this:.Derived, value:kotlin.Int) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.Derived diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.ir.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.ir.txt index b102b5c5265..c660abb2514 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.ir.txt @@ -2,14 +2,14 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt FUN name:testFun visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="testFun" PROPERTY name:testProp visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="testProp/get" RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' CONST Int type=kotlin.Int value=42 @@ -18,7 +18,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt VALUE_PARAMETER name:value index:0 type:kotlin.Any BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="testProp/set" CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass @@ -34,7 +34,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt if: CONST Boolean type=kotlin.Boolean value=true then: BLOCK type=kotlin.Int origin=null CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="TestClass/test" CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestClass) returnType:kotlin.Int @@ -47,7 +47,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="TestClass/init" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.ir.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.ir.txt index 6e6592cc307..ecdb3c5bf16 100644 --- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.ir.txt @@ -3,7 +3,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="testFun" PROPERTY name:testProp visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Any @@ -11,7 +11,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="testProp/get" RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' CONST Int type=kotlin.Int value=42 @@ -21,7 +21,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="testProp/set" CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass @@ -38,7 +38,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt then: BLOCK type=kotlin.Int origin=null CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="TestClass/test" CONST Int type=kotlin.Int value=42 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestClass) returnType:kotlin.Int @@ -52,7 +52,7 @@ FILE fqName: fileName:/jvmStaticFieldReference.kt BLOCK_BODY CALL 'public open fun println (p0: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null $this: TYPE_OP type=java.io.PrintStream origin=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:out type:@[FlexibleNullability] java.io.PrintStream? visibility:public [final,static]' type=@[FlexibleNullability] java.io.PrintStream? origin=null p0: CONST String type=kotlin.String value="TestClass/init" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/expressions/kt44993.ir.txt b/compiler/testData/ir/irText/expressions/kt44993.ir.txt index d55b7c876de..126e58a0642 100644 --- a/compiler/testData/ir/irText/expressions/kt44993.ir.txt +++ b/compiler/testData/ir/irText/expressions/kt44993.ir.txt @@ -28,7 +28,7 @@ FILE fqName: fileName:/kt44993.kt then: CONST Null type=kotlin.Nothing? value=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:element type:@[FlexibleNullability] kotlin.String? visibility:public [final]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + then: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:element type:@[FlexibleNullability] kotlin.String? visibility:public [final]' type=@[FlexibleNullability] kotlin.String? origin=null receiver: GET_VAR 'val tmp_0: .JavaBox? declared in .f' type=.JavaBox? origin=null CLASS CLASS name:KotlinBox modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.KotlinBox.KotlinBox> diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.fir.ir.txt b/compiler/testData/ir/irText/expressions/propertyReferences.fir.ir.txt index 26e8db6631e..18c805067ee 100644 --- a/compiler/testData/ir/irText/expressions/propertyReferences.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/propertyReferences.fir.ir.txt @@ -138,7 +138,7 @@ FILE fqName: fileName:/propertyReferences.kt correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:varWithBackingFieldAndAccessors type:kotlin.Int visibility:private [static]' type=kotlin.Int origin=null FUN name: visibility:public modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit correspondingProperty: PROPERTY name:varWithBackingFieldAndAccessors visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.Int diff --git a/compiler/testData/ir/irText/firProblems/OutBox.fir.ir.txt b/compiler/testData/ir/irText/firProblems/OutBox.fir.ir.txt index 36e05e4ff7f..5b50228df19 100644 --- a/compiler/testData/ir/irText/firProblems/OutBox.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/OutBox.fir.ir.txt @@ -33,7 +33,7 @@ FILE fqName: fileName:/Box.kt then: BLOCK type=kotlin.Unit origin=null RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Box' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:str type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:str type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=null receiver: TYPE_OP type=.Foo.Buz origin=IMPLICIT_CAST typeOperand=.Foo.Buz GET_VAR 'var foo: .Foo declared in .Box.' type=.Foo origin=null RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Box' diff --git a/compiler/testData/ir/irText/firProblems/OutBox.ir.txt b/compiler/testData/ir/irText/firProblems/OutBox.ir.txt index 36e05e4ff7f..5b50228df19 100644 --- a/compiler/testData/ir/irText/firProblems/OutBox.ir.txt +++ b/compiler/testData/ir/irText/firProblems/OutBox.ir.txt @@ -33,7 +33,7 @@ FILE fqName: fileName:/Box.kt then: BLOCK type=kotlin.Unit origin=null RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Box' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:str type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:str type:@[FlexibleNullability] kotlin.String? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=null receiver: TYPE_OP type=.Foo.Buz origin=IMPLICIT_CAST typeOperand=.Foo.Buz GET_VAR 'var foo: .Foo declared in .Box.' type=.Foo origin=null RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in .Box' diff --git a/compiler/testData/ir/irText/firProblems/elvisOnBackingFieldInGetter.fir.ir.txt b/compiler/testData/ir/irText/firProblems/elvisOnBackingFieldInGetter.fir.ir.txt index 66bd8b12f31..8f2a23189c4 100644 --- a/compiler/testData/ir/irText/firProblems/elvisOnBackingFieldInGetter.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/elvisOnBackingFieldInGetter.fir.ir.txt @@ -17,12 +17,12 @@ FILE fqName: fileName:/elvisOnBackingFieldInGetter.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:resourceTable type:.ResourceTable? visibility:private' type=.ResourceTable? origin=GET_PROPERTY + arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:resourceTable type:.ResourceTable? visibility:private' type=.ResourceTable? origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null arg1: CONST Null type=kotlin.Nothing? value=null then: BLOCK type=kotlin.Unit origin=null RETURN type=kotlin.Nothing from='public final fun (): .ResourceTable? declared in .Test' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:resourceTable type:.ResourceTable? visibility:private' type=.ResourceTable? origin=GET_PROPERTY + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:resourceTable type:.ResourceTable? visibility:private' type=.ResourceTable? origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null VAR name:fileData type:kotlin.String? [val] CALL 'public final fun getFileData (): kotlin.String? declared in .Test' type=kotlin.String? origin=null @@ -40,7 +40,7 @@ FILE fqName: fileName:/elvisOnBackingFieldInGetter.kt RETURN type=kotlin.Nothing from='public final fun (): .ResourceTable? declared in .Test' BLOCK type=.ResourceTable origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:.ResourceTable? [val] - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:resourceTable type:.ResourceTable? visibility:private' type=.ResourceTable? origin=GET_PROPERTY + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:resourceTable type:.ResourceTable? visibility:private' type=.ResourceTable? origin=null receiver: GET_VAR ': .Test declared in .Test.' type=.Test origin=null WHEN type=.ResourceTable origin=null BRANCH diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.ir.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.ir.txt index 5b5e354488b..b626b721a9a 100644 --- a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.fir.ir.txt @@ -11,5 +11,5 @@ FILE fqName: fileName:/typeParameterFromJavaClass.kt BLOCK_BODY TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public abstract fun getName (): @[FlexibleNullability] kotlin.String? declared in .FilePath' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:second type:@[FlexibleNullability] B of .Pair? visibility:public [final]' type=@[FlexibleNullability] .FilePath? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:second type:@[FlexibleNullability] B of .Pair? visibility:public [final]' type=@[FlexibleNullability] .FilePath? origin=null receiver: GET_VAR 'it: .Couple<.FilePath> declared in .foo.' type=.Couple<.FilePath> origin=null diff --git a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.ir.txt b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.ir.txt index 0ef1e9d919f..d5fc859803d 100644 --- a/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.ir.txt +++ b/compiler/testData/ir/irText/firProblems/typeParameterFromJavaClass.ir.txt @@ -12,5 +12,5 @@ FILE fqName: fileName:/typeParameterFromJavaClass.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public abstract fun getName (): @[FlexibleNullability] kotlin.String? declared in .FilePath' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY $this: TYPE_OP type=.FilePath origin=IMPLICIT_NOTNULL typeOperand=.FilePath - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:second type:@[FlexibleNullability] B of .Pair? visibility:public [final]' type=@[FlexibleNullability] .FilePath? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:second type:@[FlexibleNullability] B of .Pair? visibility:public [final]' type=@[FlexibleNullability] .FilePath? origin=null receiver: GET_VAR 'it: .Couple<.FilePath> declared in .foo.' type=.Couple<.FilePath> origin=null diff --git a/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt b/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt index d67903cc75c..0405a7ffca4 100644 --- a/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt +++ b/compiler/testData/ir/irText/properties/backingField/explicitBackingFieldType.ir.txt @@ -40,11 +40,11 @@ FILE fqName: fileName:/explicitBackingFieldType.kt BRANCH if: CALL 'public final fun greater (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=GT arg0: CALL 'public abstract fun toInt (): kotlin.Int declared in kotlin.Number' type=kotlin.Int origin=null - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:invertedTypes type:kotlin.Number visibility:private' type=kotlin.Number origin=GET_PROPERTY + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:invertedTypes type:kotlin.Number visibility:private' type=kotlin.Number origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null arg1: CONST Int type=kotlin.Int value=10 then: CALL 'public abstract fun toInt (): kotlin.Int declared in kotlin.Number' type=kotlin.Int origin=null - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:invertedTypes type:kotlin.Number visibility:private' type=kotlin.Number origin=GET_PROPERTY + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:invertedTypes type:kotlin.Number visibility:private' type=kotlin.Number origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true @@ -66,7 +66,7 @@ FILE fqName: fileName:/explicitBackingFieldType.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt b/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt index e2f466c1b78..24f406d406a 100644 --- a/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt +++ b/compiler/testData/ir/irText/properties/backingField/independentBackingFieldType.ir.txt @@ -16,7 +16,7 @@ FILE fqName: fileName:/independentBackingFieldType.kt RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' CALL 'public open fun toInt (): kotlin.Int declared in kotlin.Double' type=kotlin.Int origin=null $this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Double declared in kotlin.Double' type=kotlin.Double origin=PLUS - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:it type:kotlin.Double visibility:private' type=kotlin.Double origin=GET_PROPERTY + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:it type:kotlin.Double visibility:private' type=kotlin.Double origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null other: CONST Int type=kotlin.Int value=10 FUN name: visibility:public modality:FINAL <> ($this:.A, value:kotlin.Int) returnType:kotlin.Unit diff --git a/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt b/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt index e47dbbb545c..64be97c4d2f 100644 --- a/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt +++ b/compiler/testData/ir/irText/properties/backingField/propertyTypeNarrowing.ir.txt @@ -33,7 +33,7 @@ FILE fqName: fileName:/propertyTypeNarrowing.kt $this: VALUE_PARAMETER name: type:.A BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=GET_PROPERTY + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null receiver: GET_VAR ': .A declared in .A.' type=.A origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/regressions/kt44855.fir.ir.txt b/compiler/testData/ir/irText/regressions/kt44855.fir.ir.txt index 974d73c25c9..61315635f52 100644 --- a/compiler/testData/ir/irText/regressions/kt44855.fir.ir.txt +++ b/compiler/testData/ir/irText/regressions/kt44855.fir.ir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/kt44855.kt CALL 'public final fun (): .Parent? declared in .Child' type=.Parent? origin=GET_PROPERTY $this: GET_VAR ': .Child declared in .Child' type=.Child origin=null VAR name:q type:@[FlexibleNullability] kotlin.String? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:qqq type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:qqq type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=null receiver: TYPE_OP type=.Child origin=IMPLICIT_CAST typeOperand=.Child CALL 'public final fun (): .Parent? declared in .Child' type=.Parent? origin=GET_PROPERTY $this: GET_VAR ': .Child declared in .Child' type=.Child origin=null diff --git a/compiler/testData/ir/irText/regressions/kt44855.ir.txt b/compiler/testData/ir/irText/regressions/kt44855.ir.txt index 9e2c5b573ad..435e3bb9a77 100644 --- a/compiler/testData/ir/irText/regressions/kt44855.ir.txt +++ b/compiler/testData/ir/irText/regressions/kt44855.ir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/kt44855.kt CALL 'public final fun (): .Parent? declared in .Child' type=.Parent? origin=GET_PROPERTY $this: GET_VAR ': .Child declared in .Child' type=.Child origin=null VAR name:q type:@[FlexibleNullability] kotlin.String? [val] - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:qqq type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:qqq type:@[FlexibleNullability] kotlin.String? visibility:protected/*protected and package*/' type=@[FlexibleNullability] kotlin.String? origin=null receiver: TYPE_OP type=.Child origin=IMPLICIT_CAST typeOperand=.Child CALL 'public final fun (): .Parent? declared in .Child' type=.Parent? origin=GET_PROPERTY $this: GET_VAR ': .Child declared in .Child' type=.Child origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.ir.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.ir.txt index c54f0c987f2..b1b84dfa3c2 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.fir.ir.txt @@ -69,7 +69,7 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt CALL 'public open fun s (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:testContains visibility:public modality:FINAL <> (m:.MySet) returnType:kotlin.Unit VALUE_PARAMETER name:m index:0 type:.MySet BLOCK_BODY @@ -77,7 +77,7 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt CALL 'public open fun contains (element: kotlin.String): kotlin.Boolean declared in .MySet' type=kotlin.Boolean origin=null $this: GET_VAR 'm: .MySet declared in .testContains' type=.MySet origin=null element: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public open fun contains (element: kotlin.String): kotlin.Boolean declared in .MySet' type=kotlin.Boolean origin=null $this: GET_VAR 'm: .MySet declared in .testContains' type=.MySet origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.ir.txt b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.ir.txt index c54f0c987f2..b1b84dfa3c2 100644 --- a/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/implicitNotNullOnPlatformType.ir.txt @@ -69,7 +69,7 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt CALL 'public open fun s (): @[FlexibleNullability] kotlin.String? declared in .J' type=@[FlexibleNullability] kotlin.String? origin=null CALL 'public final fun f (s: kotlin.String): kotlin.Unit declared in ' type=kotlin.Unit origin=null s: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null FUN name:testContains visibility:public modality:FINAL <> (m:.MySet) returnType:kotlin.Unit VALUE_PARAMETER name:m index:0 type:.MySet BLOCK_BODY @@ -77,7 +77,7 @@ FILE fqName: fileName:/implicitNotNullOnPlatformType.kt CALL 'public open fun contains (element: kotlin.String): kotlin.Boolean declared in .MySet' type=kotlin.Boolean origin=null $this: GET_VAR 'm: .MySet declared in .testContains' type=.MySet origin=null element: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public open fun contains (element: kotlin.String): kotlin.Boolean declared in .MySet' type=kotlin.Boolean origin=null $this: GET_VAR 'm: .MySet declared in .testContains' type=.MySet origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.ir.txt b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.ir.txt index bd0d626d0dd..96b829d9d0e 100644 --- a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.fir.ir.txt @@ -3,7 +3,7 @@ FILE fqName: fileName:/platformTypeReceiver.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null - $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:@[FlexibleNullability] kotlin.Boolean? visibility:public [static]' type=@[FlexibleNullability] kotlin.Boolean? origin=GET_PROPERTY + $this: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:@[FlexibleNullability] kotlin.Boolean? visibility:public [static]' type=@[FlexibleNullability] kotlin.Boolean? origin=null other: CONST Null type=kotlin.Nothing? value=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Boolean BLOCK_BODY diff --git a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.ir.txt b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.ir.txt index e4fd9e0585c..7f70a33e0ec 100644 --- a/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/platformTypeReceiver.ir.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/platformTypeReceiver.kt RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Boolean declared in ' CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null $this: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_NOTNULL typeOperand=kotlin.Boolean - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:@[FlexibleNullability] kotlin.Boolean? visibility:public [static]' type=@[FlexibleNullability] kotlin.Boolean? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:BOOL_NULL type:@[FlexibleNullability] kotlin.Boolean? visibility:public [static]' type=@[FlexibleNullability] kotlin.Boolean? origin=null other: CONST Null type=kotlin.Nothing? value=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Boolean BLOCK_BODY diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.fir.ir.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.fir.ir.txt index cab71116594..1f3b08131bc 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.fir.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.fir.ir.txt @@ -18,4 +18,4 @@ FILE fqName: fileName:/typeParameterWithMixedNullableAndNotNullableBounds. CALL 'public final fun f (x: T of .f): kotlin.Int declared in ' type=kotlin.Int origin=null : @[FlexibleNullability] kotlin.String? x: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.ir.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.ir.txt index 41b83271d0f..1cc812232f7 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMixedNullableAndNotNullableBounds.ir.txt @@ -16,4 +16,4 @@ FILE fqName: fileName:/typeParameterWithMixedNullableAndNotNullableBounds. TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun f (x: T of .f): kotlin.Int declared in ' type=kotlin.Int origin=null : @[FlexibleNullability] kotlin.String? - x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.fir.ir.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.fir.ir.txt index bb616c5b15a..52a64b77839 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.fir.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.fir.ir.txt @@ -18,4 +18,4 @@ FILE fqName: fileName:/typeParameterWithMultipleNotNullableBounds.kt CALL 'public final fun f (x: T of .f): kotlin.Int declared in ' type=kotlin.Int origin=null : @[FlexibleNullability] kotlin.String? x: TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.ir.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.ir.txt index 65f21c16e43..39a5a879d0b 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNotNullableBounds.ir.txt @@ -16,4 +16,4 @@ FILE fqName: fileName:/typeParameterWithMultipleNotNullableBounds.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun f (x: T of .f): kotlin.Int declared in ' type=kotlin.Int origin=null : @[FlexibleNullability] kotlin.String? - x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.fir.ir.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.fir.ir.txt index cb12a0b2f70..001b9bb1e54 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.fir.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.fir.ir.txt @@ -27,4 +27,4 @@ FILE fqName: fileName:/typeParameterWithMultipleNullableBounds.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun f (x: T of .f): kotlin.Int? declared in ' type=kotlin.Int? origin=null : @[FlexibleNullability] kotlin.String? - x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.ir.txt b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.ir.txt index cb12a0b2f70..001b9bb1e54 100644 --- a/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.ir.txt +++ b/compiler/testData/ir/irText/types/nullChecks/typeParameterWithMultipleNullableBounds.ir.txt @@ -27,4 +27,4 @@ FILE fqName: fileName:/typeParameterWithMultipleNullableBounds.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun f (x: T of .f): kotlin.Int? declared in ' type=kotlin.Int? origin=null : @[FlexibleNullability] kotlin.String? - x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + x: GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:STRING type:@[FlexibleNullability] kotlin.String? visibility:public [static]' type=@[FlexibleNullability] kotlin.String? origin=null diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.ir.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.ir.txt index 0cd33edcd68..e3b40cfbf2f 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.ir.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.fir.ir.txt @@ -22,6 +22,6 @@ FILE fqName: fileName:/smartCastOnFieldReceiverOfGenericType.kt GET_VAR 'a: kotlin.Any declared in .testGetField' type=kotlin.Any origin=null RETURN type=kotlin.Nothing from='public final fun testGetField (a: kotlin.Any): kotlin.String declared in ' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:@[FlexibleNullability] T of .JCell? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:@[FlexibleNullability] T of .JCell? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=null receiver: TYPE_OP type=.JCell origin=IMPLICIT_CAST typeOperand=.JCell GET_VAR 'a: kotlin.Any declared in .testGetField' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.ir.txt b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.ir.txt index 0cd33edcd68..e3b40cfbf2f 100644 --- a/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.ir.txt +++ b/compiler/testData/ir/irText/types/smartCastOnFieldReceiverOfGenericType.ir.txt @@ -22,6 +22,6 @@ FILE fqName: fileName:/smartCastOnFieldReceiverOfGenericType.kt GET_VAR 'a: kotlin.Any declared in .testGetField' type=kotlin.Any origin=null RETURN type=kotlin.Nothing from='public final fun testGetField (a: kotlin.Any): kotlin.String declared in ' TYPE_OP type=kotlin.String origin=IMPLICIT_NOTNULL typeOperand=kotlin.String - GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:@[FlexibleNullability] T of .JCell? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=GET_PROPERTY + GET_FIELD 'FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:value type:@[FlexibleNullability] T of .JCell? visibility:public' type=@[FlexibleNullability] kotlin.String? origin=null receiver: TYPE_OP type=.JCell origin=IMPLICIT_CAST typeOperand=.JCell GET_VAR 'a: kotlin.Any declared in .testGetField' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/sourceRanges/comments.fir.txt b/compiler/testData/ir/sourceRanges/comments.fir.txt index 45323893990..6c02ef81aae 100644 --- a/compiler/testData/ir/sourceRanges/comments.fir.txt +++ b/compiler/testData/ir/sourceRanges/comments.fir.txt @@ -32,7 +32,7 @@ @27:16..25 BLOCK_BODY @27:25..25 RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .Foo' @27:16..25 CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS - @27:16..21 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=GET_PROPERTY + @27:16..21 GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null @27:16..21 GET_VAR ': .Foo declared in .Foo.' type=.Foo origin=null @27:24..25 CONST Int type=kotlin.Int value=1 @30:4..32:5 FUN name:test visibility:public modality:FINAL <> ($this:.Foo) returnType:kotlin.Unit diff --git a/plugins/atomicfu/atomicfu-compiler/src/org/jetbrains/kotlinx/atomicfu/compiler/backend/js/TransformerUtil.kt b/plugins/atomicfu/atomicfu-compiler/src/org/jetbrains/kotlinx/atomicfu/compiler/backend/js/TransformerUtil.kt index d521c048d52..79e21da2e21 100644 --- a/plugins/atomicfu/atomicfu-compiler/src/org/jetbrains/kotlinx/atomicfu/compiler/backend/js/TransformerUtil.kt +++ b/plugins/atomicfu/atomicfu-compiler/src/org/jetbrains/kotlinx/atomicfu/compiler/backend/js/TransformerUtil.kt @@ -74,8 +74,7 @@ internal fun IrPluginContext.buildSetField( receiver, value, irBuiltIns.unitType, - IrStatementOrigin.GET_PROPERTY, - superQualifierSymbol + superQualifierSymbol = superQualifierSymbol ) internal fun buildGetField( @@ -90,8 +89,7 @@ internal fun buildGetField( symbol, type ?: symbol.owner.type, receiver, - IrStatementOrigin.GET_PROPERTY, - superQualifierSymbol + superQualifierSymbol = superQualifierSymbol ) internal fun buildSimpleType(