diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 0ac97b7bffe..37b93169b1e 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -22697,6 +22697,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/inlineClasses/kt57261.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index a41c78e8293..3ae604e6f8f 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -22697,6 +22697,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/inlineClasses/kt57261.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt index 68f7ce85403..db4e28a6fb4 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt @@ -398,20 +398,17 @@ open class DefaultParameterInjector( log { "$declaration -> $stubFunction" } - val realArgumentsNumber = declaration.valueParameters.size - val maskValues = IntArray((declaration.valueParameters.size + 31) / 32) + val realArgumentsNumber = declaration.valueParameters.filterNot { it.isMovedReceiver() }.size + val maskValues = IntArray((realArgumentsNumber + 31) / 32) - assert( - ((if (isStatic(expression.symbol.owner) && stubFunction.extensionReceiverParameter != null) 1 else 0) + - stubFunction.valueParameters.size - realArgumentsNumber - maskValues.size) in listOf(0, 1) - ) { + assert(stubFunction.explicitParametersCount - declaration.explicitParametersCount - maskValues.size in listOf(0, 1)) { "argument count mismatch: expected $realArgumentsNumber arguments + ${maskValues.size} masks + optional handler/marker, " + - "got ${stubFunction.valueParameters.size} total in ${stubFunction.render()}" + "got ${stubFunction.explicitParametersCount} total in ${stubFunction.render()}" } var sourceParameterIndex = -1 val valueParametersPrefix = - if (isStatic(expression.symbol.owner)) + if (isStatic(declaration)) listOfNotNull(stubFunction.dispatchReceiverParameter, stubFunction.extensionReceiverParameter) else emptyList() return stubFunction.symbol to (valueParametersPrefix + stubFunction.valueParameters).mapIndexed { i, parameter -> @@ -419,12 +416,12 @@ open class DefaultParameterInjector( ++sourceParameterIndex } when { - i >= realArgumentsNumber + maskValues.size -> IrConstImpl.constNull(startOffset, endOffset, parameter.type) - i >= realArgumentsNumber -> IrConstImpl.int(startOffset, endOffset, parameter.type, maskValues[i - realArgumentsNumber]) + sourceParameterIndex >= realArgumentsNumber + maskValues.size -> IrConstImpl.constNull(startOffset, endOffset, parameter.type) + sourceParameterIndex >= realArgumentsNumber -> IrConstImpl.int(startOffset, endOffset, parameter.type, maskValues[sourceParameterIndex - realArgumentsNumber]) else -> { val valueArgument = expression.getValueArgument(i) if (valueArgument == null) { - maskValues[i / 32] = maskValues[i / 32] or (1 shl (sourceParameterIndex % 32)) + maskValues[sourceParameterIndex / 32] = maskValues[sourceParameterIndex / 32] or (1 shl (sourceParameterIndex % 32)) } valueArgument ?: nullConst(startOffset, endOffset, parameter)?.let { IrCompositeImpl( diff --git a/compiler/testData/codegen/box/inlineClasses/kt57973.kt b/compiler/testData/codegen/box/inlineClasses/kt57973.kt new file mode 100644 index 00000000000..5e5ae0e9749 --- /dev/null +++ b/compiler/testData/codegen/box/inlineClasses/kt57973.kt @@ -0,0 +1,162 @@ +// WITH_STDLIB +// WORKS_WHEN_VALUE_CLASS +// CHECK_BYTECODE_LISTING +// IGNORE_BACKEND: JVM + +interface IIC { + fun f( + i1: Long = 1L, + i2: Long = 2L, + i3: Long = 3L, + i4: Long = 4L, + i5: Long = 5L, + i6: Long = 6L, + i7: Long = 7L, + i8: Long = 8L, + i9: Long = 9L, + i10: Long = 10L, + i11: Long = 11L, + i12: Long = 12L, + i13: Long = 13L, + i14: Long = 14L, + i15: Long = 15L, + i16: Long = 16L, + i17: Long = 17L, + i18: Long = 18L, + i19: Long = 19L, + i20: Long = 20L, + i21: Long = 21L, + i22: Long = 22L, + i23: Long = 23L, + i24: Long = 24L, + i25: Long = 25L, + i26: Long = 26L, + i27: Long = 27L, + i28: Long = 28L, + i29: Long = 29L, + i30: Long = 30L, + i31: Long = 31L, + i32: Long = 32L, + i33: Long = 33L, + ): Long + + fun g( + i1: Long = 1L, + i2: Long = 2L, + i3: Long = 3L, + i4: Long = 4L, + i5: Long = 5L, + i6: Long = 6L, + i7: Long = 7L, + i8: Long = 8L, + i9: Long = 9L, + i10: Long = 10L, + i11: Long = 11L, + i12: Long = 12L, + i13: Long = 13L, + i14: Long = 14L, + i15: Long = 15L, + i16: Long = 16L, + i17: Long = 17L, + i18: Long = 18L, + i19: Long = 19L, + i20: Long = 20L, + i21: Long = 21L, + i22: Long = 22L, + i23: Long = 23L, + i24: Long = 24L, + i25: Long = 25L, + i26: Long = 26L, + i27: Long = 27L, + i28: Long = 28L, + i29: Long = 29L, + i30: Long = 30L, + i31: Long = 31L, + i32: Long = 32L, + ): Long + +} + +inline class IC(val x: Long) : IIC { + override fun f( + i1: Long, + i2: Long, + i3: Long, + i4: Long, + i5: Long, + i6: Long, + i7: Long, + i8: Long, + i9: Long, + i10: Long, + i11: Long, + i12: Long, + i13: Long, + i14: Long, + i15: Long, + i16: Long, + i17: Long, + i18: Long, + i19: Long, + i20: Long, + i21: Long, + i22: Long, + i23: Long, + i24: Long, + i25: Long, + i26: Long, + i27: Long, + i28: Long, + i29: Long, + i30: Long, + i31: Long, + i32: Long, + i33: Long, + ) = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12 + i13 + i14 + i15 + i16 + + i17 + i18 + i19 + i20 + i21 + i22 + i23 + i24 + i25 + i26 + i27 + i28 + i29 + i30 + i31 + i32 + i33 + override fun g( + i1: Long, + i2: Long, + i3: Long, + i4: Long, + i5: Long, + i6: Long, + i7: Long, + i8: Long, + i9: Long, + i10: Long, + i11: Long, + i12: Long, + i13: Long, + i14: Long, + i15: Long, + i16: Long, + i17: Long, + i18: Long, + i19: Long, + i20: Long, + i21: Long, + i22: Long, + i23: Long, + i24: Long, + i25: Long, + i26: Long, + i27: Long, + i28: Long, + i29: Long, + i30: Long, + i31: Long, + i32: Long, + ) = i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + i12 + i13 + i14 + i15 + i16 + + i17 + i18 + i19 + i20 + i21 + i22 + i23 + i24 + i25 + i26 + i27 + i28 + i29 + i30 + i31 + i32 +} + +fun box(): String { + require(IC(2).f() == (1..33).sum().toLong()) { + "${IC(2).f()} != ${(1..33).sum()}" + } + require(IC(2).g() == (1..32).sum().toLong()) { + "${IC(2).g()} != ${(1..32).sum()}" + } + return "OK" +} diff --git a/compiler/testData/codegen/box/inlineClasses/kt57973.txt b/compiler/testData/codegen/box/inlineClasses/kt57973.txt new file mode 100644 index 00000000000..fb9906dba87 --- /dev/null +++ b/compiler/testData/codegen/box/inlineClasses/kt57973.txt @@ -0,0 +1,45 @@ +@kotlin.jvm.JvmInline +@kotlin.Metadata +public final class IC { + // source: 'kt57973.kt' + private final field x: long + private synthetic method (p0: long): void + public synthetic final static method box-impl(p0: long): IC + public static method constructor-impl(p0: long): long + public method equals(p0: java.lang.Object): boolean + public static method equals-impl(p0: long, p1: java.lang.Object): boolean + public final static method equals-impl0(p0: long, p1: long): boolean + public method f(p0: long, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long, p32: long): long + public static method f-impl(p0: long, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long, p32: long, p33: long): long + public method g(p0: long, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long): long + public static method g-impl(p0: long, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long, p32: long): long + public final method getX(): long + public method hashCode(): int + public static method hashCode-impl(p0: long): int + public method toString(): java.lang.String + public static method toString-impl(p0: long): java.lang.String + public synthetic final method unbox-impl(): long +} + +@kotlin.Metadata +public final class IIC$DefaultImpls { + // source: 'kt57973.kt' + public synthetic static method f$default(p0: IIC, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long, p32: long, p33: long, p34: int, p35: int, p36: java.lang.Object): long + public synthetic static method g$default(p0: IIC, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long, p32: long, p33: int, p34: java.lang.Object): long + public final inner class IIC$DefaultImpls +} + +@kotlin.Metadata +public interface IIC { + // source: 'kt57973.kt' + public abstract method f(p0: long, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long, p32: long): long + public abstract method g(p0: long, p1: long, p2: long, p3: long, p4: long, p5: long, p6: long, p7: long, p8: long, p9: long, p10: long, p11: long, p12: long, p13: long, p14: long, p15: long, p16: long, p17: long, p18: long, p19: long, p20: long, p21: long, p22: long, p23: long, p24: long, p25: long, p26: long, p27: long, p28: long, p29: long, p30: long, p31: long): long + public final inner class IIC$DefaultImpls +} + +@kotlin.Metadata +public final class Kt57973Kt { + // source: 'kt57973.kt' + public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String + public final inner class IIC$DefaultImpls +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index ebec89f523c..de6dee979b5 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -21689,6 +21689,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index a5c263d00c2..6d2ad465569 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -22697,6 +22697,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/inlineClasses/kt57261.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 12b57eef153..738a80c2d4c 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -22697,6 +22697,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/inlineClasses/kt57261.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index cb8b3ea79c6..b8f8b7503e3 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -16763,6 +16763,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/inlineClasses/kt50974_resultMultiModule.kt"); } + @TestMetadata("kt57973.kt") + public void ignoreKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); + } + @TestMetadata("mappingOfBoxedFlexibleInlineClassTypeGeneric.kt") public void ignoreMappingOfBoxedFlexibleInlineClassTypeGeneric() throws Exception { runTest("compiler/testData/codegen/box/inlineClasses/mappingOfBoxedFlexibleInlineClassTypeGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal()); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index 34cbf0472a9..aff297bf7e1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -17053,6 +17053,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index db6c97baeea..3d89b872cc1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -17071,6 +17071,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index 56731c5b82d..fef5f894c1e 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -17071,6 +17071,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index ce346b84f79..ae8db8f7b63 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -17071,6 +17071,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index a923ac7867d..b99ecd8ec11 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -17327,6 +17327,7 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe register("compiler/testData/codegen/box/inlineClasses/kt51254.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt52913.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/lateinitInlineClasses.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunction.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunctionGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -19186,6 +19187,13 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt"); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt"); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 2e1f8e14d16..4b8709a54ad 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -17711,6 +17711,7 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB register("compiler/testData/codegen/box/inlineClasses/kt51254.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt52913.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/lateinitInlineClasses.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunction.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunctionGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -19570,6 +19571,13 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt"); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt"); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index 01ae07cf044..f1e4693d968 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -17135,6 +17135,7 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest register("compiler/testData/codegen/box/inlineClasses/kt51254.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt52913.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/lateinitInlineClasses.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunction.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunctionGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -18994,6 +18995,13 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt"); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt"); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index e5296c27d5d..b36d87e1dfa 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -17519,6 +17519,7 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT register("compiler/testData/codegen/box/inlineClasses/kt51254.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt52913.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + register("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/lateinitInlineClasses.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunction.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); register("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunctionGeneric.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); @@ -19378,6 +19379,13 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt"); } + @Test + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + // There is a registered source transformer for the testcase: TransformersFunctions.getRemoveOptionalJvmInlineAnnotation() + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt"); + } + @Test @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java index 799a17fb7df..1c40a0caab3 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java @@ -15105,6 +15105,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/inlineClasses/kt54455.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); } + @TestMetadata("kt57973.kt") + public void testKt57973() throws Exception { + runTest("compiler/testData/codegen/box/inlineClasses/kt57973.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation()); + } + @TestMetadata("lateinitInlineClasses.kt") public void testLateinitInlineClasses() throws Exception { runTest("compiler/testData/codegen/box/inlineClasses/lateinitInlineClasses.kt", TransformersFunctions.getRemoveOptionalJvmInlineAnnotation());