azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ArrayStoreException from InlineClassAwareCaller.call

Browse Source 
#KT-56650 Fixed
This commit is contained in:
wrongwrong
2023-02-14 16:13:31 +09:00
committed by Alexander Udalov
parent 10e9ef349f
commit b039f2e574
7 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -43019,6 +43019,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/primaryValOfInlineClass.kt");
}
@Test
@TestMetadata("simpleConstructorWithInlineClassParameter.kt")
public void testSimpleConstructorWithInlineClassParameter() throws Exception {
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/simpleConstructorWithInlineClassParameter.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/reflection/call/inlineClasses/nonNullObject")
@TestDataPath("$PROJECT_ROOT")
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -43019,6 +43019,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/primaryValOfInlineClass.kt");
}
@Test
@TestMetadata("simpleConstructorWithInlineClassParameter.kt")
public void testSimpleConstructorWithInlineClassParameter() throws Exception {
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/simpleConstructorWithInlineClassParameter.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/reflection/call/inlineClasses/nonNullObject")
@TestDataPath("$PROJECT_ROOT")
compiler/testData/codegen/box/reflection/call/inlineClasses/simpleConstructorWithInlineClassParameter.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// TARGET_BACKEND: JVM
// WITH_REFLECT
@JvmInline
value class Value(val value: String)
class A(val result: Value)
fun box(): String {
val args: Array<Value> = arrayOf(Value("OK"))
val a = (::A).call(*args)
return a.result.value
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -40901,6 +40901,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/primaryValOfInlineClass.kt");
}
@Test
@TestMetadata("simpleConstructorWithInlineClassParameter.kt")
public void testSimpleConstructorWithInlineClassParameter() throws Exception {
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/simpleConstructorWithInlineClassParameter.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/reflection/call/inlineClasses/nonNullObject")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -43019,6 +43019,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/primaryValOfInlineClass.kt");
}
@Test
@TestMetadata("simpleConstructorWithInlineClassParameter.kt")
public void testSimpleConstructorWithInlineClassParameter() throws Exception {
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/simpleConstructorWithInlineClassParameter.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/reflection/call/inlineClasses/nonNullObject")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -32674,6 +32674,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/primaryValOfInlineClass.kt");
}
@TestMetadata("simpleConstructorWithInlineClassParameter.kt")
public void testSimpleConstructorWithInlineClassParameter() throws Exception {
runTest("compiler/testData/codegen/box/reflection/call/inlineClasses/simpleConstructorWithInlineClassParameter.kt");
}
@TestMetadata("compiler/testData/codegen/box/reflection/call/inlineClasses/nonNullObject")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/InlineClassAwareCaller.kt
+13 -8
View File
@@ -125,16 +125,21 @@ internal class InlineClassAwareCaller<out M : Member?>(
val (range, unbox, box) = data
@Suppress("UNCHECKED_CAST")
val unboxed = args.copyOf() as Array<Any?>
for (index in range) {
val method = unbox[index]
val unboxed = Array(args.size) { index ->
val arg = args[index]
// Note that arg may be null in case we're calling a $default method and it's an optional parameter of an inline class type
unboxed[index] = if (method != null) {
if (arg != null) {
method.invoke(arg)
if (index in range) {
// Note that arg may be null in case we're calling a $default method and it's an optional parameter of an inline class type
val method = unbox[index]
if (method != null) {
if (arg != null) {
method.invoke(arg)
} else {
defaultPrimitiveValue(method.returnType)
}
} else {
defaultPrimitiveValue(method.returnType)
arg
}
} else {
arg