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

[JS IR] Fix access to coroutine empty context for suspend main

Browse Source
This commit is contained in:
Roman Artemev
2020-01-27 15:42:19 +03:00
committed by romanart
parent cef9ed1dae
commit 7688197841
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt
+1 -1
View File
@@ -264,7 +264,7 @@ class JsIrBackendContext(
val coroutineGetContextJs val coroutineGetContextJs
get() = ir.symbols.coroutineGetContext get() = ir.symbols.coroutineGetContext
val coroutineEmptyContinuation = symbolTable.referenceField(getProperty(FqName.fromSegments(listOf("kotlin", "coroutines", "js", "internal", "EmptyContinuation")))) val coroutineEmptyContinuation = symbolTable.referenceProperty(getProperty(FqName.fromSegments(listOf("kotlin", "coroutines", "js", "internal", "EmptyContinuation"))))
val coroutineContextProperty: PropertyDescriptor val coroutineContextProperty: PropertyDescriptor
get() { get() {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
+1 -1
View File
@@ -185,7 +185,7 @@ class IrModuleToJsTransformer(
if (mainFunction.valueParameters.isNotEmpty()) JsArrayLiteral(mainArguments.map { JsStringLiteral(it) }) else null if (mainFunction.valueParameters.isNotEmpty()) JsArrayLiteral(mainArguments.map { JsStringLiteral(it) }) else null
val continuation = if (mainFunction.isSuspend) { val continuation = if (mainFunction.isSuspend) {
val emptyContinuationField = backendContext.coroutineEmptyContinuation.owner val emptyContinuationField = backendContext.coroutineEmptyContinuation.owner.backingField!!
rootContext.getNameForField(emptyContinuationField).makeRef() rootContext.getNameForField(emptyContinuationField).makeRef()
} else null } else null