From 71e4b0c9ad42101066eaed363d03597e15b5ba70 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 6 Mar 2020 11:51:15 +0300 Subject: [PATCH] KT-31649 Use 'Any#hashCode' in generated hashCode if class has none --- .../kotlin/fir/Fir2IrTextTestGenerated.java | 5 + .../generators/DataClassMembersGenerator.kt | 18 +- .../ir/irText/classes/kt31649.fir.txt | 76 ++++++++ .../testData/ir/irText/classes/kt31649.kt | 3 + .../testData/ir/irText/classes/kt31649.txt | 174 ++++++++++++++++++ .../kotlin/ir/IrTextTestCaseGenerated.java | 5 + 6 files changed, 278 insertions(+), 3 deletions(-) create mode 100644 compiler/testData/ir/irText/classes/kt31649.fir.txt create mode 100644 compiler/testData/ir/irText/classes/kt31649.kt create mode 100644 compiler/testData/ir/irText/classes/kt31649.txt diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java index 2e7264b7385..cbb840647c1 100644 --- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/fir/Fir2IrTextTestGenerated.java @@ -181,6 +181,11 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest { runTest("compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt"); } + @TestMetadata("kt31649.kt") + public void testKt31649() throws Exception { + runTest("compiler/testData/ir/irText/classes/kt31649.kt"); + } + @TestMetadata("lambdaInDataClassDefaultParameter.kt") public void testLambdaInDataClassDefaultParameter() throws Exception { runTest("compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt"); diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt index 3f241ae2200..25e07e8f887 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/DataClassMembersGenerator.kt @@ -20,6 +20,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.declarations.* @@ -28,11 +29,11 @@ import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl import org.jetbrains.kotlin.ir.expressions.mapTypeParameters import org.jetbrains.kotlin.ir.expressions.mapValueParameters -import org.jetbrains.kotlin.ir.symbols.IrFunctionSymbol import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.ir.util.declareSimpleFunctionWithOverrides import org.jetbrains.kotlin.ir.util.properties import org.jetbrains.kotlin.ir.util.referenceFunction +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi2ir.containsNull @@ -41,6 +42,7 @@ import org.jetbrains.kotlin.psi2ir.findFirstFunction import org.jetbrains.kotlin.psi2ir.startOffsetOrUndefined import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.typeUtil.representativeUpperBound @@ -205,13 +207,23 @@ class DataClassMembersGenerator( .let { context.symbolTable.referenceFunction(it) } - private fun getHashCodeFunction(type: KotlinType, symbolResolve: (FunctionDescriptor) -> IrSimpleFunctionSymbol): IrSimpleFunctionSymbol = + private fun MemberScope.findHashCodeFunctionOrNull() = + getContributedFunctions(Name.identifier("hashCode"), NoLookupLocation.FROM_BACKEND) + .find { it.valueParameters.isEmpty() } + + private fun getHashCodeFunction( + type: KotlinType, + symbolResolve: (FunctionDescriptor) -> IrSimpleFunctionSymbol + ): IrSimpleFunctionSymbol = when (val typeConstructorDescriptor = type.constructor.declarationDescriptor) { is ClassDescriptor -> if (KotlinBuiltIns.isArrayOrPrimitiveArray(typeConstructorDescriptor)) context.irBuiltIns.dataClassArrayMemberHashCodeSymbol else - symbolResolve(type.memberScope.findFirstFunction("hashCode") { it.valueParameters.isEmpty() }) + symbolResolve( + type.memberScope.findHashCodeFunctionOrNull() + ?: context.builtIns.any.unsubstitutedMemberScope.findHashCodeFunctionOrNull()!! + ) is TypeParameterDescriptor -> getHashCodeFunction(typeConstructorDescriptor.representativeUpperBound, symbolResolve) diff --git a/compiler/testData/ir/irText/classes/kt31649.fir.txt b/compiler/testData/ir/irText/classes/kt31649.fir.txt new file mode 100644 index 00000000000..48e39993f3e --- /dev/null +++ b/compiler/testData/ir/irText/classes/kt31649.fir.txt @@ -0,0 +1,76 @@ +FILE fqName: fileName:/kt31649.kt + CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestData + CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:.TestData [primary] + VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing? + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' + PROPERTY name:nn visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final] + EXPRESSION_BODY + GET_VAR 'nn: kotlin.Nothing? declared in .TestData.' type=kotlin.Nothing? origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestData) returnType:kotlin.Nothing? + correspondingProperty: PROPERTY name:nn visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.TestData + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Nothing? declared in .TestData' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.' type=.TestData origin=null + FUN name:component1 visibility:public modality:FINAL <> ($this:.TestData) returnType:kotlin.Nothing? + $this: VALUE_PARAMETER name: type:.TestData + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Nothing? declared in .TestData' + CALL 'public final fun (): kotlin.Nothing? declared in .TestData' type=kotlin.Nothing? origin=GET_PROPERTY + $this: GET_VAR ': .TestData declared in .TestData.component1' type=.TestData origin=null + FUN name:copy visibility:public modality:FINAL <> ($this:.TestData, nn:kotlin.Nothing?) returnType:.TestData + $this: VALUE_PARAMETER name: type:.TestData + VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing? + EXPRESSION_BODY + CALL 'public final fun (): kotlin.Nothing? declared in .TestData' type=kotlin.Nothing? origin=GET_PROPERTY + $this: GET_VAR ': .TestData declared in .TestData.copy' type=.TestData origin=null + BLOCK_BODY + 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 [operator] declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + CLASS CLASS name:TestInline modality:FINAL visibility:public [inline] superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInline + CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:.TestInline [primary] + VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing? + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInline modality:FINAL visibility:public [inline] superTypes:[kotlin.Any]' + PROPERTY name:nn visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final] + EXPRESSION_BODY + GET_VAR 'nn: kotlin.Nothing? declared in .TestInline.' type=kotlin.Nothing? origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInline) returnType:kotlin.Nothing? + correspondingProperty: PROPERTY name:nn visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.TestInline + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Nothing? declared in .TestInline' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestInline declared in .TestInline.' type=.TestInline 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 [operator] declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any + FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/classes/kt31649.kt b/compiler/testData/ir/irText/classes/kt31649.kt new file mode 100644 index 00000000000..4177705fbd6 --- /dev/null +++ b/compiler/testData/ir/irText/classes/kt31649.kt @@ -0,0 +1,3 @@ +data class TestData(val nn: Nothing?) + +inline class TestInline(val nn: Nothing?) \ No newline at end of file diff --git a/compiler/testData/ir/irText/classes/kt31649.txt b/compiler/testData/ir/irText/classes/kt31649.txt new file mode 100644 index 00000000000..8308841ff10 --- /dev/null +++ b/compiler/testData/ir/irText/classes/kt31649.txt @@ -0,0 +1,174 @@ +FILE fqName: fileName:/kt31649.kt + CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestData + CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:.TestData [primary] + VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing? + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestData modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' + PROPERTY name:nn visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final] + EXPRESSION_BODY + GET_VAR 'nn: kotlin.Nothing? declared in .TestData.' type=kotlin.Nothing? origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestData) returnType:kotlin.Nothing? + correspondingProperty: PROPERTY name:nn visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.TestData + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Nothing? declared in .TestData' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.' type=.TestData origin=null + FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.TestData) returnType:kotlin.Nothing? [operator] + $this: VALUE_PARAMETER name: type:.TestData + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Nothing? [operator] declared in .TestData' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.component1' type=.TestData origin=null + FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:.TestData, nn:kotlin.Nothing?) returnType:.TestData + $this: VALUE_PARAMETER name: type:.TestData + VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing? + EXPRESSION_BODY + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.copy' type=.TestData origin=null + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun copy (nn: kotlin.Nothing?): .TestData declared in .TestData' + CONSTRUCTOR_CALL 'public constructor (nn: kotlin.Nothing?) [primary] declared in .TestData' type=.TestData origin=null + nn: GET_VAR 'nn: kotlin.Nothing? declared in .TestData.copy' type=kotlin.Nothing? origin=null + FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.TestData) returnType:kotlin.String + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:.TestData + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .TestData' + STRING_CONCATENATION type=kotlin.String + CONST String type=kotlin.String value="TestData(" + CONST String type=kotlin.String value="nn=" + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.toString' type=.TestData origin=null + CONST String type=kotlin.String value=")" + FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.TestData) returnType:kotlin.Int + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:.TestData + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in .TestData' + WHEN type=kotlin.Int 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 + arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.hashCode' type=.TestData origin=null + arg1: CONST Null type=kotlin.Nothing? value=null + then: CONST Int type=kotlin.Int value=0 + BRANCH + if: CONST Boolean type=kotlin.Boolean value=true + then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.hashCode' type=.TestData origin=null + FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.TestData, other:kotlin.Any?) returnType:kotlin.Boolean [operator] + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any + $this: VALUE_PARAMETER name: type:.TestData + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + BLOCK_BODY + WHEN type=kotlin.Unit origin=null + BRANCH + if: CALL 'public final fun EQEQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQEQ + arg0: GET_VAR ': .TestData declared in .TestData.equals' type=.TestData origin=null + arg1: GET_VAR 'other: kotlin.Any? declared in .TestData.equals' type=kotlin.Any? origin=null + then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestData' + CONST Boolean type=kotlin.Boolean value=true + WHEN type=kotlin.Unit origin=null + BRANCH + if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=.TestData + GET_VAR 'other: kotlin.Any? declared in .TestData.equals' type=kotlin.Any? origin=null + then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestData' + CONST Boolean type=kotlin.Boolean value=false + VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:.TestData [val] + TYPE_OP type=.TestData origin=CAST typeOperand=.TestData + GET_VAR 'other: kotlin.Any? declared in .TestData.equals' type=kotlin.Any? origin=null + WHEN type=kotlin.Unit origin=null + BRANCH + if: CALL 'public final fun not (): kotlin.Boolean [operator] 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:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestData declared in .TestData.equals' type=.TestData origin=null + arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR 'val tmp_0: .TestData [val] declared in .TestData.equals' type=.TestData origin=null + then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestData' + CONST Boolean type=kotlin.Boolean value=false + RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestData' + CONST Boolean type=kotlin.Boolean value=true + CLASS CLASS name:TestInline modality:FINAL visibility:public [inline] superTypes:[kotlin.Any] + $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInline + CONSTRUCTOR visibility:public <> (nn:kotlin.Nothing?) returnType:.TestInline [primary] + VALUE_PARAMETER name:nn index:0 type:kotlin.Nothing? + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInline modality:FINAL visibility:public [inline] superTypes:[kotlin.Any]' + PROPERTY name:nn visibility:public modality:FINAL [val] + FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final] + EXPRESSION_BODY + GET_VAR 'nn: kotlin.Nothing? declared in .TestInline.' type=kotlin.Nothing? origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.TestInline) returnType:kotlin.Nothing? + correspondingProperty: PROPERTY name:nn visibility:public modality:FINAL [val] + $this: VALUE_PARAMETER name: type:.TestInline + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Nothing? declared in .TestInline' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestInline declared in .TestInline.' type=.TestInline origin=null + FUN GENERATED_INLINE_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.TestInline) returnType:kotlin.String + overridden: + public open fun toString (): kotlin.String declared in kotlin.Any + $this: VALUE_PARAMETER name: type:.TestInline + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun toString (): kotlin.String declared in .TestInline' + STRING_CONCATENATION type=kotlin.String + CONST String type=kotlin.String value="TestInline(" + CONST String type=kotlin.String value="nn=" + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestInline declared in .TestInline.toString' type=.TestInline origin=null + CONST String type=kotlin.String value=")" + FUN GENERATED_INLINE_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.TestInline) returnType:kotlin.Int + overridden: + public open fun hashCode (): kotlin.Int declared in kotlin.Any + $this: VALUE_PARAMETER name: type:.TestInline + BLOCK_BODY + RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in .TestInline' + WHEN type=kotlin.Int 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 + arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestInline declared in .TestInline.hashCode' type=.TestInline origin=null + arg1: CONST Null type=kotlin.Nothing? value=null + then: CONST Int type=kotlin.Int value=0 + BRANCH + if: CONST Boolean type=kotlin.Boolean value=true + then: CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestInline declared in .TestInline.hashCode' type=.TestInline origin=null + FUN GENERATED_INLINE_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.TestInline, other:kotlin.Any?) returnType:kotlin.Boolean [operator] + overridden: + public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any + $this: VALUE_PARAMETER name: type:.TestInline + VALUE_PARAMETER name:other index:0 type:kotlin.Any? + BLOCK_BODY + WHEN type=kotlin.Unit origin=null + BRANCH + if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=.TestInline + GET_VAR 'other: kotlin.Any? declared in .TestInline.equals' type=kotlin.Any? origin=null + then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestInline' + CONST Boolean type=kotlin.Boolean value=false + VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:.TestInline [val] + TYPE_OP type=.TestInline origin=CAST typeOperand=.TestInline + GET_VAR 'other: kotlin.Any? declared in .TestInline.equals' type=kotlin.Any? origin=null + WHEN type=kotlin.Unit origin=null + BRANCH + if: CALL 'public final fun not (): kotlin.Boolean [operator] 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:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR ': .TestInline declared in .TestInline.equals' type=.TestInline origin=null + arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:nn type:kotlin.Nothing? visibility:private [final]' type=kotlin.Nothing? origin=null + receiver: GET_VAR 'val tmp_1: .TestInline [val] declared in .TestInline.equals' type=.TestInline origin=null + then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestInline' + CONST Boolean type=kotlin.Boolean value=false + RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in .TestInline' + CONST Boolean type=kotlin.Boolean value=true diff --git a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java index 0f27b71efcd..d7b3b35fc28 100644 --- a/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/ir/IrTextTestCaseGenerated.java @@ -180,6 +180,11 @@ public class IrTextTestCaseGenerated extends AbstractIrTextTestCase { runTest("compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.kt"); } + @TestMetadata("kt31649.kt") + public void testKt31649() throws Exception { + runTest("compiler/testData/ir/irText/classes/kt31649.kt"); + } + @TestMetadata("lambdaInDataClassDefaultParameter.kt") public void testLambdaInDataClassDefaultParameter() throws Exception { runTest("compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.kt");