diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt index d255e939e2f..f4b0b9079e4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AsmTypeRemapper.kt @@ -36,7 +36,7 @@ class AsmTypeRemapper(val typeRemapper: TypeRemapper, val result: InlineResult) if (mapping.isReified) { result.reifiedTypeParametersUsages.mergeAll(mapping.reifiedTypeParametersUsages) } - SignatureReader(mapping.signature).accept(v) + SignatureReader(mapping.signature).acceptType(v) return } return super.visitTypeVariable(name) diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java index 5f3dbc62c06..8d3a791316d 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java @@ -4160,6 +4160,12 @@ public class FirLightTreeBytecodeTextTestGenerated extends AbstractFirLightTreeB runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt56104.kt"); } + @Test + @TestMetadata("kt57714.kt") + public void testKt57714() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt57714.kt"); + } + @Test @TestMetadata("nestedClassInAnnotationArgument.kt") public void testNestedClassInAnnotationArgument() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java index e9d8dd1a4b3..7a13117eb5e 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java @@ -4160,6 +4160,12 @@ public class FirPsiBytecodeTextTestGenerated extends AbstractFirPsiBytecodeTextT runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt56104.kt"); } + @Test + @TestMetadata("kt57714.kt") + public void testKt57714() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt57714.kt"); + } + @Test @TestMetadata("nestedClassInAnnotationArgument.kt") public void testNestedClassInAnnotationArgument() throws Exception { diff --git a/compiler/testData/codegen/bytecodeText/innerClasses/kt57714.kt b/compiler/testData/codegen/bytecodeText/innerClasses/kt57714.kt new file mode 100644 index 00000000000..c4146ece1ec --- /dev/null +++ b/compiler/testData/codegen/bytecodeText/innerClasses/kt57714.kt @@ -0,0 +1,17 @@ +// TARGET_BACKEND: JVM_IR + +val x = createImpl>() + +interface IfaceWithGenericFun { + fun doStuff(x: B) +} + +inline fun createImpl(): IfaceWithGenericFun { + return object : IfaceWithGenericFun { + override fun doStuff(x: B) {} + } +} + +// 3 INNERCLASS +// 2 INNERCLASS Kt57714Kt\$createImpl\$1 null null +// 1 INNERCLASS Kt57714Kt\$special\$\$inlined\$createImpl\$1 null null \ No newline at end of file diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java index 7797c6e5bec..652dcfa5458 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java @@ -4160,6 +4160,12 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest { runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt56104.kt"); } + @Test + @TestMetadata("kt57714.kt") + public void testKt57714() throws Exception { + runTest("compiler/testData/codegen/bytecodeText/innerClasses/kt57714.kt"); + } + @Test @TestMetadata("nestedClassInAnnotationArgument.kt") public void testNestedClassInAnnotationArgument() throws Exception {