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

JS backend: Fix cached array access (KT-740-2)

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-12-26 22:23:42 +04:00
parent 5c9bda0f6e
commit f268f69cbf
3 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java
+83 -21
View File
@@ -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<JsExpression> indexExpressions, @NotNull JsExpression toSetTo) {
List<JsExpression> 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<FunctionDescriptor> resolvedCall = BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, isGetter);
if (!isGetter) {
context = contextWithValueParameterAliasInArrayGetAccess(toSetTo);
}
return ReferencePackage.buildCall(context, resolvedCall, arrayExpression);
}
@NotNull
protected List<JsExpression> 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<FunctionDescriptor> resolvedCall =
BindingUtils.getResolvedCallForArrayAccess(bindingContext(), expression, /*isGetter = */ false);
List<ResolvedValueArgument> 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<TemporaryVariable> temporaries = new ArrayList<TemporaryVariable>();
Map<JetExpression, JsExpression> aliases = new HashMap<JetExpression, JsExpression>();
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<TemporaryVariable> declaredTemporaries;
protected CachedArrayAccessTranslator(
@NotNull JetArrayAccessExpression expression,
@NotNull TranslationContext context,
@NotNull TemporaryVariable temporaryArrayExpression,
@NotNull List<TemporaryVariable> temporaries
) {
super(expression, context);
this.temporaryArrayExpression = temporaryArrayExpression;
declaredTemporaries = temporaries;
}
@NotNull
@Override
protected JsExpression getArrayExpression() {
return temporaryArrayExpression.reference();
}
@NotNull
@Override
public List<TemporaryVariable> declaredTemporaries() {
return declaredTemporaries;
}
}
}
js/js.translator/src/org/jetbrains/k2js/translate/reference/CachedArrayAccessTranslator.java
-65
View File
@@ -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<TemporaryVariable> 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<TemporaryVariable> declaredTemporaries() {
List<TemporaryVariable> result = Lists.newArrayList();
result.add(arrayExpression);
result.addAll(indexExpressions);
return result;
}
}
js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt
+23 -20
View File
@@ -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"
}