[JS BE] Fix the crash on compound operations with a qualified call on left side

#KT-22001 Fixed
This commit is contained in:
Zalim Bashorov
2018-03-27 16:59:30 +03:00
parent c3b6abfb1f
commit 9349b9bc67
9 changed files with 174 additions and 18 deletions
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.js.translate.reference;
import org.jetbrains.kotlin.js.backend.ast.JsExpression;
import org.jetbrains.kotlin.js.backend.ast.JsNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor;
import org.jetbrains.kotlin.js.backend.ast.JsExpression;
import org.jetbrains.kotlin.js.backend.ast.JsNode;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils;
import org.jetbrains.kotlin.psi.*;
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression;
import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getNotNullSimpleNameSelector;
import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelector;
public final class QualifiedExpressionTranslator {
@@ -45,7 +44,16 @@ public final class QualifiedExpressionTranslator {
if (forceOrderOfEvaluation && receiver != null) {
receiver = context.defineTemporary(receiver);
}
return VariableAccessTranslator.newInstance(context, getNotNullSimpleNameSelector(expression), receiver);
KtExpression selector = getSelector(expression);
if (selector instanceof KtSimpleNameExpression) {
return VariableAccessTranslator.newInstance(context, (KtSimpleNameExpression) selector, receiver);
}
if (selector instanceof KtCallExpression) {
return new QualifiedExpressionWithCallSelectorAccessTranslator((KtCallExpression) selector, receiver, context);
}
throw new AssertionError("Unexpected qualified expression: " + expression.getText());
}
@NotNull
@@ -73,7 +81,7 @@ public final class QualifiedExpressionTranslator {
return VariableAccessTranslator.newInstance(context, (KtSimpleNameExpression)selector, receiver).translateAsGet();
}
if (selector instanceof KtCallExpression) {
return invokeCallExpressionTranslator(receiver, selector, context);
return invokeCallExpressionTranslator(receiver, (KtCallExpression) selector, context);
}
//TODO: never get there
if (selector instanceof KtSimpleNameExpression) {
@@ -83,13 +91,13 @@ public final class QualifiedExpressionTranslator {
}
@NotNull
private static JsNode invokeCallExpressionTranslator(
static JsNode invokeCallExpressionTranslator(
@Nullable JsExpression receiver,
@NotNull KtExpression selector,
@NotNull KtCallExpression selector,
@NotNull TranslationContext context
) {
try {
return CallExpressionTranslator.translate((KtCallExpression) selector, receiver, context);
return CallExpressionTranslator.translate(selector, receiver, context);
} catch (RuntimeException e) {
throw ErrorReportingUtils.reportErrorWithLocation(selector, e);
}
@@ -0,0 +1,29 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.js.translate.reference
import org.jetbrains.kotlin.js.backend.ast.JsExpression
import org.jetbrains.kotlin.js.translate.context.TranslationContext
import org.jetbrains.kotlin.psi.KtCallExpression
class QualifiedExpressionWithCallSelectorAccessTranslator(
private val selector: KtCallExpression,
private val receiver: JsExpression?,
private val context: TranslationContext
) : AccessTranslator {
override fun translateAsGet(): JsExpression {
return QualifiedExpressionTranslator.invokeCallExpressionTranslator(receiver, selector, context) as JsExpression
}
override fun translateAsSet(setTo: JsExpression): JsExpression {
throw IllegalStateException("Set access is not supported for " + this::class.java.simpleName)
}
override fun getCached(): AccessTranslator {
throw IllegalStateException("Cashed access is not supported for " + this::class.java.simpleName)
}
}
@@ -31,11 +31,10 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall;
import java.io.*;
import java.nio.charset.Charset;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.function.Supplier;
public final class PsiUtils {
@@ -71,13 +70,6 @@ public final class PsiUtils {
return selectorExpression;
}
@NotNull
public static KtSimpleNameExpression getNotNullSimpleNameSelector(@NotNull KtQualifiedExpression expression) {
KtSimpleNameExpression selectorAsSimpleName = getSelectorAsSimpleName(expression);
assert selectorAsSimpleName != null;
return selectorAsSimpleName;
}
@NotNull
public static KtToken getOperationToken(@NotNull KtOperationExpression expression) {
KtSimpleNameExpression operationExpression = expression.getOperationReference();