Fix [#KT-23921]
* make name collector in inliner process handle JsCatch * visit JsParameter during live analyser in coroutine transformer
This commit is contained in:
committed by
Roman Artemev
parent
31c968123c
commit
eb420a1e0f
@@ -288,6 +288,12 @@ fun List<CoroutineBlock>.collectVariablesSurvivingBetweenBlocks(localVariables:
|
||||
|
||||
}
|
||||
|
||||
override fun visitParameter(x: JsParameter) {
|
||||
varDeclaredIn[x.name]?.add(blockIndex)
|
||||
varDefinedIn[x.name]?.add(blockIndex)
|
||||
super.visitParameter(x)
|
||||
}
|
||||
|
||||
override fun visitBinaryExpression(x: JsBinaryOperation) {
|
||||
val lhs = x.arg1
|
||||
if (x.operator.isAssignment && lhs is JsNameRef) {
|
||||
|
||||
@@ -104,6 +104,11 @@ fun collectDefinedNames(scope: JsNode): Set<JsName> {
|
||||
super.visitExpressionStatement(x)
|
||||
}
|
||||
|
||||
override fun visitCatch(x: JsCatch) {
|
||||
names += x.parameter.name
|
||||
super.visitCatch(x)
|
||||
}
|
||||
|
||||
// Skip function expression, since it does not introduce name in scope of containing function.
|
||||
// The only exception is function statement, that is handled with the code above.
|
||||
override fun visitFunction(x: JsFunction) { }
|
||||
|
||||
+5
@@ -5004,6 +5004,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines.experimental");
|
||||
}
|
||||
|
||||
@TestMetadata("catchWithInlineInsideSuspend.kt")
|
||||
public void testCatchWithInlineInsideSuspend_1_2() throws Exception {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines.experimental");
|
||||
}
|
||||
|
||||
@TestMetadata("coercionToUnit.kt")
|
||||
public void testCoercionToUnit_1_2() throws Exception {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines.experimental");
|
||||
|
||||
+10
@@ -5069,6 +5069,16 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/beginWithException.kt", "kotlin.coroutines");
|
||||
}
|
||||
|
||||
@TestMetadata("catchWithInlineInsideSuspend.kt")
|
||||
public void testCatchWithInlineInsideSuspend_1_2() throws Exception {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines.experimental");
|
||||
}
|
||||
|
||||
@TestMetadata("catchWithInlineInsideSuspend.kt")
|
||||
public void testCatchWithInlineInsideSuspend_1_3() throws Exception {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/catchWithInlineInsideSuspend.kt", "kotlin.coroutines");
|
||||
}
|
||||
|
||||
@TestMetadata("coercionToUnit.kt")
|
||||
public void testCoercionToUnit_1_2() throws Exception {
|
||||
runTestWithPackageReplacement("compiler/testData/codegen/box/coroutines/coercionToUnit.kt", "kotlin.coroutines.experimental");
|
||||
|
||||
Reference in New Issue
Block a user