jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

JVM_IR KT-47984 allow noinline functional inplace args

Browse Source
This commit is contained in:
Dmitry Petrov
2021-08-09 17:44:24 +03:00
committed by TeamCityServer
parent 9be941def2
commit 7a99f9ff2e
11 changed files with 94 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java generated
View File

@@ -18252,6 +18252,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@Test
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@Test
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {

2
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/IrInlineCodegen.kt
View File

@@ -58,7 +58,7 @@ class IrInlineCodegen(
}
if (actualParametersCount == 0)
return false
if (function.valueParameters.any { it.isFunctionOrSuspendFunction() })
if (function.valueParameters.any { !it.isNoinline && it.isFunctionOrSuspendFunction() })
return false
return canInlineArgumentsInPlace(sourceCompiler.compileInlineFunction(jvmSignature).node)

30
compiler/testData/codegen/box/inlineArgsInPlace/inlineCircularDedepency.kt vendored Normal file
View File

@@ -0,0 +1,30 @@
// IGNORE_BACKEND: WASM
// FULL_JDK
// WITH_RUNTIME
val z = ArrayList<String>()
inline fun a(body: () -> Unit) {
body()
z += "a"
}
inline fun b(body: () -> Unit) {
z += "b"
body()
a { z += "from b" }
}
fun test() {
b { z += "test" }
}
fun box(): String {
test()
if (z != listOf("b", "test", "from b", "a"))
return z.toString()
return "OK"
}

20
compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt vendored Normal file
View File

@@ -0,0 +1,20 @@
// IGNORE_BACKEND: WASM
// WITH_RUNTIME
// CHECK_BYTECODE_TEXT
// JVM_IR_TEMPLATES
// 1 ASTORE 1
// 12 ALOAD 1
// JVM_TEMPLATES
// 2 ASTORE 1
// 13 ALOAD 1
@Suppress("DEPRECATION_ERROR")
fun box(): String {
val seq = buildSequence {
yield("O")
yield("K")
}
val it = seq.iterator()
return it.next() + it.next()
}

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java generated
View File

@@ -18108,6 +18108,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@Test
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@Test
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java generated
View File

@@ -18252,6 +18252,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@Test
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@Test
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {

5
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java generated
View File

@@ -15009,6 +15009,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/suspensionPointInsideArgument.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java generated
View File

@@ -13098,6 +13098,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/suspensionPointInsideArgument.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java generated
View File

@@ -12504,6 +12504,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/suspensionPointInsideArgument.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java generated
View File

@@ -12569,6 +12569,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/suspensionPointInsideArgument.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java generated
View File

@@ -6659,6 +6659,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/inlineArgsInPlace/mutableCollectionPlusAssign.kt");
}
@TestMetadata("noinlineParameter.kt")
public void testNoinlineParameter() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/noinlineParameter.kt");
}
@TestMetadata("suspensionPointInsideArgument.kt")
public void testSuspensionPointInsideArgument() throws Exception {
runTest("compiler/testData/codegen/box/inlineArgsInPlace/suspensionPointInsideArgument.kt");