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

[JVM_IR] Deal with inline-class arguments in large arity lambdas.

Browse Source 
FunctionNVarargBridgeLowering checked the name of the method instead
of whether the method overrides an invoke method. That doesn't work
when the name of the function gets mangled because of inline class
arguments.

Fixed KT-45084.
This commit is contained in:
Mads Ager
2021-05-06 14:08:49 +02:00
committed by Alexander Udalov
parent 1181854bd6
commit b6fa28ea81
10 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18272,6 +18272,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@Test
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@Test
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/FunctionNVarargBridgeLowering.kt
+5 -2
View File
@@ -91,8 +91,11 @@ private class FunctionNVarargBridgeLowering(val context: JvmBackendContext) :
)
// Add vararg invoke bridge
val invokeFunction = declaration.functions.single {
it.name.asString() == "invoke" && it.valueParameters.size == superType.arguments.size - if (it.isSuspend) 0 else 1
val invokeFunction = declaration.functions.single { function ->
val overridesInvoke = function.overriddenSymbols.any { symbol ->
symbol.owner.name.asString() == "invoke"
}
overridesInvoke && function.valueParameters.size == superType.arguments.size - if (function.isSuspend) 0 else 1
}
invokeFunction.overriddenSymbols = emptyList()
declaration.addBridge(invokeFunction, functionNInvokeFun.owner)
compiler/testData/codegen/box/inlineClasses/kt45084.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// IGNORE_BACKEND: WASM
inline class Z(val value: Long)
fun f(g: (
z: Z,
p01: Long, p02: Long, p03: Long, p04: Long, p05: Long, p06: Long, p07: Long, p08: Long, p09: 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
) -> Unit) {
g(Z(42L), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
}
fun box(): String {
var result = ""
f { z, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _ ->
result = if (z.value == 42L) "OK" else "FAIL"
}
return result
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18248,6 +18248,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@Test
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@Test
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18272,6 +18272,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@Test
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@Test
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -15142,6 +15142,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineClasses/kt44141.kt");
}
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@TestMetadata("mangledDefaultParameterFunction.kt")
public void testMangledDefaultParameterFunction() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/mangledDefaultParameterFunction.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -13276,6 +13276,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45991.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -12687,6 +12687,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45991.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -12752,6 +12752,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45991.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -6902,6 +6902,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/inlineClasses/kt44978.kt");
}
@TestMetadata("kt45084.kt")
public void testKt45084() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45084.kt");
}
@TestMetadata("kt45991.kt")
public void testKt45991() throws Exception {
runTest("compiler/testData/codegen/box/inlineClasses/kt45991.kt");