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

KJS: make deep copy of additional arguments before expose them in KotlinFunctionIntrinsic

Browse Source
This commit is contained in:
Zalim Bashorov
2017-01-18 14:24:52 +03:00
parent ca2930600a
commit 284b9d2ba6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/KotlinFunctionIntrinsic.java
+8 -4
View File
@@ -16,17 +16,17 @@
package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories;
import kotlin.collections.CollectionsKt;
import org.jetbrains.kotlin.js.backend.ast.JsExpression;
import org.jetbrains.kotlin.js.backend.ast.JsInvocation;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.js.backend.ast.JsExpression;
import org.jetbrains.kotlin.js.backend.ast.JsInvocation;
import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic;
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class KotlinFunctionIntrinsic extends FunctionIntrinsic { public class KotlinFunctionIntrinsic extends FunctionIntrinsic {
@@ -48,7 +48,11 @@ public class KotlinFunctionIntrinsic extends FunctionIntrinsic {
) { ) {
JsExpression function = JsAstUtils.pureFqn(functionName, Namer.kotlinObject()); JsExpression function = JsAstUtils.pureFqn(functionName, Namer.kotlinObject());
if (additionalArguments.length > 0) { if (additionalArguments.length > 0) {
arguments = CollectionsKt.plus(arguments, additionalArguments); List<JsExpression> newArguments = new ArrayList<JsExpression>(arguments);
for (JsExpression e : additionalArguments) {
newArguments.add(e.deepCopy());
}
arguments = newArguments;
} }
return new JsInvocation(function, receiver == null ? arguments : TranslationUtils.generateInvocationArguments(receiver, arguments)); return new JsInvocation(function, receiver == null ? arguments : TranslationUtils.generateInvocationArguments(receiver, arguments));
} }