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

Don't create IIFE for varags at all when it possible

Browse Source 
^KT-40689 fixed
This commit is contained in:
Shagen Ogandzhanian
2021-01-10 02:30:10 +01:00
committed by TeamCityServer
parent cac57e4178
commit 2a170652c5
1 changed files with 28 additions and 32 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
+28 -32
View File
@@ -162,22 +162,18 @@ fun translateCall(
)
if (jsDispatchReceiver != null) {
// TODO: Do not create IIFE when receiver expression is simple or has no side effects
// TODO: Do not create IIFE at all? (Currently there is no reliable way to create temporary variable in current scope)
val iifeFun = JsFunction(
emptyScope,
if (argumentsAsSingleArray is JsArrayLiteral) {
JsBlock(
JsReturn(
JsInvocation(
JsNameRef(symbolName, jsDispatchReceiver),
argumentsAsSingleArray.expressions
)
)
)
} else {
val receiverName = JsName("\$externalVarargReceiverTmp")
val receiverRef = receiverName.makeRef()
if (argumentsAsSingleArray is JsArrayLiteral) {
JsInvocation(
JsNameRef(symbolName, jsDispatchReceiver),
argumentsAsSingleArray.expressions
)
} else {
// TODO: Do not create IIFE at all? (Currently there is no reliable way to create temporary variable in current scope)
val receiverName = JsName("\$externalVarargReceiverTmp")
val receiverRef = receiverName.makeRef()
val iifeFun = JsFunction(
emptyScope,
JsBlock(
JsVars(JsVars.JsVar(receiverName, jsDispatchReceiver)),
JsReturn(
@@ -189,24 +185,24 @@ fun translateCall(
)
)
)
)
},
"VarargIIFE"
)
val iifeFunHasContext = (jsDispatchReceiver as? JsNameRef)?.qualifier is JsThisRef
if (iifeFunHasContext) {
JsInvocation(
// Create scope for temporary variable holding dispatch receiver
// It is used both during method reference and passing `this` value to `apply` function.
JsNameRef(
"call",
iifeFun
),
JsThisRef()
"VarargIIFE"
)
} else {
JsInvocation(iifeFun)
val iifeFunHasContext = (jsDispatchReceiver as? JsNameRef)?.qualifier is JsThisRef
if (iifeFunHasContext) {
JsInvocation(
// Create scope for temporary variable holding dispatch receiver
// It is used both during method reference and passing `this` value to `apply` function.
JsNameRef(
"call",
iifeFun
),
JsThisRef()
)
} else {
JsInvocation(iifeFun)
}
}
} else {
JsInvocation(