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

JVM_IR. Do not unbox Result in inline lambda

Browse Source 
Since JVM_IR generates inline lambdas differently from old backend,
in this case, it generates them as normal functions.
Thus, there is no need to unbox the lambda argument.
 #KT-44671 Fixed
This commit is contained in:
Ilmir Usmanov
2021-02-04 02:29:42 +01:00
parent fb296b5b95
commit cd189c0812
9 changed files with 68 additions and 0 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
@@ -10685,6 +10685,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@Test
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@Test
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+1
View File
@@ -626,6 +626,7 @@ class ExpressionCodegen(
// bridge to unbox it. Instead, we unbox it in the non-mangled function manually.
private fun unboxResultIfNeeded(arg: IrGetValue) {
if (arg.type.erasedUpperBound.fqNameWhenAvailable != StandardNames.RESULT_FQ_NAME) return
if (irFunction.origin == IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA) return
if (!onlyResultInlineClassParameters()) return
if (irFunction !is IrSimpleFunction) return
// Skip Result's methods
compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt
Vendored
+29
View File
@@ -0,0 +1,29 @@
// WITH_RUNTIME
import kotlin.coroutines.intrinsics.*
import kotlin.coroutines.*
fun myRun(c: () -> Unit) {
c()
}
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
fun box(): String {
var contiuation: Continuation<Unit>? = null
val c: suspend () -> Unit = {
suspendCoroutine {
contiuation = it
}
}
var exception: Throwable? = null
myRun {
c.startCoroutineUninterceptedOrReturn(Continuation(EmptyCoroutineContext) {
exception = it.exceptionOrNull()
})
}
contiuation?.resumeWithException(RuntimeException("OK"))
return exception!!.message!!
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -10685,6 +10685,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@Test
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@Test
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -10685,6 +10685,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@Test
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@Test
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -8558,6 +8558,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -7668,6 +7668,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -7153,6 +7153,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -7153,6 +7153,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/intercepted.kt");
}
@TestMetadata("resultExceptionOrNullInLambda.kt")
public void testResultExceptionOrNullInLambda() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/resultExceptionOrNullInLambda.kt");
}
@TestMetadata("startCoroutine.kt")
public void testStartCoroutine() throws Exception {
runTest("compiler/testData/codegen/box/coroutines/intrinsicSemantics/startCoroutine.kt");