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

Simplify concatElements resolution for size=0 and size=1 cases

Browse Source 
^KT-40689 fixed
This commit is contained in:
Shagen Ogandzhanian
2021-01-08 18:38:23 +01:00
committed by TeamCityServer
parent bcfc0c21b1
commit 1dbe7d12a2
1 changed files with 6 additions and 3 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
+6 -3
View File
@@ -240,15 +240,18 @@ fun argumentsWithVarargAsSingleArray(
} }
} }
if (arraysForConcat.isNotEmpty() || concatElements.isEmpty()) { if (arraysForConcat.isNotEmpty()) {
concatElements.add(JsArrayLiteral(arraysForConcat)) concatElements.add(JsArrayLiteral(arraysForConcat))
} }
return concatElements.singleOrNull() return when (concatElements.size) {
?: JsInvocation( 0 -> JsArrayLiteral()
1 -> concatElements[0]
else -> JsInvocation(
JsNameRef("concat", concatElements.first()), JsNameRef("concat", concatElements.first()),
concatElements.drop(1) concatElements.drop(1)
) )
}
} }
fun IrFunction.varargParameterIndex() = valueParameters.indexOfFirst { it.varargElementType != null } fun IrFunction.varargParameterIndex() = valueParameters.indexOfFirst { it.varargElementType != null }