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

JS: report inline suspend functions to IC

Browse Source 
* Also inline suspend lambda'a
* Also use correct JsName's in exported suspend inline fun's
* Also use less unused imports
This commit is contained in:
Anton Bannykh
2018-11-01 20:23:45 +03:00
parent 82268cd95d
commit 59009430e5
13 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt
+3
View File
@@ -47,12 +47,14 @@ class CoroutineTransformer : JsVisitorWithContextImpl() {
if (function?.coroutineMetadata != null) {
val name = ((lhs as? JsNameRef)?.name ?: function.name)?.ident
additionalStatementsByNode[x] = CoroutineFunctionTransformer(function, name).transform()
function.coroutineMetadata = null
return false
}
}
else if (expression is JsFunction) {
if (expression.coroutineMetadata != null) {
additionalStatementsByNode[x] = CoroutineFunctionTransformer(expression, expression.name?.ident).transform()
expression.coroutineMetadata = null
return false
}
}
@@ -74,6 +76,7 @@ class CoroutineTransformer : JsVisitorWithContextImpl() {
if (function?.coroutineMetadata != null) {
val name = x.name.ident
additionalStatementsByNode[x] = CoroutineFunctionTransformer(function, name).transform()
function.coroutineMetadata = null
return false
}
}
js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriters/NameReplacingVisitor.kt
+11
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.js.inline.util.rewriters
import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata
class NameReplacingVisitor(private val replaceMap: Map<JsName, JsExpression>) : JsVisitorWithContextImpl() {
@@ -43,6 +44,16 @@ class NameReplacingVisitor(private val replaceMap: Map<JsName, JsExpression>) :
override fun endVisit(x: JsParameter, ctx: JsContext<*>) = applyToNamedNode(x)
override fun visit(x: JsFunction, ctx: JsContext<*>): Boolean {
x.coroutineMetadata?.let { coroutineMetadata ->
x.coroutineMetadata = coroutineMetadata.copy(
baseClassRef = accept(coroutineMetadata.baseClassRef.deepCopy()),
suspendObjectRef = accept(coroutineMetadata.suspendObjectRef.deepCopy())
)
}
return super.visit(x, ctx)
}
private fun applyToNamedNode(x: HasName) {
while (true) {
val replacement = replaceMap[x.name]
js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt
-3
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.js.translate.callTranslator
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.isFunctionTypeOrSubtype
import org.jetbrains.kotlin.builtins.isSuspendFunctionType
import org.jetbrains.kotlin.builtins.isSuspendFunctionTypeOrSubtype
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -32,8 +31,6 @@ import org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator
import org.jetbrains.kotlin.js.translate.utils.*
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.Call.CallType
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtWhenConditionInRange
import org.jetbrains.kotlin.resolve.calls.callResolverUtil.isInvokeCallOnVariable
import org.jetbrains.kotlin.resolve.calls.callUtil.isSafeCall
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/AbstractDeclarationVisitor.kt
+8 -4
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.js.backend.ast.JsName
import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata
import org.jetbrains.kotlin.js.backend.ast.metadata.isInlineableCoroutineBody
import org.jetbrains.kotlin.js.descriptorUtils.shouldBeExported
import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator
import org.jetbrains.kotlin.js.translate.context.TranslationContext
import org.jetbrains.kotlin.js.translate.expression.InlineMetadata
import org.jetbrains.kotlin.js.translate.expression.translateAndAliasParameters
@@ -100,17 +101,20 @@ abstract class AbstractDeclarationVisitor : TranslatorVisitor<Unit>() {
else {
null
}
addFunction(descriptor, functionAndContext?.first, expression)
if (descriptor.isSuspend && descriptor.isInline && descriptor.shouldBeExported(context.config) && functionAndContext != null) {
val exportFunction = functionAndContext.first as JsFunction
exportFunction.fillCoroutineMetadata(context, descriptor, exportFunction.coroutineMetadata!!.hasController)
addFunction(descriptor, exportFunction, expression)
val innerContext = functionAndContext.second
val inlineFunction = functionAndContext.first.deepCopy() as JsFunction
inlineFunction.name = null
inlineFunction.coroutineMetadata = null
inlineFunction.isInlineableCoroutineBody = true
val metadata = InlineMetadata.compose(inlineFunction, descriptor, innerContext)
val functionWithMetadata = metadata.functionWithMetadata(context, descriptor.source.getPsi())
context.addDeclarationStatement(functionWithMetadata.makeStmt())
context.addDeclarationStatement(innerContext.wrapWithInlineMetadata(context, inlineFunction, descriptor).makeStmt())
} else {
addFunction(descriptor, functionAndContext?.first, expression)
}
}