[JS IR BE] Update test data

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java

@@ -2066,6 +2066,11 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/compareToIntrinsicWithSideEffect.kt");
             }
 
+            @TestMetadata("concatWithTerminator.kt")
+            public void testConcatWithTerminator() throws Exception {
+                runTest("js/js.translator/testData/box/expression/evaluationOrder/concatWithTerminator.kt");
+            }
+
             @TestMetadata("dangerousInline.kt")
             public void testDangerousInline() throws Exception {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt");
@@ -2076,6 +2081,16 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt");
             }
 
+            @TestMetadata("deepExpression.kt")
+            public void testDeepExpression() throws Exception {
+                runTest("js/js.translator/testData/box/expression/evaluationOrder/deepExpression.kt");
+            }
+
+            @TestMetadata("delegationCtorWithExpression.kt")
+            public void testDelegationCtorWithExpression() throws Exception {
+                runTest("js/js.translator/testData/box/expression/evaluationOrder/delegationCtorWithExpression.kt");
+            }
+
             @TestMetadata("elvisComplex.kt")
             public void testElvisComplex() throws Exception {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/elvisComplex.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/IrBoxJsTestGenerated.java

@@ -2066,6 +2066,11 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/compareToIntrinsicWithSideEffect.kt");
             }
 
+            @TestMetadata("concatWithTerminator.kt")
+            public void testConcatWithTerminator() throws Exception {
+                runTest("js/js.translator/testData/box/expression/evaluationOrder/concatWithTerminator.kt");
+            }
+
             @TestMetadata("dangerousInline.kt")
             public void testDangerousInline() throws Exception {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt");
@@ -2076,6 +2081,16 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt");
             }
 
