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

[JS BE] Set enclosing exception state in finally block

Browse Source 
[Fix KT-28207]
This commit is contained in:
Roman Artemev
2018-11-15 15:20:30 +03:00
committed by romanart
parent 353b469f4a
commit d5acc8ff5b
9 changed files with 186 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineBodyTransformer.kt
+1
View File
@@ -295,6 +295,7 @@ class CoroutineBodyTransformer(private val context: CoroutineTransformationConte
// Handle finally node
if (finallyNode != null) {
currentBlock = finallyBlock
currentStatements += exceptionState(oldCatchBlock, x)
finallyNode.statements.forEach { it.accept(this) }
generateFinallyExit()
hasFinallyBlocks = true
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+10
View File
@@ -6373,6 +6373,16 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines");
}
@TestMetadata("rethrowInFinallyWithSuspension.kt")
public void testRethrowInFinallyWithSuspension_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines");
}
@TestMetadata("rethrowInFinally.kt")
public void testRethrowInFinally_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines");
}
@TestMetadata("simple.kt")
public void testSimple_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+20
View File
@@ -7223,6 +7223,26 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/inlineSuspendFunction.kt", "kotlin.coroutines");
}
@TestMetadata("rethrowInFinallyWithSuspension.kt")
public void testRethrowInFinallyWithSuspension_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines.experimental");
}
@TestMetadata("rethrowInFinallyWithSuspension.kt")
public void testRethrowInFinallyWithSuspension_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinallyWithSuspension.kt", "kotlin.coroutines");
}
@TestMetadata("rethrowInFinally.kt")
public void testRethrowInFinally_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines.experimental");
}
@TestMetadata("rethrowInFinally.kt")
public void testRethrowInFinally_1_3() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/rethrowInFinally.kt", "kotlin.coroutines");
}
@TestMetadata("simple.kt")
public void testSimple_1_2() throws Exception {
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/stackUnwinding/simple.kt", "kotlin.coroutines.experimental");