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

JS: deparenthesize LHS of assignment before choosing appropriate AccessTranslator. Fix KT-15169

Browse Source
This commit is contained in:
Alexey Andreev
2016-12-12 15:00:00 +03:00
parent 52347aa901
commit d9cf15a665
10 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/intrinsics/incWithLabel.kt
Vendored
-3
View File
@@ -1,6 +1,3 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
fun box(): String {
var x = 1
(foo@ x)++
compiler/testData/codegen/box/lazyCodegen/increment.kt
Vendored
-3
View File
@@ -1,6 +1,3 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
var holder = ""
var globalA: A = A(-1)
get(): A {
compiler/testData/codegen/box/operatorConventions/annotatedAssignment.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
@Target(AnnotationTarget.EXPRESSION)
annotation class Annotation
fun box(): String {
var v = 0
@Annotation v += 1 + 2
if (v != 3) return "fail1"
@Annotation v = 4
if (v != 4) return "fail2"
return "OK"
}
compiler/testData/codegen/box/properties/kt613.kt
Vendored
-3
View File
@@ -1,6 +1,3 @@
// TODO: muted automatically, investigate should it be ran for JS or not
// IGNORE_BACKEND: JS
package name
class Test() {
compiler/testData/codegen/light-analysis/operatorConventions/annotatedAssignment.txt
Vendored
+8
View File
@@ -0,0 +1,8 @@
public final class AnnotatedAssignmentKt {
public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
}
@kotlin.annotation.Target
@java.lang.annotation.Retention
@java.lang.annotation.Target
public annotation class Annotation
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+6
View File
@@ -10487,6 +10487,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("annotatedAssignment.kt")
public void testAnnotatedAssignment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/annotatedAssignment.kt");
doTest(fileName);
}
@TestMetadata("assignmentOperations.kt")
public void testAssignmentOperations() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+6
View File
@@ -10487,6 +10487,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("annotatedAssignment.kt")
public void testAnnotatedAssignment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/annotatedAssignment.kt");
doTest(fileName);
}
@TestMetadata("assignmentOperations.kt")
public void testAssignmentOperations() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeCodegenTestGenerated.java
+6
View File
@@ -10487,6 +10487,12 @@ public class LightAnalysisModeCodegenTestGenerated extends AbstractLightAnalysis
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("annotatedAssignment.kt")
public void testAnnotatedAssignment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/annotatedAssignment.kt");
doTest(fileName);
}
@TestMetadata("assignmentOperations.kt")
public void testAssignmentOperations() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+9 -21
View File
@@ -9612,13 +9612,7 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
@TestMetadata("incWithLabel.kt")
public void testIncWithLabel() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/incWithLabel.kt");
try {
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
doTest(fileName);
}
@TestMetadata("kt10131.kt")
@@ -10842,13 +10836,7 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
@TestMetadata("increment.kt")
public void testIncrement() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/lazyCodegen/increment.kt");
try {
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
doTest(fileName);
}
@TestMetadata("safeAssign.kt")
@@ -12354,6 +12342,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true);
}
@TestMetadata("annotatedAssignment.kt")
public void testAnnotatedAssignment() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/annotatedAssignment.kt");
doTest(fileName);
}
@TestMetadata("assignmentOperations.kt")
public void testAssignmentOperations() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
@@ -13641,13 +13635,7 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
@TestMetadata("kt613.kt")
public void testKt613() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt613.kt");
try {
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
doTest(fileName);
}
@TestMetadata("kt8928.kt")
js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AccessTranslationUtils.java
+4 -6
View File
@@ -30,16 +30,15 @@ public final class AccessTranslationUtils {
}
@NotNull
public static AccessTranslator getAccessTranslator(@NotNull KtExpression referenceExpression,
@NotNull TranslationContext context) {
public static AccessTranslator getAccessTranslator(@NotNull KtExpression referenceExpression, @NotNull TranslationContext context) {
return getAccessTranslator(referenceExpression, context, false);
}
@NotNull
public static AccessTranslator getAccessTranslator(@NotNull KtExpression referenceExpression,
@NotNull TranslationContext context, boolean forceOrderOfEvaluation) {
assert ((referenceExpression instanceof KtReferenceExpression) ||
(referenceExpression instanceof KtQualifiedExpression));
referenceExpression = KtPsiUtil.deparenthesize(referenceExpression);
assert referenceExpression != null;
if (referenceExpression instanceof KtQualifiedExpression) {
return QualifiedExpressionTranslator.getAccessTranslator((KtQualifiedExpression) referenceExpression, context, forceOrderOfEvaluation);
}
@@ -75,8 +74,7 @@ public final class AccessTranslationUtils {
}
@NotNull
public static JsExpression translateAsGet(@NotNull KtExpression expression,
@NotNull TranslationContext context) {
public static JsExpression translateAsGet(@NotNull KtExpression expression, @NotNull TranslationContext context) {
return (getAccessTranslator(expression, context)).translateAsGet();
}
}