+            @TestMetadata("deepExpression.kt")
+            public void testDeepExpression() throws Exception {
+                runTest("js/js.translator/testData/box/expression/evaluationOrder/deepExpression.kt");
+            }
+
+            @TestMetadata("delegationCtorWithExpression.kt")
+            public void testDelegationCtorWithExpression() throws Exception {
+                runTest("js/js.translator/testData/box/expression/evaluationOrder/delegationCtorWithExpression.kt");
+            }
+
             @TestMetadata("elvisComplex.kt")
             public void testElvisComplex() throws Exception {
                 runTest("js/js.translator/testData/box/expression/evaluationOrder/elvisComplex.kt");

js/js.translator/testData/box/closure/closureLocalLiteralFunction.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1114
 package foo
 

js/js.translator/testData/box/coercion/unitSafeCall.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 class C {
     fun foo() {}

js/js.translator/testData/box/expression/evaluationOrder/2dangerousInExpression.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1109
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/andAndWithBreakContinueReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1117
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/callWithBreakContinueReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1115
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/concatWithTerminator.kt

@@ -0,0 +1,6 @@
+// EXPECTED_REACHABLE_NODES: 1110
+package foo
+
+fun box(): String {
+    return "Fail${return "OK"}${return "Fail2"}"
+}

js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1109
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/deepExpression.kt

@@ -0,0 +1,55 @@
+// EXPECTED_REACHABLE_NODES: 1124
+package foo
+
+var global = ""
+
+fun bar(s: String) {
+    global += s
+}
+
+fun foo(s: String):String {
+    return s + "F"
+}
+
+open class A(val s: String) {
+    fun me():A  { global += s; return this }
+    open val f = "A"
+}
+
+class B(s: String) : A(s) {
+    override val f = "B"
+}
+
+fun test(b1: Boolean, b2: Boolean): String {
+    global = ""
+    bar(foo("G") + foo((if (b1) {
+        bar("then1")
+        (if (b2) {
+            bar("then2")
+            A("X")
+        } else {
+            bar("else2")
+            B("Y")
+        }).me()
+    } else {
+        bar("else1")
+        (if (b2) {
+            bar("then3")
+            B("M")
+        } else {
+            bar("else3")
+            A("N")
+        }).me()
+    }).f) + foo("S"))
+
+    return global
+}
+
+fun box(): String {
+
+    assertEquals(test(false, false), "else1else3NGFAFSF")
+    assertEquals(test(false, true), "else1then3MGFBFSF")
+    assertEquals(test(true, false), "then1else2YGFBFSF")
+    assertEquals(test(true, true), "then1then2XGFAFSF")
+    return "OK"
+}

js/js.translator/testData/box/expression/evaluationOrder/delegationCtorWithExpression.kt

@@ -0,0 +1,50 @@
+// EXPECTED_REACHABLE_NODES: 1124
+package foo
+
+var c: String = "fail3"
+var d: String = "fail4"
+var e: String = "fail5"
+var f: String = "fail6"
+
+fun cSet(s: String) { c = s }
+fun dSet(s: String) { d = s }
+fun eSet(s: String, b: Boolean): Boolean { e = s; return b }
+fun fSet(s: String, b: Boolean): Boolean { f = s; return b }
+
+open class Base(val a: String, val b: String) {
+    fun foo() = (a + b + c + d + e + f)
+}
+
+
+class Derived(a1: String, a2: String, b1: String, b2: String, cond: Boolean) : Base(
+    if (eSet("E_OK;", cond)) {
+        cSet("C_THEN;")
+        a1
+    } else {
+        cSet("C_ELSE;")
+        a2
+    },
+    if (fSet("F_OK;", !cond)) {
+        dSet("D_THEN;")
+        b1
+    } else {
+        dSet("D_ELSE;")
+        b2
+    }
+) {
+}
+
+fun box():String {
+    val d1 = Derived("A_OK;", "A_FAIL;", "B_FAIL;", "B_OK;", true)
+    assertEquals(d1.foo(), "A_OK;B_OK;C_THEN;D_ELSE;E_OK;F_OK;")
+
+    c = "fail1"
+    d = "fail2"
+    e = "fail3"
+    f = "fail4"
+
+    val d2 = Derived("A_FAIL;", "A_OK;", "B_OK;", "B_FAIL;", false)
+    assertEquals(d2.foo(), "A_OK;B_OK;C_ELSE;D_THEN;E_OK;F_OK;")
+
+    return "OK"
+}

js/js.translator/testData/box/expression/evaluationOrder/elvisWithBreakContinueReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1117
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder1.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1110
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/ifAsFunArgument.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1110
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/orOrWithBreakContinueReturn.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1117
 package foo
 

js/js.translator/testData/box/expression/evaluationOrder/whenAsMinusArgument.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/expression/for/forIteratesOverSomethingWithIterator.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1121
 package foo
 

js/js.translator/testData/box/expression/invoke/extensionInvoke.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1120
 package foo
 

js/js.translator/testData/box/expression/misc/KT-817.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 package foo
 

js/js.translator/testData/box/expression/misc/elvis.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1110
 package foo
 

js/js.translator/testData/box/expression/misc/exclExcl.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/expression/misc/exclExclResultIsComputedOnce.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1110
 package foo
 

js/js.translator/testData/box/expression/misc/packagePropertyCalledAsFun.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1111
 package foo
 

js/js.translator/testData/box/expression/misc/safeCallComputesExpressionOnlyOnce.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 package foo
 

js/js.translator/testData/box/expression/misc/whenReturnedWithoutBlock.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1109
 package foo
 

js/js.translator/testData/box/expression/when/whenAsExpression.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/expression/when/whenEvaluatesArgumentOnlyOnce.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/expression/when/whenWithIf.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/expression/when/whenWithIfConditionAndOnlyElse.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1110
 package foo
 

js/js.translator/testData/box/expression/when/whileWithOneStmWhen.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/extensionFunction/extensionInsideFunctionLiteral.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1114
 package foo
 

js/js.translator/testData/box/initialize/classInitializer.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 package foo
 

js/js.translator/testData/box/inline/inlineInc.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1113
 package foo
 

js/js.translator/testData/box/inline/rootConstructor.kt

@@ -1,3 +1,4 @@
+// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 /*
  * Copy of JVM-backend test

js/js.translator/testData/box/inline/safeCall.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1113
 package foo
 

js/js.translator/testData/box/inlineEvaluationOrder/conditionalElvis.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1119
 package foo
 

js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpressionElvis.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1119
 package foo
 

js/js.translator/testData/box/inlineEvaluationOrder/nestedContinueInExtractedDoWhile.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1115
 package foo
 

js/js.translator/testData/box/inlineSizeReduction/inlineOrder.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1120
 package foo
 

js/js.translator/testData/box/inlineSizeReduction/propertyReassignment.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1117
 // CHECK_VARS_COUNT: function=test1 count=0
 // CHECK_VARS_COUNT: function=test2 count=1

js/js.translator/testData/box/nestedTypes/innerReferenceFromChild.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1124
 package foo
 

js/js.translator/testData/box/number/incDecOptimization.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1132
 // CHECK_VARS_COUNT: function=test count=1
 

js/js.translator/testData/box/operatorOverloading/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1116
 package foo
 

js/js.translator/testData/box/operatorOverloading/overloadUnaryOperationsViaExtensionFunctions.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 package foo
 

js/js.translator/testData/box/operatorOverloading/plusAssignNoReassign.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 package foo
 

js/js.translator/testData/box/operatorOverloading/unaryOnIntProperty.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1112
 package foo
 

js/js.translator/testData/box/propertyAccess/extensionLiteralSafeCall.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1111
 package foo
 

js/js.translator/testData/box/safeCall/safeAccess.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1110
 package foo
 

js/js.translator/testData/box/safeCall/safeCallAndIntrinsic.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1111
 package foo
 

js/js.translator/testData/box/safeCall/safeCallAndSideEffect.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1127
 package foo
 

js/js.translator/testData/box/safeCall/safeCallReturnsNullIfFails.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/safeCall/safeExtensionFunctionCall.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1111
 package foo
 

js/js.translator/testData/box/simple/postfixIntOperations.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1108
 package foo
 

js/js.translator/testData/box/trait/example.kt

@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JS_IR
 // EXPECTED_REACHABLE_NODES: 1116
 package foo