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

[JS IR BE] Allow empty call arguments only for external functions

Browse Source
This commit is contained in:
Svyatoslav Kuzmich
2019-05-19 20:06:35 +03:00
parent e9ceee388e
commit 5495da5241
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt
+10 -4
View File
@@ -11,8 +11,10 @@ import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext
import org.jetbrains.kotlin.ir.backend.js.utils.Namer import org.jetbrains.kotlin.ir.backend.js.utils.Namer
import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrFunction
import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression
import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression
import org.jetbrains.kotlin.ir.expressions.IrWhen import org.jetbrains.kotlin.ir.expressions.IrWhen
import org.jetbrains.kotlin.ir.util.isEffectivelyExternal
import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.backend.ast.*
fun jsVar(name: JsName, initializer: IrExpression?, context: JsGenerationContext): JsVars { fun jsVar(name: JsName, initializer: IrExpression?, context: JsGenerationContext): JsVars {
@@ -72,10 +74,14 @@ fun translateCallArguments(expression: IrMemberAccessExpression, context: JsGene
val transformer = IrElementToJsExpressionTransformer() val transformer = IrElementToJsExpressionTransformer()
val size = expression.valueArgumentsCount val size = expression.valueArgumentsCount
val arguments = (0 until size).mapTo(ArrayList(size)) { val arguments = (0 until size).mapTo(ArrayList(size)) { index ->
val argument = expression.getValueArgument(it) val argument = expression.getValueArgument(index)
val result = argument?.accept(transformer, context) ?: JsPrefixOperation(JsUnaryOperator.VOID, JsIntLiteral(1)) val result = argument?.accept(transformer, context)
result if (result == null) {
assert(expression is IrFunctionAccessExpression && expression.symbol.owner.isEffectivelyExternal())
JsPrefixOperation(JsUnaryOperator.VOID, JsIntLiteral(1))
} else
result
} }
return if (expression.descriptor.isSuspend) { return if (expression.descriptor.isSuspend) {