From f268f69cbf1a5486539eadfc0c157e5d897e0547 Mon Sep 17 00:00:00 2001 From: Erokhin Stanislav Date: Thu, 26 Dec 2013 22:23:42 +0400 Subject: [PATCH] JS backend: Fix cached array access (KT-740-2) --- .../reference/ArrayAccessTranslator.java | 104 ++++++++++++++---- .../CachedArrayAccessTranslator.java | 65 ----------- .../expression/misc/cases/KT-740-2.kt | 43 ++++---- 3 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java index c43ac58b5fc..fa4d79fff67 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java @@ -16,18 +16,23 @@ package org.jetbrains.k2js.translate.reference; -import com.google.common.collect.Lists; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.psi.JetArrayAccessExpression; import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.jet.lang.psi.ValueArgument; +import org.jetbrains.jet.lang.resolve.calls.model.ExpressionValueArgument; +import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.k2js.translate.context.TemporaryVariable; import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.general.AbstractTranslator; import org.jetbrains.k2js.translate.general.Translation; import org.jetbrains.k2js.translate.utils.BindingUtils; -import org.jetbrains.k2js.translate.utils.TranslationUtils; -import java.util.List; +import java.util.*; public class ArrayAccessTranslator extends AbstractTranslator implements AccessTranslator { @@ -49,49 +54,106 @@ public class ArrayAccessTranslator extends AbstractTranslator implements AccessT @NotNull @Override public JsExpression translateAsGet() { - return translateAsGet(translateArrayExpression()); + return translateAsGet(getArrayExpression()); } @NotNull protected JsExpression translateAsGet(@NotNull JsExpression arrayExpression) { - return translateAsMethodCall(arrayExpression, /*isGetter = */ true); + return translateAsMethodCall(arrayExpression, null); } @NotNull @Override public JsExpression translateAsSet(@NotNull JsExpression setTo) { - return translateAsSet(translateArrayExpression(), translateIndexExpressions(), setTo); + return translateAsSet(getArrayExpression(), setTo); } @NotNull - protected JsExpression translateAsSet(@NotNull JsExpression arrayExpression, @NotNull List indexExpressions, @NotNull JsExpression toSetTo) { - List arguments = Lists.newArrayList(indexExpressions); - arguments.add(toSetTo); - return translateAsMethodCall(arrayExpression, /*isGetter = */ false); + protected JsExpression translateAsSet(@NotNull JsExpression arrayExpression, @NotNull JsExpression toSetTo) { + return translateAsMethodCall(arrayExpression, toSetTo); } @NotNull - private JsExpression translateAsMethodCall(@NotNull JsExpression arrayExpression, boolean isGetter) { - return ReferencePackage.buildCall(context(), - BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, isGetter), - arrayExpression); + private JsExpression translateAsMethodCall(@NotNull JsExpression arrayExpression, @Nullable JsExpression toSetTo) { + boolean isGetter = toSetTo == null; + TranslationContext context = context(); + ResolvedCall resolvedCall = BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, isGetter); + if (!isGetter) { + context = contextWithValueParameterAliasInArrayGetAccess(toSetTo); + } + return ReferencePackage.buildCall(context, resolvedCall, arrayExpression); } @NotNull - protected List translateIndexExpressions() { - return TranslationUtils.translateExpressionList(context(), expression.getIndexExpressions()); - } - - @NotNull - protected JsExpression translateArrayExpression() { + protected JsExpression getArrayExpression() { JetExpression arrayExpression = expression.getArrayExpression(); assert arrayExpression != null : "Code with parsing errors shouldn't be translated"; return Translation.translateAsExpression(arrayExpression, context()); } + // this is hack for a[b]++ -> a.set(b, a.get(b) + 1). Frontend generate fake expression for a.get(b) + 1. + @NotNull + private TranslationContext contextWithValueParameterAliasInArrayGetAccess(@NotNull JsExpression toSetTo) { + ResolvedCall resolvedCall = + BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, /*isGetter = */ false); + + List arguments = resolvedCall.getValueArgumentsByIndex(); + ResolvedValueArgument lastArgument = arguments.get(arguments.size() - 1); + assert lastArgument instanceof ExpressionValueArgument: "Last argument of array-like setter must be ExpressionValueArgument"; + + ValueArgument valueArgument = ((ExpressionValueArgument) lastArgument).getValueArgument(); + assert valueArgument != null; + + JetExpression element = valueArgument.getArgumentExpression(); + return context().innerContextWithAliasesForExpressions(Collections.singletonMap(element, toSetTo)); + } + @NotNull @Override public CachedAccessTranslator getCached() { - return new CachedArrayAccessTranslator(expression, context()); + List temporaries = new ArrayList(); + Map aliases = new HashMap(); + + TemporaryVariable temporaryArrayExpression = context().declareTemporary(getArrayExpression()); + temporaries.add(temporaryArrayExpression); + + for (JetExpression jetExpression : expression.getIndexExpressions()) { + JsExpression jsExpression = Translation.translateAsExpression(jetExpression, context()); + TemporaryVariable temporaryVariable = context().declareTemporary(jsExpression); + temporaries.add(temporaryVariable); + aliases.put(jetExpression, temporaryVariable.reference()); + } + return new CachedArrayAccessTranslator(expression, context().innerContextWithAliasesForExpressions(aliases), + temporaryArrayExpression, temporaries); + } + + private static class CachedArrayAccessTranslator extends ArrayAccessTranslator implements CachedAccessTranslator { + @NotNull + private final TemporaryVariable temporaryArrayExpression; + @NotNull + private final List declaredTemporaries; + + protected CachedArrayAccessTranslator( + @NotNull JetArrayAccessExpression expression, + @NotNull TranslationContext context, + @NotNull TemporaryVariable temporaryArrayExpression, + @NotNull List temporaries + ) { + super(expression, context); + this.temporaryArrayExpression = temporaryArrayExpression; + declaredTemporaries = temporaries; + } + + @NotNull + @Override + protected JsExpression getArrayExpression() { + return temporaryArrayExpression.reference(); + } + + @NotNull + @Override + public List declaredTemporaries() { + return declaredTemporaries; + } } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java deleted file mode 100644 index 089bc4fa0ac..00000000000 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.k2js.translate.reference; - -import com.google.common.collect.Lists; -import com.google.dart.compiler.backend.js.ast.JsExpression; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetArrayAccessExpression; -import org.jetbrains.k2js.translate.context.TemporaryVariable; -import org.jetbrains.k2js.translate.context.TranslationContext; - -import java.util.List; - -import static org.jetbrains.k2js.translate.utils.TemporariesUtils.fromExpressionList; -import static org.jetbrains.k2js.translate.utils.TemporariesUtils.toExpressionList; - -public final class CachedArrayAccessTranslator extends ArrayAccessTranslator implements CachedAccessTranslator { - - @NotNull - private final TemporaryVariable arrayExpression; - @NotNull - private final List indexExpressions; - - /*package*/ CachedArrayAccessTranslator(@NotNull JetArrayAccessExpression expression, - @NotNull TranslationContext context) { - super(expression, context); - arrayExpression = context.declareTemporary(translateArrayExpression()); - indexExpressions = fromExpressionList(translateIndexExpressions(), context); - } - - @NotNull - @Override - public JsExpression translateAsGet() { - return translateAsGet(arrayExpression.reference()); - } - - @NotNull - @Override - public JsExpression translateAsSet(@NotNull JsExpression setTo) { - return translateAsSet(arrayExpression.reference(), toExpressionList(indexExpressions), setTo); - } - - @NotNull - @Override - public List declaredTemporaries() { - List result = Lists.newArrayList(); - result.add(arrayExpression); - result.addAll(indexExpressions); - return result; - } -} diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt b/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt index 1e30fa8d301..ec5aa56dbab 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt @@ -3,6 +3,16 @@ package foo var c0 = 0 var c1 = 0 var c2 = 0 +var c3 = 0 + +fun cStr(): String { + return "${c0}${c1}${c2}${c3}" +} + +fun get1(): Int { + c3++ + return 1 +} class A() { var p = 0 @@ -24,31 +34,24 @@ val a: A = A() fun box(): String { var d = a[1] - if (c0 != 1) { - return "1" - } - if (c1 != 1) { - return "2" + if (cStr() != "1100") { + return "Fail: d = a[1], cStr(): ${cStr()}" } + ++a[1] - if (c0 != 2) { - return "3" - } - if (c1 != 3) { - return "4" - } - if (c2 != 1) { - return "5" + if (cStr() != "2310") { + return "Fail: ++a[1], cStr(): ${cStr()}" } + --a[1] - if (c0 != 3) { - return "6" + if (cStr() != "3520") { + return "Fail: --a[1], cStr(): ${cStr()}" } - if (c1 != 5) { - return "7" - } - if (c2 != 2) { - return "8" + + ++a[get1()] + if (cStr() != "4731") { + return "Fail: ++a[get1()], cStr(): ${cStr()}" } + return "OK" } \ No newline at end of file