fixed testdata
diff --git a/js/js.translator/testData/box/annotation/annotationClass.kt b/js/js.translator/testData/box/annotation/annotationClass.kt
index cf28684..2422f30 100644
--- a/js/js.translator/testData/box/annotation/annotationClass.kt
+++ b/js/js.translator/testData/box/annotation/annotationClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
annotation class bar
diff --git a/js/js.translator/testData/box/callableReference/function/abstractClassMember.kt b/js/js.translator/testData/box/callableReference/function/abstractClassMember.kt
index 84a8271..2fde182 100644
--- a/js/js.translator/testData/box/callableReference/function/abstractClassMember.kt
+++ b/js/js.translator/testData/box/callableReference/function/abstractClassMember.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1385
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberAndExtension.kt b/js/js.translator/testData/box/callableReference/function/classMemberAndExtension.kt
index 21342f7..9ab5907 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberAndExtension.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberAndExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A {
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberAndNonExtensionCompatibility.kt b/js/js.translator/testData/box/callableReference/function/classMemberAndNonExtensionCompatibility.kt
index 325390a..62b34f0 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberAndNonExtensionCompatibility.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberAndNonExtensionCompatibility.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun run(a: A, arg: String, funRef:(A, String) -> String): String {
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberFromClass.kt b/js/js.translator/testData/box/callableReference/function/classMemberFromClass.kt
index bb5badd..9d1aed4 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberFromClass.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberFromClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberFromExtension.kt b/js/js.translator/testData/box/callableReference/function/classMemberFromExtension.kt
index e5461a7..fce8409 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberFromExtension.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberFromExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
index 3b0e179..d622a36 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringNoArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
index 85e6ad2..489d51f 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
index 4719de0..a27d59c3 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
index c3fae14..ef170df 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/classMemberOverridden.kt b/js/js.translator/testData/box/callableReference/function/classMemberOverridden.kt
index 0e36584..648c010 100644
--- a/js/js.translator/testData/box/callableReference/function/classMemberOverridden.kt
+++ b/js/js.translator/testData/box/callableReference/function/classMemberOverridden.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1385
package foo
open class A {
diff --git a/js/js.translator/testData/box/callableReference/function/closureWithSideEffect.kt b/js/js.translator/testData/box/callableReference/function/closureWithSideEffect.kt
index 6b2cf53..fca0d73 100644
--- a/js/js.translator/testData/box/callableReference/function/closureWithSideEffect.kt
+++ b/js/js.translator/testData/box/callableReference/function/closureWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1375
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelNoArgs.kt b/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelNoArgs.kt
index b46e767..a7060ca5 100644
--- a/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelNoArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelNoArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1376
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelOneStringArg.kt b/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelOneStringArg.kt
index 9fb59e6..7e4835e 100644
--- a/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelOneStringArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/constructorFromTopLevelOneStringArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1376
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/constructorsWithArgs.kt b/js/js.translator/testData/box/callableReference/function/constructorsWithArgs.kt
index 3a6ec56..625c5b3 100644
--- a/js/js.translator/testData/box/callableReference/function/constructorsWithArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/constructorsWithArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A(val x:Int) {
diff --git a/js/js.translator/testData/box/callableReference/function/extension.kt b/js/js.translator/testData/box/callableReference/function/extension.kt
index 85f1220..bf80f34 100644
--- a/js/js.translator/testData/box/callableReference/function/extension.kt
+++ b/js/js.translator/testData/box/callableReference/function/extension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromClass.kt b/js/js.translator/testData/box/callableReference/function/extensionFromClass.kt
index 15bc760..79f7b60 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromClass.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromExtension.kt b/js/js.translator/testData/box/callableReference/function/extensionFromExtension.kt
index a3ade63..dfeb9ae6 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromExtension.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevel.kt b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevel.kt
index d05e2de..95f2b37 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevel.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevel.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt
index 7653526..ce2e8f2 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringNoArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
index 9435bdd..617ddb4 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelStringOneStringArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
index 48bbeed..6f4c24a 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitNoArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
index b00389f..ab5f080 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionToPrimitive.kt b/js/js.translator/testData/box/callableReference/function/extensionToPrimitive.kt
index 939586f..ea48716 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionToPrimitive.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionToPrimitive.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1375
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/extensionWithClosure.kt b/js/js.translator/testData/box/callableReference/function/extensionWithClosure.kt
index ca6bc5d..5164f64 100644
--- a/js/js.translator/testData/box/callableReference/function/extensionWithClosure.kt
+++ b/js/js.translator/testData/box/callableReference/function/extensionWithClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/localAndTopLevelExtensions.kt b/js/js.translator/testData/box/callableReference/function/localAndTopLevelExtensions.kt
index 4c556e1..92ea1e4 100644
--- a/js/js.translator/testData/box/callableReference/function/localAndTopLevelExtensions.kt
+++ b/js/js.translator/testData/box/callableReference/function/localAndTopLevelExtensions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun Int.sum0(other: Int): Int = this + other
diff --git a/js/js.translator/testData/box/callableReference/function/localLocal.kt b/js/js.translator/testData/box/callableReference/function/localLocal.kt
index b155eaa..c75fbfc 100644
--- a/js/js.translator/testData/box/callableReference/function/localLocal.kt
+++ b/js/js.translator/testData/box/callableReference/function/localLocal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1376
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/recursiveClosure.kt b/js/js.translator/testData/box/callableReference/function/recursiveClosure.kt
index f9c4d74..81ddf31 100644
--- a/js/js.translator/testData/box/callableReference/function/recursiveClosure.kt
+++ b/js/js.translator/testData/box/callableReference/function/recursiveClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/simple.kt b/js/js.translator/testData/box/callableReference/function/simple.kt
index 0247fd7..7f76d8d 100644
--- a/js/js.translator/testData/box/callableReference/function/simple.kt
+++ b/js/js.translator/testData/box/callableReference/function/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1375
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/simpleClosure.kt b/js/js.translator/testData/box/callableReference/function/simpleClosure.kt
index b329d7f..be7bdb9 100644
--- a/js/js.translator/testData/box/callableReference/function/simpleClosure.kt
+++ b/js/js.translator/testData/box/callableReference/function/simpleClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1375
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/simpleWithArg.kt b/js/js.translator/testData/box/callableReference/function/simpleWithArg.kt
index d6daae7..c74e4f0 100644
--- a/js/js.translator/testData/box/callableReference/function/simpleWithArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/simpleWithArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1375
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/stringNativeExtension.kt b/js/js.translator/testData/box/callableReference/function/stringNativeExtension.kt
index e4727a8..fc3fb1b 100644
--- a/js/js.translator/testData/box/callableReference/function/stringNativeExtension.kt
+++ b/js/js.translator/testData/box/callableReference/function/stringNativeExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/callableReference/function/topLevelFromClass.kt b/js/js.translator/testData/box/callableReference/function/topLevelFromClass.kt
index e001171..0b7b5c9 100644
--- a/js/js.translator/testData/box/callableReference/function/topLevelFromClass.kt
+++ b/js/js.translator/testData/box/callableReference/function/topLevelFromClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/topLevelFromExtension.kt b/js/js.translator/testData/box/callableReference/function/topLevelFromExtension.kt
index 6d5ffb5..d8c6640 100644
--- a/js/js.translator/testData/box/callableReference/function/topLevelFromExtension.kt
+++ b/js/js.translator/testData/box/callableReference/function/topLevelFromExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt b/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
index 4c886e4..8999b83 100644
--- a/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
+++ b/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelStringNoArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1376
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelWithArg.kt b/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelWithArg.kt
index 2a19d6e6..c71ccd3 100644
--- a/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelWithArg.kt
+++ b/js/js.translator/testData/box/callableReference/function/topLevelFromTopLevelWithArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1377
// This test was adapted from compiler/testData/codegen/box/callableReference/function/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/function/unitWithSideEffect.kt b/js/js.translator/testData/box/callableReference/function/unitWithSideEffect.kt
index c85985e..07a647d 100644
--- a/js/js.translator/testData/box/callableReference/function/unitWithSideEffect.kt
+++ b/js/js.translator/testData/box/callableReference/function/unitWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1376
// This test was adapted from compiler/testData/codegen/box/callableReference/function/local/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/accessViaSubclass.kt b/js/js.translator/testData/box/callableReference/property/accessViaSubclass.kt
index 6a392f0..082c879 100644
--- a/js/js.translator/testData/box/callableReference/property/accessViaSubclass.kt
+++ b/js/js.translator/testData/box/callableReference/property/accessViaSubclass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/delegated.kt b/js/js.translator/testData/box/callableReference/property/delegated.kt
index 87e8bab..239269c 100644
--- a/js/js.translator/testData/box/callableReference/property/delegated.kt
+++ b/js/js.translator/testData/box/callableReference/property/delegated.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/delegatedMutable.kt b/js/js.translator/testData/box/callableReference/property/delegatedMutable.kt
index b6631e9..7f70917 100644
--- a/js/js.translator/testData/box/callableReference/property/delegatedMutable.kt
+++ b/js/js.translator/testData/box/callableReference/property/delegatedMutable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/extensionProperty.kt b/js/js.translator/testData/box/callableReference/property/extensionProperty.kt
index 087f1b5..276c797 100644
--- a/js/js.translator/testData/box/callableReference/property/extensionProperty.kt
+++ b/js/js.translator/testData/box/callableReference/property/extensionProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
package foo
import kotlin.reflect.KMutableProperty1
diff --git a/js/js.translator/testData/box/callableReference/property/kClassInstanceIsInitializedFirst.kt b/js/js.translator/testData/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
index 30473b8..67da2df 100644
--- a/js/js.translator/testData/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
+++ b/js/js.translator/testData/box/callableReference/property/kClassInstanceIsInitializedFirst.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/memberProperty.kt b/js/js.translator/testData/box/callableReference/property/memberProperty.kt
index 0298007..f3967bc 100644
--- a/js/js.translator/testData/box/callableReference/property/memberProperty.kt
+++ b/js/js.translator/testData/box/callableReference/property/memberProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
open class A(var msg:String) {
diff --git a/js/js.translator/testData/box/callableReference/property/overriddenInSubclass.kt b/js/js.translator/testData/box/callableReference/property/overriddenInSubclass.kt
index 4f4d1a5..af6c352 100644
--- a/js/js.translator/testData/box/callableReference/property/overriddenInSubclass.kt
+++ b/js/js.translator/testData/box/callableReference/property/overriddenInSubclass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/simpleExtension.kt b/js/js.translator/testData/box/callableReference/property/simpleExtension.kt
index cd43d03..cc9b01c 100644
--- a/js/js.translator/testData/box/callableReference/property/simpleExtension.kt
+++ b/js/js.translator/testData/box/callableReference/property/simpleExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/simpleMember.kt b/js/js.translator/testData/box/callableReference/property/simpleMember.kt
index 6032ae4..dcb1071 100644
--- a/js/js.translator/testData/box/callableReference/property/simpleMember.kt
+++ b/js/js.translator/testData/box/callableReference/property/simpleMember.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/simpleMutableExtension.kt b/js/js.translator/testData/box/callableReference/property/simpleMutableExtension.kt
index 9804bfd..e9441a9 100644
--- a/js/js.translator/testData/box/callableReference/property/simpleMutableExtension.kt
+++ b/js/js.translator/testData/box/callableReference/property/simpleMutableExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/simpleMutableMember.kt b/js/js.translator/testData/box/callableReference/property/simpleMutableMember.kt
index a98006e..27592a4 100644
--- a/js/js.translator/testData/box/callableReference/property/simpleMutableMember.kt
+++ b/js/js.translator/testData/box/callableReference/property/simpleMutableMember.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/simpleMutableTopLevel.kt b/js/js.translator/testData/box/callableReference/property/simpleMutableTopLevel.kt
index ff68680..b208f29 100644
--- a/js/js.translator/testData/box/callableReference/property/simpleMutableTopLevel.kt
+++ b/js/js.translator/testData/box/callableReference/property/simpleMutableTopLevel.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/simpleTopLevel.kt b/js/js.translator/testData/box/callableReference/property/simpleTopLevel.kt
index 101a806..e83f4ba 100644
--- a/js/js.translator/testData/box/callableReference/property/simpleTopLevel.kt
+++ b/js/js.translator/testData/box/callableReference/property/simpleTopLevel.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// This test was adapted from compiler/testData/codegen/box/callableReference/property/.
package foo
diff --git a/js/js.translator/testData/box/callableReference/property/topLevelVar.kt b/js/js.translator/testData/box/callableReference/property/topLevelVar.kt
index bdbb1c8..3075cd0 100644
--- a/js/js.translator/testData/box/callableReference/property/topLevelVar.kt
+++ b/js/js.translator/testData/box/callableReference/property/topLevelVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
var x = 1
diff --git a/js/js.translator/testData/box/char/charBinaryOperations.kt b/js/js.translator/testData/box/char/charBinaryOperations.kt
index 7ddf9b3..2b89327 100644
--- a/js/js.translator/testData/box/char/charBinaryOperations.kt
+++ b/js/js.translator/testData/box/char/charBinaryOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/char/charCompareToIntrinsic.kt b/js/js.translator/testData/box/char/charCompareToIntrinsic.kt
index 946ac30..ef3976d 100644
--- a/js/js.translator/testData/box/char/charCompareToIntrinsic.kt
+++ b/js/js.translator/testData/box/char/charCompareToIntrinsic.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/char/charConstantByUnicodeId.kt b/js/js.translator/testData/box/char/charConstantByUnicodeId.kt
index 606bf6b..134999f 100644
--- a/js/js.translator/testData/box/char/charConstantByUnicodeId.kt
+++ b/js/js.translator/testData/box/char/charConstantByUnicodeId.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 942
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/char/charConversions.kt b/js/js.translator/testData/box/char/charConversions.kt
index ac23539..567131d 100644
--- a/js/js.translator/testData/box/char/charConversions.kt
+++ b/js/js.translator/testData/box/char/charConversions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/char/charElvis.kt b/js/js.translator/testData/box/char/charElvis.kt
index 6169632..acc36dd 100644
--- a/js/js.translator/testData/box/char/charElvis.kt
+++ b/js/js.translator/testData/box/char/charElvis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/char/charEquals.kt b/js/js.translator/testData/box/char/charEquals.kt
index 7ea7ca5..3e5d6f3 100644
--- a/js/js.translator/testData/box/char/charEquals.kt
+++ b/js/js.translator/testData/box/char/charEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A
diff --git a/js/js.translator/testData/box/char/charInStringTemplate.kt b/js/js.translator/testData/box/char/charInStringTemplate.kt
index 398dd78..b098a10 100644
--- a/js/js.translator/testData/box/char/charInStringTemplate.kt
+++ b/js/js.translator/testData/box/char/charInStringTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var log = ""
diff --git a/js/js.translator/testData/box/char/charIsCheck.kt b/js/js.translator/testData/box/char/charIsCheck.kt
index 56562d9..f8cb36b 100644
--- a/js/js.translator/testData/box/char/charIsCheck.kt
+++ b/js/js.translator/testData/box/char/charIsCheck.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class A
diff --git a/js/js.translator/testData/box/char/charRanges.kt b/js/js.translator/testData/box/char/charRanges.kt
index 6871d9b..143b0265 100644
--- a/js/js.translator/testData/box/char/charRanges.kt
+++ b/js/js.translator/testData/box/char/charRanges.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 539
+// EXPECTED_REACHABLE_NODES: 1418
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/char/charUnaryOperations.kt b/js/js.translator/testData/box/char/charUnaryOperations.kt
index 4290e80..f96f90b 100644
--- a/js/js.translator/testData/box/char/charUnaryOperations.kt
+++ b/js/js.translator/testData/box/char/charUnaryOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/classObject/accessing.kt b/js/js.translator/testData/box/classObject/accessing.kt
index f5fad1a..63a7c12 100644
--- a/js/js.translator/testData/box/classObject/accessing.kt
+++ b/js/js.translator/testData/box/classObject/accessing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
// KT-4130 object fields are not evaluated correctly
package foo
diff --git a/js/js.translator/testData/box/classObject/defaultObjectSameNamesAsInOuter.kt b/js/js.translator/testData/box/classObject/defaultObjectSameNamesAsInOuter.kt
index 77c664e..cd2d165 100644
--- a/js/js.translator/testData/box/classObject/defaultObjectSameNamesAsInOuter.kt
+++ b/js/js.translator/testData/box/classObject/defaultObjectSameNamesAsInOuter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
class A {
diff --git a/js/js.translator/testData/box/classObject/enumCompanionObject.kt b/js/js.translator/testData/box/classObject/enumCompanionObject.kt
index 2ffb275..60a4677 100644
--- a/js/js.translator/testData/box/classObject/enumCompanionObject.kt
+++ b/js/js.translator/testData/box/classObject/enumCompanionObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 524
+// EXPECTED_REACHABLE_NODES: 1391
// See KT-6326, KT-6777
package foo
diff --git a/js/js.translator/testData/box/classObject/inTrait.kt b/js/js.translator/testData/box/classObject/inTrait.kt
index 0fd682a..b792d0a 100644
--- a/js/js.translator/testData/box/classObject/inTrait.kt
+++ b/js/js.translator/testData/box/classObject/inTrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
interface A {
diff --git a/js/js.translator/testData/box/classObject/invokeOperatorInCompanionObject.kt b/js/js.translator/testData/box/classObject/invokeOperatorInCompanionObject.kt
index a0ea233..61e1e4d 100644
--- a/js/js.translator/testData/box/classObject/invokeOperatorInCompanionObject.kt
+++ b/js/js.translator/testData/box/classObject/invokeOperatorInCompanionObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// See KT-11100
package foo
diff --git a/js/js.translator/testData/box/classObject/namedClassObject.kt b/js/js.translator/testData/box/classObject/namedClassObject.kt
index bb1b54f..f40821b 100644
--- a/js/js.translator/testData/box/classObject/namedClassObject.kt
+++ b/js/js.translator/testData/box/classObject/namedClassObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
interface Named {
diff --git a/js/js.translator/testData/box/classObject/objectInCompanionObject.kt b/js/js.translator/testData/box/classObject/objectInCompanionObject.kt
index 431c9f7..1510297 100644
--- a/js/js.translator/testData/box/classObject/objectInCompanionObject.kt
+++ b/js/js.translator/testData/box/classObject/objectInCompanionObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 513
+// EXPECTED_REACHABLE_NODES: 1400
// See KT-6203
package foo
diff --git a/js/js.translator/testData/box/classObject/setVar.kt b/js/js.translator/testData/box/classObject/setVar.kt
index 1d014d2..f361911 100644
--- a/js/js.translator/testData/box/classObject/setVar.kt
+++ b/js/js.translator/testData/box/classObject/setVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A {
diff --git a/js/js.translator/testData/box/classObject/simple.kt b/js/js.translator/testData/box/classObject/simple.kt
index 39d5f5f..c776a51 100644
--- a/js/js.translator/testData/box/classObject/simple.kt
+++ b/js/js.translator/testData/box/classObject/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A {
diff --git a/js/js.translator/testData/box/classObject/withInheritance.kt b/js/js.translator/testData/box/classObject/withInheritance.kt
index c8273af..1a7277e 100644
--- a/js/js.translator/testData/box/classObject/withInheritance.kt
+++ b/js/js.translator/testData/box/classObject/withInheritance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
open class A {
diff --git a/js/js.translator/testData/box/closure/closureArrayListInstance.kt b/js/js.translator/testData/box/closure/closureArrayListInstance.kt
index 689d53f..be92749 100644
--- a/js/js.translator/testData/box/closure/closureArrayListInstance.kt
+++ b/js/js.translator/testData/box/closure/closureArrayListInstance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/closure/closureFunctionAsArgument.kt b/js/js.translator/testData/box/closure/closureFunctionAsArgument.kt
index 905aa93..f94d8b0 100644
--- a/js/js.translator/testData/box/closure/closureFunctionAsArgument.kt
+++ b/js/js.translator/testData/box/closure/closureFunctionAsArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun test(f: () -> String): String {
diff --git a/js/js.translator/testData/box/closure/closureFunctionByInnerFunction.kt b/js/js.translator/testData/box/closure/closureFunctionByInnerFunction.kt
index 6c1ddd1..7c04a7d 100644
--- a/js/js.translator/testData/box/closure/closureFunctionByInnerFunction.kt
+++ b/js/js.translator/testData/box/closure/closureFunctionByInnerFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
val r = "OK"
diff --git a/js/js.translator/testData/box/closure/closureGenericTypeValue.kt b/js/js.translator/testData/box/closure/closureGenericTypeValue.kt
index d1a2477..4335127 100644
--- a/js/js.translator/testData/box/closure/closureGenericTypeValue.kt
+++ b/js/js.translator/testData/box/closure/closureGenericTypeValue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
class A<T>(val a: T) {
diff --git a/js/js.translator/testData/box/closure/closureInFewFunctionWithDifferentName.kt b/js/js.translator/testData/box/closure/closureInFewFunctionWithDifferentName.kt
index b954fe3..60abf0a 100644
--- a/js/js.translator/testData/box/closure/closureInFewFunctionWithDifferentName.kt
+++ b/js/js.translator/testData/box/closure/closureInFewFunctionWithDifferentName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/closure/closureInNestedFunctions.kt b/js/js.translator/testData/box/closure/closureInNestedFunctions.kt
index 841bc6d..244da80 100644
--- a/js/js.translator/testData/box/closure/closureInNestedFunctions.kt
+++ b/js/js.translator/testData/box/closure/closureInNestedFunctions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
fun funfun(): Boolean {
diff --git a/js/js.translator/testData/box/closure/closureInNestedFunctionsInMethod.kt b/js/js.translator/testData/box/closure/closureInNestedFunctionsInMethod.kt
index 0be5ae4..fb0bc99 100644
--- a/js/js.translator/testData/box/closure/closureInNestedFunctionsInMethod.kt
+++ b/js/js.translator/testData/box/closure/closureInNestedFunctionsInMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
package foo
class A {
diff --git a/js/js.translator/testData/box/closure/closureInNestedFunctionsWhichMixedWithObject.kt b/js/js.translator/testData/box/closure/closureInNestedFunctionsWhichMixedWithObject.kt
index 6fe3f72..889656c 100644
--- a/js/js.translator/testData/box/closure/closureInNestedFunctionsWhichMixedWithObject.kt
+++ b/js/js.translator/testData/box/closure/closureInNestedFunctionsWhichMixedWithObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/closure/closureInNestedLambdasInObject.kt b/js/js.translator/testData/box/closure/closureInNestedLambdasInObject.kt
index 4606955..05b96034 100644
--- a/js/js.translator/testData/box/closure/closureInNestedLambdasInObject.kt
+++ b/js/js.translator/testData/box/closure/closureInNestedLambdasInObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1381
// KT-4218 Nested function literal on singleton object fails
package foo
diff --git a/js/js.translator/testData/box/closure/closureInObject.kt b/js/js.translator/testData/box/closure/closureInObject.kt
index 73627f6..446a77c 100644
--- a/js/js.translator/testData/box/closure/closureInObject.kt
+++ b/js/js.translator/testData/box/closure/closureInObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
object A {
diff --git a/js/js.translator/testData/box/closure/closureInWithInsideWith.kt b/js/js.translator/testData/box/closure/closureInWithInsideWith.kt
index 343a92f..5e8a4f4 100644
--- a/js/js.translator/testData/box/closure/closureInWithInsideWith.kt
+++ b/js/js.translator/testData/box/closure/closureInWithInsideWith.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// KT-4237 With in with
package foo
diff --git a/js/js.translator/testData/box/closure/closureLambdaVarInLambda.kt b/js/js.translator/testData/box/closure/closureLambdaVarInLambda.kt
index 57cf59f..730466b 100644
--- a/js/js.translator/testData/box/closure/closureLambdaVarInLambda.kt
+++ b/js/js.translator/testData/box/closure/closureLambdaVarInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// KT-4263 Wrong capturing a function literal variable
package foo
diff --git a/js/js.translator/testData/box/closure/closureLocalFunction.kt b/js/js.translator/testData/box/closure/closureLocalFunction.kt
index d64b18c..42f14ab 100644
--- a/js/js.translator/testData/box/closure/closureLocalFunction.kt
+++ b/js/js.translator/testData/box/closure/closureLocalFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun test(): String {
diff --git a/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunction.kt b/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunction.kt
index eeb49a2..3a852cd 100644
--- a/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunction.kt
+++ b/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunctionInConstructor.kt b/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunctionInConstructor.kt
index eee3ef8..da93b4e 100644
--- a/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunctionInConstructor.kt
+++ b/js/js.translator/testData/box/closure/closureLocalFunctionByInnerFunctionInConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Foo {
diff --git a/js/js.translator/testData/box/closure/closureLocalInNestedObject.kt b/js/js.translator/testData/box/closure/closureLocalInNestedObject.kt
index 8c4555d..227c78e 100644
--- a/js/js.translator/testData/box/closure/closureLocalInNestedObject.kt
+++ b/js/js.translator/testData/box/closure/closureLocalInNestedObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/closure/closureLocalLiteralFunction.kt b/js/js.translator/testData/box/closure/closureLocalLiteralFunction.kt
index 461a5e1..0a4b78c2 100644
--- a/js/js.translator/testData/box/closure/closureLocalLiteralFunction.kt
+++ b/js/js.translator/testData/box/closure/closureLocalLiteralFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1380
package foo
val k = { "K" }
diff --git a/js/js.translator/testData/box/closure/closureReceiverInLocalExtFunByLocalExtFun.kt b/js/js.translator/testData/box/closure/closureReceiverInLocalExtFunByLocalExtFun.kt
index 1836c9d3..7530f06 100644
--- a/js/js.translator/testData/box/closure/closureReceiverInLocalExtFunByLocalExtFun.kt
+++ b/js/js.translator/testData/box/closure/closureReceiverInLocalExtFunByLocalExtFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
// workaround for Rhino
diff --git a/js/js.translator/testData/box/closure/closureReferencingMember.kt b/js/js.translator/testData/box/closure/closureReferencingMember.kt
index 1bfb034..afb3891 100644
--- a/js/js.translator/testData/box/closure/closureReferencingMember.kt
+++ b/js/js.translator/testData/box/closure/closureReferencingMember.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
class A() {
diff --git a/js/js.translator/testData/box/closure/closureThisAndClassObject.kt b/js/js.translator/testData/box/closure/closureThisAndClassObject.kt
index af30e40..805c19f 100644
--- a/js/js.translator/testData/box/closure/closureThisAndClassObject.kt
+++ b/js/js.translator/testData/box/closure/closureThisAndClassObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
class A {
diff --git a/js/js.translator/testData/box/closure/closureThisAndReceiver.kt b/js/js.translator/testData/box/closure/closureThisAndReceiver.kt
index 917679b..473ea9e 100644
--- a/js/js.translator/testData/box/closure/closureThisAndReceiver.kt
+++ b/js/js.translator/testData/box/closure/closureThisAndReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
class A(val a: String) {
diff --git a/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt b/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt
index 8a91dee..53d98cc 100644
--- a/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt
+++ b/js/js.translator/testData/box/closure/closureThisByUsingMethodFromParentClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
package foo
open class A {
diff --git a/js/js.translator/testData/box/closure/closureThisInConstructor.kt b/js/js.translator/testData/box/closure/closureThisInConstructor.kt
index 55b8a03..3757c7d 100644
--- a/js/js.translator/testData/box/closure/closureThisInConstructor.kt
+++ b/js/js.translator/testData/box/closure/closureThisInConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
// KT-2388
package foo
diff --git a/js/js.translator/testData/box/closure/closureThisInExtLambdaInsideMethod.kt b/js/js.translator/testData/box/closure/closureThisInExtLambdaInsideMethod.kt
index b6f4cb5..898fde5 100644
--- a/js/js.translator/testData/box/closure/closureThisInExtLambdaInsideMethod.kt
+++ b/js/js.translator/testData/box/closure/closureThisInExtLambdaInsideMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// KT-4600 Generated wrong code when capturing `this` in extension function inside a method
package foo
diff --git a/js/js.translator/testData/box/closure/closureThisInFunctionWhichNamedSameAsParentClass.kt b/js/js.translator/testData/box/closure/closureThisInFunctionWhichNamedSameAsParentClass.kt
index b7a42ef..5a2f6cb 100644
--- a/js/js.translator/testData/box/closure/closureThisInFunctionWhichNamedSameAsParentClass.kt
+++ b/js/js.translator/testData/box/closure/closureThisInFunctionWhichNamedSameAsParentClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class B(val b: String)
diff --git a/js/js.translator/testData/box/closure/closureThisInLambdaInsideMethod.kt b/js/js.translator/testData/box/closure/closureThisInLambdaInsideMethod.kt
index 1ee76bf..18af37a 100644
--- a/js/js.translator/testData/box/closure/closureThisInLambdaInsideMethod.kt
+++ b/js/js.translator/testData/box/closure/closureThisInLambdaInsideMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// KT-4207 Closure this doesn't work in JS backend
package foo
diff --git a/js/js.translator/testData/box/closure/closureThisInLambdaInsideObject.kt b/js/js.translator/testData/box/closure/closureThisInLambdaInsideObject.kt
index b149440..5c70f54 100644
--- a/js/js.translator/testData/box/closure/closureThisInLambdaInsideObject.kt
+++ b/js/js.translator/testData/box/closure/closureThisInLambdaInsideObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
object A {
diff --git a/js/js.translator/testData/box/closure/closureThisInLocalFunction.kt b/js/js.translator/testData/box/closure/closureThisInLocalFunction.kt
index be60b98..69d3e58 100644
--- a/js/js.translator/testData/box/closure/closureThisInLocalFunction.kt
+++ b/js/js.translator/testData/box/closure/closureThisInLocalFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class Foo {
diff --git a/js/js.translator/testData/box/closure/closureValToScopeWithSameNameDeclaration.kt b/js/js.translator/testData/box/closure/closureValToScopeWithSameNameDeclaration.kt
index 48b0c0e..0385616 100644
--- a/js/js.translator/testData/box/closure/closureValToScopeWithSameNameDeclaration.kt
+++ b/js/js.translator/testData/box/closure/closureValToScopeWithSameNameDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
val f = true
diff --git a/js/js.translator/testData/box/closure/closureVarToScopeWithSameNameDeclaration.kt b/js/js.translator/testData/box/closure/closureVarToScopeWithSameNameDeclaration.kt
index c1a4cbe..f69c381 100644
--- a/js/js.translator/testData/box/closure/closureVarToScopeWithSameNameDeclaration.kt
+++ b/js/js.translator/testData/box/closure/closureVarToScopeWithSameNameDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
val f = true
diff --git a/js/js.translator/testData/box/closure/deepInnerClassInLocalClass.kt b/js/js.translator/testData/box/closure/deepInnerClassInLocalClass.kt
index 87ce1e8..e573ad0 100644
--- a/js/js.translator/testData/box/closure/deepInnerClassInLocalClass.kt
+++ b/js/js.translator/testData/box/closure/deepInnerClassInLocalClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 515
+// EXPECTED_REACHABLE_NODES: 1401
package foo
class A() {
diff --git a/js/js.translator/testData/box/closure/deepInnerClassInLocalClassFromExtension.kt b/js/js.translator/testData/box/closure/deepInnerClassInLocalClassFromExtension.kt
index dc64105..1655836 100644
--- a/js/js.translator/testData/box/closure/deepInnerClassInLocalClassFromExtension.kt
+++ b/js/js.translator/testData/box/closure/deepInnerClassInLocalClassFromExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 512
+// EXPECTED_REACHABLE_NODES: 1399
package foo
class A() {
diff --git a/js/js.translator/testData/box/closure/enclosingClassFromInnerLocalClass.kt b/js/js.translator/testData/box/closure/enclosingClassFromInnerLocalClass.kt
index 937d43e..821cf43 100644
--- a/js/js.translator/testData/box/closure/enclosingClassFromInnerLocalClass.kt
+++ b/js/js.translator/testData/box/closure/enclosingClassFromInnerLocalClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 519
+// EXPECTED_REACHABLE_NODES: 1406
package foo
open class X(private val x: String) {
diff --git a/js/js.translator/testData/box/closure/enclosingClassFromLocalClass.kt b/js/js.translator/testData/box/closure/enclosingClassFromLocalClass.kt
index e393fe7..4015ace 100644
--- a/js/js.translator/testData/box/closure/enclosingClassFromLocalClass.kt
+++ b/js/js.translator/testData/box/closure/enclosingClassFromLocalClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 531
+// EXPECTED_REACHABLE_NODES: 1418
package foo
open class A(private val x: String) {
diff --git a/js/js.translator/testData/box/closure/implicitGenericReceiverInExtensionInLocalClass.kt b/js/js.translator/testData/box/closure/implicitGenericReceiverInExtensionInLocalClass.kt
index e74969f..594d3af 100644
--- a/js/js.translator/testData/box/closure/implicitGenericReceiverInExtensionInLocalClass.kt
+++ b/js/js.translator/testData/box/closure/implicitGenericReceiverInExtensionInLocalClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class A {
diff --git a/js/js.translator/testData/box/closure/iteratingCallbacks.kt b/js/js.translator/testData/box/closure/iteratingCallbacks.kt
index 57a0787..6092994 100644
--- a/js/js.translator/testData/box/closure/iteratingCallbacks.kt
+++ b/js/js.translator/testData/box/closure/iteratingCallbacks.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 891
+// EXPECTED_REACHABLE_NODES: 1376
package foo
diff --git a/js/js.translator/testData/box/closure/lambdaInLocalFun.kt b/js/js.translator/testData/box/closure/lambdaInLocalFun.kt
index ec83849..51950d3 100644
--- a/js/js.translator/testData/box/closure/lambdaInLocalFun.kt
+++ b/js/js.translator/testData/box/closure/lambdaInLocalFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/closure/localConstructorAndMethod.kt b/js/js.translator/testData/box/closure/localConstructorAndMethod.kt
index 79cf0f7..5ca7b86 100644
--- a/js/js.translator/testData/box/closure/localConstructorAndMethod.kt
+++ b/js/js.translator/testData/box/closure/localConstructorAndMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
interface B {
diff --git a/js/js.translator/testData/box/closure/localParameterInCallback.kt b/js/js.translator/testData/box/closure/localParameterInCallback.kt
index 7a3d921..17b32e3 100644
--- a/js/js.translator/testData/box/closure/localParameterInCallback.kt
+++ b/js/js.translator/testData/box/closure/localParameterInCallback.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 891
+// EXPECTED_REACHABLE_NODES: 1376
package foo
diff --git a/js/js.translator/testData/box/closure/objectWithInvokeOperator.kt b/js/js.translator/testData/box/closure/objectWithInvokeOperator.kt
index ecd334a..4d58343 100644
--- a/js/js.translator/testData/box/closure/objectWithInvokeOperator.kt
+++ b/js/js.translator/testData/box/closure/objectWithInvokeOperator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 536
+// EXPECTED_REACHABLE_NODES: 1403
package foo
object O {
diff --git a/js/js.translator/testData/box/closure/recursiveExtFunction.kt b/js/js.translator/testData/box/closure/recursiveExtFunction.kt
index d3700bf..c0fb5e6 100644
--- a/js/js.translator/testData/box/closure/recursiveExtFunction.kt
+++ b/js/js.translator/testData/box/closure/recursiveExtFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
fun Int.foo(a: Int): Int {
diff --git a/js/js.translator/testData/box/closure/recursiveFunction.kt b/js/js.translator/testData/box/closure/recursiveFunction.kt
index 24944f3..48cf5b9 100644
--- a/js/js.translator/testData/box/closure/recursiveFunction.kt
+++ b/js/js.translator/testData/box/closure/recursiveFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun bar(i: Int = 0): Int = if (i == 7) i else bar(i - 1)
diff --git a/js/js.translator/testData/box/closure/recursiveFunctionWithSameNameDeclaration.kt b/js/js.translator/testData/box/closure/recursiveFunctionWithSameNameDeclaration.kt
index 853925f..7879208 100644
--- a/js/js.translator/testData/box/closure/recursiveFunctionWithSameNameDeclaration.kt
+++ b/js/js.translator/testData/box/closure/recursiveFunctionWithSameNameDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun bar(i: Int = 0): Int {
diff --git a/js/js.translator/testData/box/closure/withManyClosuresInNestedFunctionsAndObjects.kt b/js/js.translator/testData/box/closure/withManyClosuresInNestedFunctionsAndObjects.kt
index b103a74..4000681 100644
--- a/js/js.translator/testData/box/closure/withManyClosuresInNestedFunctionsAndObjects.kt
+++ b/js/js.translator/testData/box/closure/withManyClosuresInNestedFunctionsAndObjects.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/closure/wrappedVariableInExtensionFun.kt b/js/js.translator/testData/box/closure/wrappedVariableInExtensionFun.kt
index 0da7644..bd0f060 100644
--- a/js/js.translator/testData/box/closure/wrappedVariableInExtensionFun.kt
+++ b/js/js.translator/testData/box/closure/wrappedVariableInExtensionFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun Any.foo(n: Int): () -> Boolean {
diff --git a/js/js.translator/testData/box/crossModuleRef/callableObjectRef.kt b/js/js.translator/testData/box/crossModuleRef/callableObjectRef.kt
index 01c2efc..13544f7 100644
--- a/js/js.translator/testData/box/crossModuleRef/callableObjectRef.kt
+++ b/js/js.translator/testData/box/crossModuleRef/callableObjectRef.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/constructor.kt b/js/js.translator/testData/box/crossModuleRef/constructor.kt
index 252f21a..eb4b239 100644
--- a/js/js.translator/testData/box/crossModuleRef/constructor.kt
+++ b/js/js.translator/testData/box/crossModuleRef/constructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/inheritance.kt b/js/js.translator/testData/box/crossModuleRef/inheritance.kt
index ec86234..7ecd6d0 100644
--- a/js/js.translator/testData/box/crossModuleRef/inheritance.kt
+++ b/js/js.translator/testData/box/crossModuleRef/inheritance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt
index a75e2df..6ae842f 100644
--- a/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt
+++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 547
+// EXPECTED_REACHABLE_NODES: 1432
// MODULE: lib1
// FILE: lib1.js
define("lib1", [], function() {
diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt
index 76892bb..d4f7beb 100644
--- a/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt
+++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 547
+// EXPECTED_REACHABLE_NODES: 1433
// MODULE: lib-1
// FILE: lib-1.js
define("lib-1", [], function() {
diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt
index 39e871d..0c58062 100644
--- a/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt
+++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
// MODULE: lib1
// FILE: lib1.js
define("lib1", [], function() {
diff --git a/js/js.translator/testData/box/crossModuleRef/inlineModule.kt b/js/js.translator/testData/box/crossModuleRef/inlineModule.kt
index 613fb52..1470fbf 100644
--- a/js/js.translator/testData/box/crossModuleRef/inlineModule.kt
+++ b/js/js.translator/testData/box/crossModuleRef/inlineModule.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: lib1
// FILE: lib1.kt
diff --git a/js/js.translator/testData/box/crossModuleRef/inlineModuleNonIndentifier.kt b/js/js.translator/testData/box/crossModuleRef/inlineModuleNonIndentifier.kt
index 33239bd..5a29ef3 100644
--- a/js/js.translator/testData/box/crossModuleRef/inlineModuleNonIndentifier.kt
+++ b/js/js.translator/testData/box/crossModuleRef/inlineModuleNonIndentifier.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: 1
// FILE: lib1.kt
diff --git a/js/js.translator/testData/box/crossModuleRef/lambda.kt b/js/js.translator/testData/box/crossModuleRef/lambda.kt
index e7fd4b6..0199f7b 100644
--- a/js/js.translator/testData/box/crossModuleRef/lambda.kt
+++ b/js/js.translator/testData/box/crossModuleRef/lambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/object.kt b/js/js.translator/testData/box/crossModuleRef/object.kt
index 3dd13de..c3d2fde 100644
--- a/js/js.translator/testData/box/crossModuleRef/object.kt
+++ b/js/js.translator/testData/box/crossModuleRef/object.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/objectInInlineClosure.kt b/js/js.translator/testData/box/crossModuleRef/objectInInlineClosure.kt
index 7a9c077..f8ea91d 100644
--- a/js/js.translator/testData/box/crossModuleRef/objectInInlineClosure.kt
+++ b/js/js.translator/testData/box/crossModuleRef/objectInInlineClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/objectIsObject.kt b/js/js.translator/testData/box/crossModuleRef/objectIsObject.kt
index 3f1acb4..75fb990 100644
--- a/js/js.translator/testData/box/crossModuleRef/objectIsObject.kt
+++ b/js/js.translator/testData/box/crossModuleRef/objectIsObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/topLevelExtension.kt b/js/js.translator/testData/box/crossModuleRef/topLevelExtension.kt
index 04d2063..cbed2e1 100644
--- a/js/js.translator/testData/box/crossModuleRef/topLevelExtension.kt
+++ b/js/js.translator/testData/box/crossModuleRef/topLevelExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/crossModuleRef/topLevelFunction.kt b/js/js.translator/testData/box/crossModuleRef/topLevelFunction.kt
index c1a544e..0db449d 100644
--- a/js/js.translator/testData/box/crossModuleRef/topLevelFunction.kt
+++ b/js/js.translator/testData/box/crossModuleRef/topLevelFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/crossModuleRef/topLevelMutableProperty.kt b/js/js.translator/testData/box/crossModuleRef/topLevelMutableProperty.kt
index caf442a..4f1f7a2 100644
--- a/js/js.translator/testData/box/crossModuleRef/topLevelMutableProperty.kt
+++ b/js/js.translator/testData/box/crossModuleRef/topLevelMutableProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/crossModuleRef/topLevelProperty.kt b/js/js.translator/testData/box/crossModuleRef/topLevelProperty.kt
index 8519234..ed61cba 100644
--- a/js/js.translator/testData/box/crossModuleRef/topLevelProperty.kt
+++ b/js/js.translator/testData/box/crossModuleRef/topLevelProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/dataClass/components.kt b/js/js.translator/testData/box/dataClass/components.kt
index bfd4fce..bcc9ba3 100644
--- a/js/js.translator/testData/box/dataClass/components.kt
+++ b/js/js.translator/testData/box/dataClass/components.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
data class Dat(val start: String, val middle: String, val end: String) {
diff --git a/js/js.translator/testData/box/dataClass/copy.kt b/js/js.translator/testData/box/dataClass/copy.kt
index b99d8381..392af2f 100644
--- a/js/js.translator/testData/box/dataClass/copy.kt
+++ b/js/js.translator/testData/box/dataClass/copy.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
data class Dat(val start: String, val middle: String, val end: String)
diff --git a/js/js.translator/testData/box/dataClass/equals.kt b/js/js.translator/testData/box/dataClass/equals.kt
index 4206827..8abc65e 100644
--- a/js/js.translator/testData/box/dataClass/equals.kt
+++ b/js/js.translator/testData/box/dataClass/equals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 523
+// EXPECTED_REACHABLE_NODES: 1410
package foo
data class Holder<T>(val v: T)
diff --git a/js/js.translator/testData/box/dataClass/hashcode.kt b/js/js.translator/testData/box/dataClass/hashcode.kt
index ca61b1b..afe3c3e 100644
--- a/js/js.translator/testData/box/dataClass/hashcode.kt
+++ b/js/js.translator/testData/box/dataClass/hashcode.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 916
+// EXPECTED_REACHABLE_NODES: 1404
package foo
diff --git a/js/js.translator/testData/box/dataClass/keyrole.kt b/js/js.translator/testData/box/dataClass/keyrole.kt
index 0616974..bd00504 100644
--- a/js/js.translator/testData/box/dataClass/keyrole.kt
+++ b/js/js.translator/testData/box/dataClass/keyrole.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 858
+// EXPECTED_REACHABLE_NODES: 1412
package foo
data class Holder<T>(val v: T)
diff --git a/js/js.translator/testData/box/dataClass/override.kt b/js/js.translator/testData/box/dataClass/override.kt
index 08559ac..c0c4ecc 100644
--- a/js/js.translator/testData/box/dataClass/override.kt
+++ b/js/js.translator/testData/box/dataClass/override.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
var t: Any? = null
diff --git a/js/js.translator/testData/box/dataClass/privateFields.kt b/js/js.translator/testData/box/dataClass/privateFields.kt
index f5e00cd..15da1bb 100644
--- a/js/js.translator/testData/box/dataClass/privateFields.kt
+++ b/js/js.translator/testData/box/dataClass/privateFields.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 953
+// EXPECTED_REACHABLE_NODES: 1389
package foo
data class A(private val x: Int) {
diff --git a/js/js.translator/testData/box/dataClass/tostring.kt b/js/js.translator/testData/box/dataClass/tostring.kt
index 57cd544..3fc26e0 100644
--- a/js/js.translator/testData/box/dataClass/tostring.kt
+++ b/js/js.translator/testData/box/dataClass/tostring.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
data class Holder<T>(val v: T)
diff --git a/js/js.translator/testData/box/defaultArguments/complexExpressionAsConstructorDefaultArgument.kt b/js/js.translator/testData/box/defaultArguments/complexExpressionAsConstructorDefaultArgument.kt
index d51da2e4..d836278 100644
--- a/js/js.translator/testData/box/defaultArguments/complexExpressionAsConstructorDefaultArgument.kt
+++ b/js/js.translator/testData/box/defaultArguments/complexExpressionAsConstructorDefaultArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/defaultArguments/complexExpressionAsDefaultArgument.kt b/js/js.translator/testData/box/defaultArguments/complexExpressionAsDefaultArgument.kt
index 8f3491f..a8a675b 100644
--- a/js/js.translator/testData/box/defaultArguments/complexExpressionAsDefaultArgument.kt
+++ b/js/js.translator/testData/box/defaultArguments/complexExpressionAsDefaultArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// http://youtrack.jetbrains.com/issue/KT-4879
// JS: extra side effect when use when in default arguments
diff --git a/js/js.translator/testData/box/defaultArguments/complexExpressionAsOverriddenDefaultArgument.kt b/js/js.translator/testData/box/defaultArguments/complexExpressionAsOverriddenDefaultArgument.kt
index 5f920c4..64f8287 100644
--- a/js/js.translator/testData/box/defaultArguments/complexExpressionAsOverriddenDefaultArgument.kt
+++ b/js/js.translator/testData/box/defaultArguments/complexExpressionAsOverriddenDefaultArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
// http://youtrack.jetbrains.com/issue/KT-4879
// JS: extra side effect when use when in default arguments
diff --git a/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg1.kt b/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg1.kt
index ad18ea1..9fb988f 100644
--- a/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg1.kt
+++ b/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A(val a: Int = 0)
diff --git a/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg2.kt b/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg2.kt
index 88fb80b..0af7e65 100644
--- a/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg2.kt
+++ b/js/js.translator/testData/box/defaultArguments/constructorCallWithDefArg2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class T4(
diff --git a/js/js.translator/testData/box/defaultArguments/defArgsWithSuperCall.kt b/js/js.translator/testData/box/defaultArguments/defArgsWithSuperCall.kt
index 710a845..ca48880 100644
--- a/js/js.translator/testData/box/defaultArguments/defArgsWithSuperCall.kt
+++ b/js/js.translator/testData/box/defaultArguments/defArgsWithSuperCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
open class A(val a: Int = 1, val b: Int = 2)
diff --git a/js/js.translator/testData/box/defaultArguments/defaultArgumentsInFunctionWithExpressionAsBody.kt b/js/js.translator/testData/box/defaultArguments/defaultArgumentsInFunctionWithExpressionAsBody.kt
index bbdf233..f10d485 100644
--- a/js/js.translator/testData/box/defaultArguments/defaultArgumentsInFunctionWithExpressionAsBody.kt
+++ b/js/js.translator/testData/box/defaultArguments/defaultArgumentsInFunctionWithExpressionAsBody.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// KT-6037: KT-6037 Javascript default function arguments fill code generated in wrong order on method without "return keyword"
package foo
diff --git a/js/js.translator/testData/box/defaultArguments/enumSuperConstructor.kt b/js/js.translator/testData/box/defaultArguments/enumSuperConstructor.kt
index a728032..1bf71485 100644
--- a/js/js.translator/testData/box/defaultArguments/enumSuperConstructor.kt
+++ b/js/js.translator/testData/box/defaultArguments/enumSuperConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 522
+// EXPECTED_REACHABLE_NODES: 1389
package foo
enum class A {
diff --git a/js/js.translator/testData/box/defaultArguments/enumWithDefArg.kt b/js/js.translator/testData/box/defaultArguments/enumWithDefArg.kt
index 76c4f62e..ff0ba42 100644
--- a/js/js.translator/testData/box/defaultArguments/enumWithDefArg.kt
+++ b/js/js.translator/testData/box/defaultArguments/enumWithDefArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 518
+// EXPECTED_REACHABLE_NODES: 1385
package foo
enum class A(val a: Int = 1) {
diff --git a/js/js.translator/testData/box/defaultArguments/enumWithOneDefArg.kt b/js/js.translator/testData/box/defaultArguments/enumWithOneDefArg.kt
index f7b521b..7805370 100644
--- a/js/js.translator/testData/box/defaultArguments/enumWithOneDefArg.kt
+++ b/js/js.translator/testData/box/defaultArguments/enumWithOneDefArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 518
+// EXPECTED_REACHABLE_NODES: 1385
package foo
enum class Foo(val a: Int = 1, val b: String) {
diff --git a/js/js.translator/testData/box/defaultArguments/enumWithTwoDefArgs.kt b/js/js.translator/testData/box/defaultArguments/enumWithTwoDefArgs.kt
index 170ef31..8a1bbb0 100644
--- a/js/js.translator/testData/box/defaultArguments/enumWithTwoDefArgs.kt
+++ b/js/js.translator/testData/box/defaultArguments/enumWithTwoDefArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 522
+// EXPECTED_REACHABLE_NODES: 1389
package foo
enum class Foo(val a: Int = 1, val b: String = "a") {
diff --git a/js/js.translator/testData/box/defaultArguments/extensionFunWithDefArgs.kt b/js/js.translator/testData/box/defaultArguments/extensionFunWithDefArgs.kt
index 65e5d29..88e07d0 100644
--- a/js/js.translator/testData/box/defaultArguments/extensionFunWithDefArgs.kt
+++ b/js/js.translator/testData/box/defaultArguments/extensionFunWithDefArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun <T> T.toPrefixedString(prefix: String = "", suffix: String = "") = prefix + toString() + suffix
diff --git a/js/js.translator/testData/box/defaultArguments/funInAbstractClassWithDefArg.kt b/js/js.translator/testData/box/defaultArguments/funInAbstractClassWithDefArg.kt
index 3ba43f8..8415bb9 100644
--- a/js/js.translator/testData/box/defaultArguments/funInAbstractClassWithDefArg.kt
+++ b/js/js.translator/testData/box/defaultArguments/funInAbstractClassWithDefArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
open abstract class B() {
diff --git a/js/js.translator/testData/box/defaultArguments/overloadFunWithDefArg.kt b/js/js.translator/testData/box/defaultArguments/overloadFunWithDefArg.kt
index 1af0fd1..b8ece00 100644
--- a/js/js.translator/testData/box/defaultArguments/overloadFunWithDefArg.kt
+++ b/js/js.translator/testData/box/defaultArguments/overloadFunWithDefArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
open abstract class B() {
diff --git a/js/js.translator/testData/box/defaultArguments/primarySuperConstructor.kt b/js/js.translator/testData/box/defaultArguments/primarySuperConstructor.kt
index 4db1b36..2d0f7ba 100644
--- a/js/js.translator/testData/box/defaultArguments/primarySuperConstructor.kt
+++ b/js/js.translator/testData/box/defaultArguments/primarySuperConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
open class Base(a: Int, b: Int = 3) {
diff --git a/js/js.translator/testData/box/defaultArguments/secondarySuperConstructor.kt b/js/js.translator/testData/box/defaultArguments/secondarySuperConstructor.kt
index fd37349..6e517e9 100644
--- a/js/js.translator/testData/box/defaultArguments/secondarySuperConstructor.kt
+++ b/js/js.translator/testData/box/defaultArguments/secondarySuperConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1390
package foo
open class Base {
diff --git a/js/js.translator/testData/box/defaultArguments/superCall.kt b/js/js.translator/testData/box/defaultArguments/superCall.kt
index 3a22f0a..c267d01 100644
--- a/js/js.translator/testData/box/defaultArguments/superCall.kt
+++ b/js/js.translator/testData/box/defaultArguments/superCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
open class A {
diff --git a/js/js.translator/testData/box/defaultArguments/virtualCallWithDefArg.kt b/js/js.translator/testData/box/defaultArguments/virtualCallWithDefArg.kt
index 77ae925..6bb6778 100644
--- a/js/js.translator/testData/box/defaultArguments/virtualCallWithDefArg.kt
+++ b/js/js.translator/testData/box/defaultArguments/virtualCallWithDefArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
interface A {
diff --git a/js/js.translator/testData/box/delegateProperty/capturedLocalVal.kt b/js/js.translator/testData/box/delegateProperty/capturedLocalVal.kt
index 8922509..0d61ea0 100644
--- a/js/js.translator/testData/box/delegateProperty/capturedLocalVal.kt
+++ b/js/js.translator/testData/box/delegateProperty/capturedLocalVal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/capturedLocalValNoInline.kt b/js/js.translator/testData/box/delegateProperty/capturedLocalValNoInline.kt
index 94a3204..05abd01 100644
--- a/js/js.translator/testData/box/delegateProperty/capturedLocalValNoInline.kt
+++ b/js/js.translator/testData/box/delegateProperty/capturedLocalValNoInline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/capturedLocalVar.kt b/js/js.translator/testData/box/delegateProperty/capturedLocalVar.kt
index b695e41..2443ff4 100644
--- a/js/js.translator/testData/box/delegateProperty/capturedLocalVar.kt
+++ b/js/js.translator/testData/box/delegateProperty/capturedLocalVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/capturedLocalVarNoInline.kt b/js/js.translator/testData/box/delegateProperty/capturedLocalVarNoInline.kt
index b276ad9..ddfd649 100644
--- a/js/js.translator/testData/box/delegateProperty/capturedLocalVarNoInline.kt
+++ b/js/js.translator/testData/box/delegateProperty/capturedLocalVarNoInline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/delegateByExtensionProperty.kt b/js/js.translator/testData/box/delegateProperty/delegateByExtensionProperty.kt
index 940d91e..58819d4 100644
--- a/js/js.translator/testData/box/delegateProperty/delegateByExtensionProperty.kt
+++ b/js/js.translator/testData/box/delegateProperty/delegateByExtensionProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 541
+// EXPECTED_REACHABLE_NODES: 1393
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/delegateByTopLevelFun.kt b/js/js.translator/testData/box/delegateProperty/delegateByTopLevelFun.kt
index d3411afa..da8d74d 100644
--- a/js/js.translator/testData/box/delegateProperty/delegateByTopLevelFun.kt
+++ b/js/js.translator/testData/box/delegateProperty/delegateByTopLevelFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/delegateByTopLevelProperty.kt b/js/js.translator/testData/box/delegateProperty/delegateByTopLevelProperty.kt
index 0369eb6..f2683ef 100644
--- a/js/js.translator/testData/box/delegateProperty/delegateByTopLevelProperty.kt
+++ b/js/js.translator/testData/box/delegateProperty/delegateByTopLevelProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/delegateWithPropertyAccess.kt b/js/js.translator/testData/box/delegateProperty/delegateWithPropertyAccess.kt
index 0369eb6..f2683ef 100644
--- a/js/js.translator/testData/box/delegateProperty/delegateWithPropertyAccess.kt
+++ b/js/js.translator/testData/box/delegateProperty/delegateWithPropertyAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/getAsExtensionFun.kt b/js/js.translator/testData/box/delegateProperty/getAsExtensionFun.kt
index 80ab4cd..eccc63c 100644
--- a/js/js.translator/testData/box/delegateProperty/getAsExtensionFun.kt
+++ b/js/js.translator/testData/box/delegateProperty/getAsExtensionFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/localVal.kt b/js/js.translator/testData/box/delegateProperty/localVal.kt
index 868d4c1..d71a256 100644
--- a/js/js.translator/testData/box/delegateProperty/localVal.kt
+++ b/js/js.translator/testData/box/delegateProperty/localVal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/localVar.kt b/js/js.translator/testData/box/delegateProperty/localVar.kt
index 31fa403..7ff07ca 100644
--- a/js/js.translator/testData/box/delegateProperty/localVar.kt
+++ b/js/js.translator/testData/box/delegateProperty/localVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/localVarInc.kt b/js/js.translator/testData/box/delegateProperty/localVarInc.kt
index d1e0727..62e0106 100644
--- a/js/js.translator/testData/box/delegateProperty/localVarInc.kt
+++ b/js/js.translator/testData/box/delegateProperty/localVarInc.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/localVarPlusAssign.kt b/js/js.translator/testData/box/delegateProperty/localVarPlusAssign.kt
index cb09c16..cd14345 100644
--- a/js/js.translator/testData/box/delegateProperty/localVarPlusAssign.kt
+++ b/js/js.translator/testData/box/delegateProperty/localVarPlusAssign.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
//TODO: reuse same tests from JVM backend
package foo
diff --git a/js/js.translator/testData/box/delegateProperty/propertyMetadata.kt b/js/js.translator/testData/box/delegateProperty/propertyMetadata.kt
index fb2cd25..2c6a08d 100644
--- a/js/js.translator/testData/box/delegateProperty/propertyMetadata.kt
+++ b/js/js.translator/testData/box/delegateProperty/propertyMetadata.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/setAsExtensionFun.kt b/js/js.translator/testData/box/delegateProperty/setAsExtensionFun.kt
index 85e7b74..d80a455 100644
--- a/js/js.translator/testData/box/delegateProperty/setAsExtensionFun.kt
+++ b/js/js.translator/testData/box/delegateProperty/setAsExtensionFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/simple.kt b/js/js.translator/testData/box/delegateProperty/simple.kt
index b08f6ef..19a0da2 100644
--- a/js/js.translator/testData/box/delegateProperty/simple.kt
+++ b/js/js.translator/testData/box/delegateProperty/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/topLevelVal.kt b/js/js.translator/testData/box/delegateProperty/topLevelVal.kt
index 3ac8dba..76e2ca2 100644
--- a/js/js.translator/testData/box/delegateProperty/topLevelVal.kt
+++ b/js/js.translator/testData/box/delegateProperty/topLevelVal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/topLevelVar.kt b/js/js.translator/testData/box/delegateProperty/topLevelVar.kt
index 264715b..f100a3e 100644
--- a/js/js.translator/testData/box/delegateProperty/topLevelVar.kt
+++ b/js/js.translator/testData/box/delegateProperty/topLevelVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegateProperty/withGenerics.kt b/js/js.translator/testData/box/delegateProperty/withGenerics.kt
index 5010c54..28700a1 100644
--- a/js/js.translator/testData/box/delegateProperty/withGenerics.kt
+++ b/js/js.translator/testData/box/delegateProperty/withGenerics.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1389
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegation/complexDelegation.kt b/js/js.translator/testData/box/delegation/complexDelegation.kt
index 898a7bc..35d6299 100644
--- a/js/js.translator/testData/box/delegation/complexDelegation.kt
+++ b/js/js.translator/testData/box/delegation/complexDelegation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
interface C {
diff --git a/js/js.translator/testData/box/delegation/delegation2.kt b/js/js.translator/testData/box/delegation/delegation2.kt
index 539257e..6f23185 100644
--- a/js/js.translator/testData/box/delegation/delegation2.kt
+++ b/js/js.translator/testData/box/delegation/delegation2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
// This test was adapted from compiler/testData/codegen/box/classes
package foo
diff --git a/js/js.translator/testData/box/delegation/delegation3.kt b/js/js.translator/testData/box/delegation/delegation3.kt
index b445984..a28072b 100644
--- a/js/js.translator/testData/box/delegation/delegation3.kt
+++ b/js/js.translator/testData/box/delegation/delegation3.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1398
// This test was adapted from compiler/testData/codegen/box/classes
package foo
diff --git a/js/js.translator/testData/box/delegation/delegation4.kt b/js/js.translator/testData/box/delegation/delegation4.kt
index 3b2ecfd..691e6ba 100644
--- a/js/js.translator/testData/box/delegation/delegation4.kt
+++ b/js/js.translator/testData/box/delegation/delegation4.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
// This test was adapted from compiler/testData/codegen/box/classes
package foo
diff --git a/js/js.translator/testData/box/delegation/delegationByArg.kt b/js/js.translator/testData/box/delegation/delegationByArg.kt
index 4ffdf86..d155e25 100644
--- a/js/js.translator/testData/box/delegation/delegationByArg.kt
+++ b/js/js.translator/testData/box/delegation/delegationByArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationByExprWithArgs.kt b/js/js.translator/testData/box/delegation/delegationByExprWithArgs.kt
index 9b24bc8..f7e0cab 100644
--- a/js/js.translator/testData/box/delegation/delegationByExprWithArgs.kt
+++ b/js/js.translator/testData/box/delegation/delegationByExprWithArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationByFunExpr.kt b/js/js.translator/testData/box/delegation/delegationByFunExpr.kt
index 8326cf7..cdf9c41 100644
--- a/js/js.translator/testData/box/delegation/delegationByFunExpr.kt
+++ b/js/js.translator/testData/box/delegation/delegationByFunExpr.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationByIfExpr.kt b/js/js.translator/testData/box/delegation/delegationByIfExpr.kt
index eb57a302..1dde522 100644
--- a/js/js.translator/testData/box/delegation/delegationByIfExpr.kt
+++ b/js/js.translator/testData/box/delegation/delegationByIfExpr.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationByInh.kt b/js/js.translator/testData/box/delegation/delegationByInh.kt
index 3bf0b61..910e545 100644
--- a/js/js.translator/testData/box/delegation/delegationByInh.kt
+++ b/js/js.translator/testData/box/delegation/delegationByInh.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 519
+// EXPECTED_REACHABLE_NODES: 1406
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationByNewInstance.kt b/js/js.translator/testData/box/delegation/delegationByNewInstance.kt
index d227aaa..d48eb76 100644
--- a/js/js.translator/testData/box/delegation/delegationByNewInstance.kt
+++ b/js/js.translator/testData/box/delegation/delegationByNewInstance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationChain.kt b/js/js.translator/testData/box/delegation/delegationChain.kt
index 60965d8..b1e0a26 100644
--- a/js/js.translator/testData/box/delegation/delegationChain.kt
+++ b/js/js.translator/testData/box/delegation/delegationChain.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationEvaluationOrder1.kt b/js/js.translator/testData/box/delegation/delegationEvaluationOrder1.kt
index fef32f3..bc71cd8 100644
--- a/js/js.translator/testData/box/delegation/delegationEvaluationOrder1.kt
+++ b/js/js.translator/testData/box/delegation/delegationEvaluationOrder1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 515
+// EXPECTED_REACHABLE_NODES: 1402
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationEvaluationOrder2.kt b/js/js.translator/testData/box/delegation/delegationEvaluationOrder2.kt
index 8bc438b..ac4559e 100644
--- a/js/js.translator/testData/box/delegation/delegationEvaluationOrder2.kt
+++ b/js/js.translator/testData/box/delegation/delegationEvaluationOrder2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 531
+// EXPECTED_REACHABLE_NODES: 1418
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationExtFun1.kt b/js/js.translator/testData/box/delegation/delegationExtFun1.kt
index 46ec014..bf026a0 100644
--- a/js/js.translator/testData/box/delegation/delegationExtFun1.kt
+++ b/js/js.translator/testData/box/delegation/delegationExtFun1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationExtFun2.kt b/js/js.translator/testData/box/delegation/delegationExtFun2.kt
index b7e2154..e8cef72 100644
--- a/js/js.translator/testData/box/delegation/delegationExtFun2.kt
+++ b/js/js.translator/testData/box/delegation/delegationExtFun2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationExtProp.kt b/js/js.translator/testData/box/delegation/delegationExtProp.kt
index 2dd19f4..716e79d 100644
--- a/js/js.translator/testData/box/delegation/delegationExtProp.kt
+++ b/js/js.translator/testData/box/delegation/delegationExtProp.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1394
package foo
interface Base {
diff --git a/js/js.translator/testData/box/delegation/delegationExtensionPropertyDelegated.kt b/js/js.translator/testData/box/delegation/delegationExtensionPropertyDelegated.kt
index ca9eb53..5e22aab 100644
--- a/js/js.translator/testData/box/delegation/delegationExtensionPropertyDelegated.kt
+++ b/js/js.translator/testData/box/delegation/delegationExtensionPropertyDelegated.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 547
+// EXPECTED_REACHABLE_NODES: 1399
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegation/delegationGenericArg.kt b/js/js.translator/testData/box/delegation/delegationGenericArg.kt
index 91c8f83..d4099a9 100644
--- a/js/js.translator/testData/box/delegation/delegationGenericArg.kt
+++ b/js/js.translator/testData/box/delegation/delegationGenericArg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// This test was adapted from compiler/testData/codegen/box/classes
package foo
diff --git a/js/js.translator/testData/box/delegation/delegationMethodsWithArgs.kt b/js/js.translator/testData/box/delegation/delegationMethodsWithArgs.kt
index 8e46646..98115fc 100644
--- a/js/js.translator/testData/box/delegation/delegationMethodsWithArgs.kt
+++ b/js/js.translator/testData/box/delegation/delegationMethodsWithArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
// This test was adapted from compiler/testData/codegen/box/classes
package foo
diff --git a/js/js.translator/testData/box/delegation/jsNamePropertyDelegation.kt b/js/js.translator/testData/box/delegation/jsNamePropertyDelegation.kt
index 3c930f0..6a0c5ae 100644
--- a/js/js.translator/testData/box/delegation/jsNamePropertyDelegation.kt
+++ b/js/js.translator/testData/box/delegation/jsNamePropertyDelegation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
import kotlin.reflect.KProperty
diff --git a/js/js.translator/testData/box/delegation/onObject.kt b/js/js.translator/testData/box/delegation/onObject.kt
index fec9dd8..a53f9d2 100644
--- a/js/js.translator/testData/box/delegation/onObject.kt
+++ b/js/js.translator/testData/box/delegation/onObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
package foo
interface T {
diff --git a/js/js.translator/testData/box/dynamic/binaryOperations.kt b/js/js.translator/testData/box/dynamic/binaryOperations.kt
index 0ca5676..49cb97b 100644
--- a/js/js.translator/testData/box/dynamic/binaryOperations.kt
+++ b/js/js.translator/testData/box/dynamic/binaryOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/callGetMethod.kt b/js/js.translator/testData/box/dynamic/callGetMethod.kt
index e36ed1b..1baa64c 100644
--- a/js/js.translator/testData/box/dynamic/callGetMethod.kt
+++ b/js/js.translator/testData/box/dynamic/callGetMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/callMethods.kt b/js/js.translator/testData/box/dynamic/callMethods.kt
index aa02fb9..dec4b2d 100644
--- a/js/js.translator/testData/box/dynamic/callMethods.kt
+++ b/js/js.translator/testData/box/dynamic/callMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/callSetMethod.kt b/js/js.translator/testData/box/dynamic/callSetMethod.kt
index 07e42a4..378377a 100644
--- a/js/js.translator/testData/box/dynamic/callSetMethod.kt
+++ b/js/js.translator/testData/box/dynamic/callSetMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/compareTo.kt b/js/js.translator/testData/box/dynamic/compareTo.kt
index 6a65f6b0..ef3a72c 100644
--- a/js/js.translator/testData/box/dynamic/compareTo.kt
+++ b/js/js.translator/testData/box/dynamic/compareTo.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1394
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/equals.kt b/js/js.translator/testData/box/dynamic/equals.kt
index daf7de0..e5592b3 100644
--- a/js/js.translator/testData/box/dynamic/equals.kt
+++ b/js/js.translator/testData/box/dynamic/equals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 536
+// EXPECTED_REACHABLE_NODES: 1423
package foo
object f {
diff --git a/js/js.translator/testData/box/dynamic/getByBrackets.kt b/js/js.translator/testData/box/dynamic/getByBrackets.kt
index 7c49d9f..158c86d 100644
--- a/js/js.translator/testData/box/dynamic/getByBrackets.kt
+++ b/js/js.translator/testData/box/dynamic/getByBrackets.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/identityEquals.kt b/js/js.translator/testData/box/dynamic/identityEquals.kt
index ecc231a..dd64d10 100644
--- a/js/js.translator/testData/box/dynamic/identityEquals.kt
+++ b/js/js.translator/testData/box/dynamic/identityEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 525
+// EXPECTED_REACHABLE_NODES: 1412
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/incrementAndDecrement.kt b/js/js.translator/testData/box/dynamic/incrementAndDecrement.kt
index b712011..1148105 100644
--- a/js/js.translator/testData/box/dynamic/incrementAndDecrement.kt
+++ b/js/js.translator/testData/box/dynamic/incrementAndDecrement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/infixCall.kt b/js/js.translator/testData/box/dynamic/infixCall.kt
index 56ced40..5ef46ed 100644
--- a/js/js.translator/testData/box/dynamic/infixCall.kt
+++ b/js/js.translator/testData/box/dynamic/infixCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/invoke.kt b/js/js.translator/testData/box/dynamic/invoke.kt
index 0a7c1623..2697985 100644
--- a/js/js.translator/testData/box/dynamic/invoke.kt
+++ b/js/js.translator/testData/box/dynamic/invoke.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/is.kt b/js/js.translator/testData/box/dynamic/is.kt
index bba4e16..21ad9a8 100644
--- a/js/js.translator/testData/box/dynamic/is.kt
+++ b/js/js.translator/testData/box/dynamic/is.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
// FILE: is.kt
package foo
diff --git a/js/js.translator/testData/box/dynamic/isJsPrimitiveType.kt b/js/js.translator/testData/box/dynamic/isJsPrimitiveType.kt
index 3862120..2c0e0d2 100644
--- a/js/js.translator/testData/box/dynamic/isJsPrimitiveType.kt
+++ b/js/js.translator/testData/box/dynamic/isJsPrimitiveType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 530
+// EXPECTED_REACHABLE_NODES: 1399
package foo
enum class Type {
diff --git a/js/js.translator/testData/box/dynamic/iterator.kt b/js/js.translator/testData/box/dynamic/iterator.kt
index 3cc1a31..da30aeb 100644
--- a/js/js.translator/testData/box/dynamic/iterator.kt
+++ b/js/js.translator/testData/box/dynamic/iterator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1224
+// EXPECTED_REACHABLE_NODES: 1414
package foo
fun testFor(expected: Int, d: dynamic, case: String) {
diff --git a/js/js.translator/testData/box/dynamic/nameClashing.kt b/js/js.translator/testData/box/dynamic/nameClashing.kt
index e07ea23..c407e8c 100644
--- a/js/js.translator/testData/box/dynamic/nameClashing.kt
+++ b/js/js.translator/testData/box/dynamic/nameClashing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
fun assertContains(expectedName: String, f: () -> Unit) {
diff --git a/js/js.translator/testData/box/dynamic/operationsWithAssignment.kt b/js/js.translator/testData/box/dynamic/operationsWithAssignment.kt
index d2df279..e480112 100644
--- a/js/js.translator/testData/box/dynamic/operationsWithAssignment.kt
+++ b/js/js.translator/testData/box/dynamic/operationsWithAssignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/propertyAccess.kt b/js/js.translator/testData/box/dynamic/propertyAccess.kt
index 75e1437..8e306d7 100644
--- a/js/js.translator/testData/box/dynamic/propertyAccess.kt
+++ b/js/js.translator/testData/box/dynamic/propertyAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/propertySideEffect.kt b/js/js.translator/testData/box/dynamic/propertySideEffect.kt
index e3590ca..455d86b 100644
--- a/js/js.translator/testData/box/dynamic/propertySideEffect.kt
+++ b/js/js.translator/testData/box/dynamic/propertySideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
external class C
inline val C.foo: String
diff --git a/js/js.translator/testData/box/dynamic/setByBrackets.kt b/js/js.translator/testData/box/dynamic/setByBrackets.kt
index 56b7d5b..b285812 100644
--- a/js/js.translator/testData/box/dynamic/setByBrackets.kt
+++ b/js/js.translator/testData/box/dynamic/setByBrackets.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/dynamic/unaryOperations.kt b/js/js.translator/testData/box/dynamic/unaryOperations.kt
index 1e3eca9..54df8cf 100644
--- a/js/js.translator/testData/box/dynamic/unaryOperations.kt
+++ b/js/js.translator/testData/box/dynamic/unaryOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/enum/accessing.kt b/js/js.translator/testData/box/enum/accessing.kt
index 8e93467..79a4d81 100644
--- a/js/js.translator/testData/box/enum/accessing.kt
+++ b/js/js.translator/testData/box/enum/accessing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 538
+// EXPECTED_REACHABLE_NODES: 1405
package foo
enum class A {
diff --git a/js/js.translator/testData/box/enum/enumInheritedFromTrait.kt b/js/js.translator/testData/box/enum/enumInheritedFromTrait.kt
index 92e8341..212a396 100644
--- a/js/js.translator/testData/box/enum/enumInheritedFromTrait.kt
+++ b/js/js.translator/testData/box/enum/enumInheritedFromTrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 533
+// EXPECTED_REACHABLE_NODES: 1400
package foo
fun box() = MyEnum.E1.f() + MyEnum.E2.f()
diff --git a/js/js.translator/testData/box/enum/enumIsComparable.kt b/js/js.translator/testData/box/enum/enumIsComparable.kt
index f1d04dd..9d463d8 100644
--- a/js/js.translator/testData/box/enum/enumIsComparable.kt
+++ b/js/js.translator/testData/box/enum/enumIsComparable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 518
+// EXPECTED_REACHABLE_NODES: 1385
package foo
enum class A {
diff --git a/js/js.translator/testData/box/enum/enumWithInheritance.kt b/js/js.translator/testData/box/enum/enumWithInheritance.kt
index 1ad2770..933bbfb 100644
--- a/js/js.translator/testData/box/enum/enumWithInheritance.kt
+++ b/js/js.translator/testData/box/enum/enumWithInheritance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 550
+// EXPECTED_REACHABLE_NODES: 1417
package foo
enum class B(open val bar: Int) {
diff --git a/js/js.translator/testData/box/enum/equals.kt b/js/js.translator/testData/box/enum/equals.kt
index f76a776..829e122 100644
--- a/js/js.translator/testData/box/enum/equals.kt
+++ b/js/js.translator/testData/box/enum/equals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 537
+// EXPECTED_REACHABLE_NODES: 1404
package foo
enum class Foo {
diff --git a/js/js.translator/testData/box/enum/equalsNullUndefined.kt b/js/js.translator/testData/box/enum/equalsNullUndefined.kt
index 428822f..a367c67 100644
--- a/js/js.translator/testData/box/enum/equalsNullUndefined.kt
+++ b/js/js.translator/testData/box/enum/equalsNullUndefined.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 529
+// EXPECTED_REACHABLE_NODES: 1391
enum class A {
X,
Y
diff --git a/js/js.translator/testData/box/enum/implementsComparable.kt b/js/js.translator/testData/box/enum/implementsComparable.kt
index 79d6fa0..7120693 100644
--- a/js/js.translator/testData/box/enum/implementsComparable.kt
+++ b/js/js.translator/testData/box/enum/implementsComparable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 526
+// EXPECTED_REACHABLE_NODES: 1393
package foo
enum class A {
diff --git a/js/js.translator/testData/box/enum/initializationOrder.kt b/js/js.translator/testData/box/enum/initializationOrder.kt
index 96f8134..ae436b2 100644
--- a/js/js.translator/testData/box/enum/initializationOrder.kt
+++ b/js/js.translator/testData/box/enum/initializationOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 527
+// EXPECTED_REACHABLE_NODES: 1394
package foo
enum class E {
diff --git a/js/js.translator/testData/box/enum/nativeEnum.kt b/js/js.translator/testData/box/enum/nativeEnum.kt
index 25bbe0f..1614332 100644
--- a/js/js.translator/testData/box/enum/nativeEnum.kt
+++ b/js/js.translator/testData/box/enum/nativeEnum.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
external enum class JsEnum {
diff --git a/js/js.translator/testData/box/enum/simpleEnum.kt b/js/js.translator/testData/box/enum/simpleEnum.kt
index 739ea79..2af649b 100644
--- a/js/js.translator/testData/box/enum/simpleEnum.kt
+++ b/js/js.translator/testData/box/enum/simpleEnum.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 516
+// EXPECTED_REACHABLE_NODES: 1383
package foo
enum class E {
diff --git a/js/js.translator/testData/box/enum/standardMethods.kt b/js/js.translator/testData/box/enum/standardMethods.kt
index 70bae7b..9f68ef0 100644
--- a/js/js.translator/testData/box/enum/standardMethods.kt
+++ b/js/js.translator/testData/box/enum/standardMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 941
+// EXPECTED_REACHABLE_NODES: 1413
package foo
enum class EmptyEnum
diff --git a/js/js.translator/testData/box/enum/superCallInEnumLiteral.kt b/js/js.translator/testData/box/enum/superCallInEnumLiteral.kt
index 7978ecb..a00da29 100644
--- a/js/js.translator/testData/box/enum/superCallInEnumLiteral.kt
+++ b/js/js.translator/testData/box/enum/superCallInEnumLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 533
+// EXPECTED_REACHABLE_NODES: 1400
package foo
fun box() = E.E1.f() + E.E2.f()
diff --git a/js/js.translator/testData/box/examples/basicmethod.kt b/js/js.translator/testData/box/examples/basicmethod.kt
index 488d78c..c060a74 100644
--- a/js/js.translator/testData/box/examples/basicmethod.kt
+++ b/js/js.translator/testData/box/examples/basicmethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 905
+// EXPECTED_REACHABLE_NODES: 1393
interface Tr {
fun extra(): String = "_"
diff --git a/js/js.translator/testData/box/examples/basicproperty.kt b/js/js.translator/testData/box/examples/basicproperty.kt
index 108b744..5d95834 100644
--- a/js/js.translator/testData/box/examples/basicproperty.kt
+++ b/js/js.translator/testData/box/examples/basicproperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1394
open class M() {
open var b: Int = 0
}
diff --git a/js/js.translator/testData/box/examples/classObject.kt b/js/js.translator/testData/box/examples/classObject.kt
index 0c1839a..d57c55c 100644
--- a/js/js.translator/testData/box/examples/classObject.kt
+++ b/js/js.translator/testData/box/examples/classObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
class C() {
companion object {
fun create() = C()
diff --git a/js/js.translator/testData/box/examples/closureWithParameter.kt b/js/js.translator/testData/box/examples/closureWithParameter.kt
index 14b3ef4..304e3c3 100644
--- a/js/js.translator/testData/box/examples/closureWithParameter.kt
+++ b/js/js.translator/testData/box/examples/closureWithParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
fun box(): String {
return apply("OK", { arg: String -> arg })
}
diff --git a/js/js.translator/testData/box/examples/closureWithParameterAndBoxing.kt b/js/js.translator/testData/box/examples/closureWithParameterAndBoxing.kt
index cc8a200..37585e1 100644
--- a/js/js.translator/testData/box/examples/closureWithParameterAndBoxing.kt
+++ b/js/js.translator/testData/box/examples/closureWithParameterAndBoxing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
fun box(): String {
return if (apply(5) { arg: Int -> arg + 13 } == 18) "OK" else "fail"
}
diff --git a/js/js.translator/testData/box/examples/doubleEnclosedLocalVariable.kt b/js/js.translator/testData/box/examples/doubleEnclosedLocalVariable.kt
index 7a4246f..46fc3af 100644
--- a/js/js.translator/testData/box/examples/doubleEnclosedLocalVariable.kt
+++ b/js/js.translator/testData/box/examples/doubleEnclosedLocalVariable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
fun box(): String {
val cl = 39
return if (sum(200, { val ff = { cl }; ff() }) == 239) "OK" else "FAIL"
diff --git a/js/js.translator/testData/box/examples/enclosed.kt b/js/js.translator/testData/box/examples/enclosed.kt
index aad1e44..391a1bd 100644
--- a/js/js.translator/testData/box/examples/enclosed.kt
+++ b/js/js.translator/testData/box/examples/enclosed.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 525
+// EXPECTED_REACHABLE_NODES: 1412
interface BK {
fun x(): Int = 50
}
diff --git a/js/js.translator/testData/box/examples/enclosingLocalVariable.kt b/js/js.translator/testData/box/examples/enclosingLocalVariable.kt
index 389ab2a..c791228 100644
--- a/js/js.translator/testData/box/examples/enclosingLocalVariable.kt
+++ b/js/js.translator/testData/box/examples/enclosingLocalVariable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
fun box(): String {
val cl = 39
return if (sum(200, { val m = { val r = { cl }; r() }; m() }) == 239) "OK" else "FAIL"
diff --git a/js/js.translator/testData/box/examples/extensionClosure.kt b/js/js.translator/testData/box/examples/extensionClosure.kt
index 8130f45..9ab0fd5 100644
--- a/js/js.translator/testData/box/examples/extensionClosure.kt
+++ b/js/js.translator/testData/box/examples/extensionClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
class Point(val x: Int, val y: Int)
fun box(): String {
diff --git a/js/js.translator/testData/box/examples/funDelegation.kt b/js/js.translator/testData/box/examples/funDelegation.kt
index 0d19ab2..738f375 100644
--- a/js/js.translator/testData/box/examples/funDelegation.kt
+++ b/js/js.translator/testData/box/examples/funDelegation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1393
open class Base() {
fun n(n: Int): Int = n + 1
}
diff --git a/js/js.translator/testData/box/examples/incrementProperty.kt b/js/js.translator/testData/box/examples/incrementProperty.kt
index c1d1cf4..8ba7f22 100644
--- a/js/js.translator/testData/box/examples/incrementProperty.kt
+++ b/js/js.translator/testData/box/examples/incrementProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
class Slot() {
var vitality: Int = 10000
diff --git a/js/js.translator/testData/box/examples/inheritance.kt b/js/js.translator/testData/box/examples/inheritance.kt
index fa97c55..08727f5 100644
--- a/js/js.translator/testData/box/examples/inheritance.kt
+++ b/js/js.translator/testData/box/examples/inheritance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 526
+// EXPECTED_REACHABLE_NODES: 1413
// Changed when traits were introduced. May not make sense any more
open class X(val x: Int) {
diff --git a/js/js.translator/testData/box/examples/inheritedInnerClass.kt b/js/js.translator/testData/box/examples/inheritedInnerClass.kt
index 6b53999..21bea6b 100644
--- a/js/js.translator/testData/box/examples/inheritedInnerClass.kt
+++ b/js/js.translator/testData/box/examples/inheritedInnerClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
class Outer() {
open class InnerBase() {
}
diff --git a/js/js.translator/testData/box/examples/inheritedMethod.kt b/js/js.translator/testData/box/examples/inheritedMethod.kt
index 08369e1..cd7a28f 100644
--- a/js/js.translator/testData/box/examples/inheritedMethod.kt
+++ b/js/js.translator/testData/box/examples/inheritedMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
open class Foo() {
fun xyzzy(): String = "xyzzy"
}
diff --git a/js/js.translator/testData/box/examples/initializerBlock.kt b/js/js.translator/testData/box/examples/initializerBlock.kt
index 4d4fcaf..f27a3a6 100644
--- a/js/js.translator/testData/box/examples/initializerBlock.kt
+++ b/js/js.translator/testData/box/examples/initializerBlock.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
class C() {
public var f: Int
diff --git a/js/js.translator/testData/box/examples/initializerBlockDImpl.kt b/js/js.translator/testData/box/examples/initializerBlockDImpl.kt
index 05ba1a1..7ce02b5 100644
--- a/js/js.translator/testData/box/examples/initializerBlockDImpl.kt
+++ b/js/js.translator/testData/box/examples/initializerBlockDImpl.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 890
+// EXPECTED_REACHABLE_NODES: 1378
class World() {
public val items: ArrayList<Item> = ArrayList<Item>()
diff --git a/js/js.translator/testData/box/examples/innerClass.kt b/js/js.translator/testData/box/examples/innerClass.kt
index f027f88..a872bd0 100644
--- a/js/js.translator/testData/box/examples/innerClass.kt
+++ b/js/js.translator/testData/box/examples/innerClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1382
class Outer(val foo: StringBuilder) {
inner class Inner() {
fun len(): Int {
diff --git a/js/js.translator/testData/box/examples/kt242.kt b/js/js.translator/testData/box/examples/kt242.kt
index 4da85e7..6f3cf3e 100644
--- a/js/js.translator/testData/box/examples/kt242.kt
+++ b/js/js.translator/testData/box/examples/kt242.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
fun box(): String {
val i: Int? = 7
val j: Int? = null
diff --git a/js/js.translator/testData/box/examples/newInstanceDefaultConstructor.kt b/js/js.translator/testData/box/examples/newInstanceDefaultConstructor.kt
index b4cbc67..83dd794 100644
--- a/js/js.translator/testData/box/examples/newInstanceDefaultConstructor.kt
+++ b/js/js.translator/testData/box/examples/newInstanceDefaultConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
class SimpleClass() {
fun foo() = 610
}
diff --git a/js/js.translator/testData/box/examples/overloadBinaryOperator.kt b/js/js.translator/testData/box/examples/overloadBinaryOperator.kt
index a5137a8..5bbc198 100644
--- a/js/js.translator/testData/box/examples/overloadBinaryOperator.kt
+++ b/js/js.translator/testData/box/examples/overloadBinaryOperator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 891
+// EXPECTED_REACHABLE_NODES: 1379
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt b/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
index 399b67e..368cccb 100644
--- a/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
+++ b/js/js.translator/testData/box/examples/overloadPlusAssignReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 892
+// EXPECTED_REACHABLE_NODES: 1380
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt b/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
index 5b59b60..166f10a 100644
--- a/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
+++ b/js/js.translator/testData/box/examples/overloadPlusToPlusAssign.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 892
+// EXPECTED_REACHABLE_NODES: 1380
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/overloadUnaryOperator.kt b/js/js.translator/testData/box/examples/overloadUnaryOperator.kt
index bab957a..33b51a7 100644
--- a/js/js.translator/testData/box/examples/overloadUnaryOperator.kt
+++ b/js/js.translator/testData/box/examples/overloadUnaryOperator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 892
+// EXPECTED_REACHABLE_NODES: 1380
class ArrayWrapper<T>() {
val contents = ArrayList<T>()
diff --git a/js/js.translator/testData/box/examples/propertyDelegation.kt b/js/js.translator/testData/box/examples/propertyDelegation.kt
index c6fdc3e..7bb714e 100644
--- a/js/js.translator/testData/box/examples/propertyDelegation.kt
+++ b/js/js.translator/testData/box/examples/propertyDelegation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1395
open class Base() {
val plain = 239
public val read: Int
diff --git a/js/js.translator/testData/box/examples/propertyInInitializer.kt b/js/js.translator/testData/box/examples/propertyInInitializer.kt
index e76b5ec..fb8c009 100644
--- a/js/js.translator/testData/box/examples/propertyInInitializer.kt
+++ b/js/js.translator/testData/box/examples/propertyInInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
class Outer() {
val s = "xyzzy"
diff --git a/js/js.translator/testData/box/examples/rightHandOverride.kt b/js/js.translator/testData/box/examples/rightHandOverride.kt
index aca4b1c..0c7d377 100644
--- a/js/js.translator/testData/box/examples/rightHandOverride.kt
+++ b/js/js.translator/testData/box/examples/rightHandOverride.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// Changed when traits were introduced. May not make sense any more
interface Left {
diff --git a/js/js.translator/testData/box/examples/simplestClosure.kt b/js/js.translator/testData/box/examples/simplestClosure.kt
index 3e8e417..19e7bf5 100644
--- a/js/js.translator/testData/box/examples/simplestClosure.kt
+++ b/js/js.translator/testData/box/examples/simplestClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
fun box(): String {
return invoker({ "OK" })
}
diff --git a/js/js.translator/testData/box/examples/simplestClosureAndBoxing.kt b/js/js.translator/testData/box/examples/simplestClosureAndBoxing.kt
index 405a391..a63a10c 100644
--- a/js/js.translator/testData/box/examples/simplestClosureAndBoxing.kt
+++ b/js/js.translator/testData/box/examples/simplestClosureAndBoxing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
fun box(): String {
return if (int_invoker({ 7 }) == 7) "OK" else "fail"
}
diff --git a/js/js.translator/testData/box/examples/traitproperty.kt b/js/js.translator/testData/box/examples/traitproperty.kt
index d28f4ad..d303d4c 100644
--- a/js/js.translator/testData/box/examples/traitproperty.kt
+++ b/js/js.translator/testData/box/examples/traitproperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
interface M {
var backingB: Int
var b: Int
diff --git a/js/js.translator/testData/box/expression/cast/castExtensionToKMutableProperty.kt b/js/js.translator/testData/box/expression/cast/castExtensionToKMutableProperty.kt
index 747468a..3b36f43 100644
--- a/js/js.translator/testData/box/expression/cast/castExtensionToKMutableProperty.kt
+++ b/js/js.translator/testData/box/expression/cast/castExtensionToKMutableProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
import kotlin.reflect.KProperty1
diff --git a/js/js.translator/testData/box/expression/cast/castExtensionToKProperty1.kt b/js/js.translator/testData/box/expression/cast/castExtensionToKProperty1.kt
index 78b1385..331c86a 100644
--- a/js/js.translator/testData/box/expression/cast/castExtensionToKProperty1.kt
+++ b/js/js.translator/testData/box/expression/cast/castExtensionToKProperty1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
import kotlin.reflect.KProperty1
diff --git a/js/js.translator/testData/box/expression/cast/castToAny.kt b/js/js.translator/testData/box/expression/cast/castToAny.kt
index 001db3b..a56a889 100644
--- a/js/js.translator/testData/box/expression/cast/castToAny.kt
+++ b/js/js.translator/testData/box/expression/cast/castToAny.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1394
package foo
class A
diff --git a/js/js.translator/testData/box/expression/cast/castToArray.kt b/js/js.translator/testData/box/expression/cast/castToArray.kt
index 5fc4624..72d1cd1 100644
--- a/js/js.translator/testData/box/expression/cast/castToArray.kt
+++ b/js/js.translator/testData/box/expression/cast/castToArray.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/cast/castToFunction.kt b/js/js.translator/testData/box/expression/cast/castToFunction.kt
index 0b242a9..3d19da5 100644
--- a/js/js.translator/testData/box/expression/cast/castToFunction.kt
+++ b/js/js.translator/testData/box/expression/cast/castToFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1388
package foo
fun test(fn: Any?): Function0<Int> =
diff --git a/js/js.translator/testData/box/expression/cast/castToGenericType.kt b/js/js.translator/testData/box/expression/cast/castToGenericType.kt
index eeedc98..f1405ee 100644
--- a/js/js.translator/testData/box/expression/cast/castToGenericType.kt
+++ b/js/js.translator/testData/box/expression/cast/castToGenericType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
class A(val s: String)
diff --git a/js/js.translator/testData/box/expression/cast/castToGenericTypeWithMultipleUpperBounds.kt b/js/js.translator/testData/box/expression/cast/castToGenericTypeWithMultipleUpperBounds.kt
index 1eae9b5..54ff0ee 100644
--- a/js/js.translator/testData/box/expression/cast/castToGenericTypeWithMultipleUpperBounds.kt
+++ b/js/js.translator/testData/box/expression/cast/castToGenericTypeWithMultipleUpperBounds.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 527
+// EXPECTED_REACHABLE_NODES: 1416
package foo
open class A()
diff --git a/js/js.translator/testData/box/expression/cast/castToGenericTypeWithUpperBound.kt b/js/js.translator/testData/box/expression/cast/castToGenericTypeWithUpperBound.kt
index eab48f0..514a737 100644
--- a/js/js.translator/testData/box/expression/cast/castToGenericTypeWithUpperBound.kt
+++ b/js/js.translator/testData/box/expression/cast/castToGenericTypeWithUpperBound.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 523
+// EXPECTED_REACHABLE_NODES: 1410
package foo
open class A
diff --git a/js/js.translator/testData/box/expression/cast/castToKMutableProperty0.kt b/js/js.translator/testData/box/expression/cast/castToKMutableProperty0.kt
index 8b1d3f3..dacbed8 100644
--- a/js/js.translator/testData/box/expression/cast/castToKMutableProperty0.kt
+++ b/js/js.translator/testData/box/expression/cast/castToKMutableProperty0.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
import kotlin.reflect.KProperty0
diff --git a/js/js.translator/testData/box/expression/cast/castToKMutableProperty1.kt b/js/js.translator/testData/box/expression/cast/castToKMutableProperty1.kt
index 5cd194e..50f6cea 100644
--- a/js/js.translator/testData/box/expression/cast/castToKMutableProperty1.kt
+++ b/js/js.translator/testData/box/expression/cast/castToKMutableProperty1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
import kotlin.reflect.KProperty1
diff --git a/js/js.translator/testData/box/expression/cast/castToKProperty0.kt b/js/js.translator/testData/box/expression/cast/castToKProperty0.kt
index 49921e6..9fcc8e5 100644
--- a/js/js.translator/testData/box/expression/cast/castToKProperty0.kt
+++ b/js/js.translator/testData/box/expression/cast/castToKProperty0.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
import kotlin.reflect.KProperty0
diff --git a/js/js.translator/testData/box/expression/cast/castToKProperty1.kt b/js/js.translator/testData/box/expression/cast/castToKProperty1.kt
index d852a8d..f83bd67 100644
--- a/js/js.translator/testData/box/expression/cast/castToKProperty1.kt
+++ b/js/js.translator/testData/box/expression/cast/castToKProperty1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
import kotlin.reflect.KProperty1
diff --git a/js/js.translator/testData/box/expression/cast/castToNotNull.kt b/js/js.translator/testData/box/expression/cast/castToNotNull.kt
index 84f70b2..5dbb676 100644
--- a/js/js.translator/testData/box/expression/cast/castToNotNull.kt
+++ b/js/js.translator/testData/box/expression/cast/castToNotNull.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1393
package foo
interface A
diff --git a/js/js.translator/testData/box/expression/cast/castToNullable.kt b/js/js.translator/testData/box/expression/cast/castToNullable.kt
index e0925cf..db025cd 100644
--- a/js/js.translator/testData/box/expression/cast/castToNullable.kt
+++ b/js/js.translator/testData/box/expression/cast/castToNullable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1392
package foo
interface A
diff --git a/js/js.translator/testData/box/expression/cast/implicitCastToLong.kt b/js/js.translator/testData/box/expression/cast/implicitCastToLong.kt
index 08f7952..fdbdcbd 100644
--- a/js/js.translator/testData/box/expression/cast/implicitCastToLong.kt
+++ b/js/js.translator/testData/box/expression/cast/implicitCastToLong.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/cast/primitiveToClass.kt b/js/js.translator/testData/box/expression/cast/primitiveToClass.kt
index a595be2..31794b4 100644
--- a/js/js.translator/testData/box/expression/cast/primitiveToClass.kt
+++ b/js/js.translator/testData/box/expression/cast/primitiveToClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
interface A
diff --git a/js/js.translator/testData/box/expression/cast/reifiedToNotNull.kt b/js/js.translator/testData/box/expression/cast/reifiedToNotNull.kt
index 2876c24..26964e5 100644
--- a/js/js.translator/testData/box/expression/cast/reifiedToNotNull.kt
+++ b/js/js.translator/testData/box/expression/cast/reifiedToNotNull.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
// CHECK_NOT_CALLED: test
diff --git a/js/js.translator/testData/box/expression/cast/reifiedToNullable1.kt b/js/js.translator/testData/box/expression/cast/reifiedToNullable1.kt
index a67ab71..b7d6207 100644
--- a/js/js.translator/testData/box/expression/cast/reifiedToNullable1.kt
+++ b/js/js.translator/testData/box/expression/cast/reifiedToNullable1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
interface A
diff --git a/js/js.translator/testData/box/expression/cast/reifiedToNullable2.kt b/js/js.translator/testData/box/expression/cast/reifiedToNullable2.kt
index 6e853b3..13f8d8b 100644
--- a/js/js.translator/testData/box/expression/cast/reifiedToNullable2.kt
+++ b/js/js.translator/testData/box/expression/cast/reifiedToNullable2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
interface A
diff --git a/js/js.translator/testData/box/expression/cast/safeCastToGenericTypeWithUpperBound.kt b/js/js.translator/testData/box/expression/cast/safeCastToGenericTypeWithUpperBound.kt
index 8664def..fe97cde 100644
--- a/js/js.translator/testData/box/expression/cast/safeCastToGenericTypeWithUpperBound.kt
+++ b/js/js.translator/testData/box/expression/cast/safeCastToGenericTypeWithUpperBound.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 513
+// EXPECTED_REACHABLE_NODES: 1400
package foo
open class A
diff --git a/js/js.translator/testData/box/expression/cast/safeCastToNotNull.kt b/js/js.translator/testData/box/expression/cast/safeCastToNotNull.kt
index cc32b1e..f7164f7 100644
--- a/js/js.translator/testData/box/expression/cast/safeCastToNotNull.kt
+++ b/js/js.translator/testData/box/expression/cast/safeCastToNotNull.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A
diff --git a/js/js.translator/testData/box/expression/cast/safeCastToNullable.kt b/js/js.translator/testData/box/expression/cast/safeCastToNullable.kt
index 24a3cdc..ddd4a9c 100644
--- a/js/js.translator/testData/box/expression/cast/safeCastToNullable.kt
+++ b/js/js.translator/testData/box/expression/cast/safeCastToNullable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A
diff --git a/js/js.translator/testData/box/expression/cast/safeCastToReifiedNotNull.kt b/js/js.translator/testData/box/expression/cast/safeCastToReifiedNotNull.kt
index e3ef66f..527192b 100644
--- a/js/js.translator/testData/box/expression/cast/safeCastToReifiedNotNull.kt
+++ b/js/js.translator/testData/box/expression/cast/safeCastToReifiedNotNull.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_NOT_CALLED: castTo
diff --git a/js/js.translator/testData/box/expression/cast/safeCastToReifiedNullable.kt b/js/js.translator/testData/box/expression/cast/safeCastToReifiedNullable.kt
index 6925a01..32436ab 100644
--- a/js/js.translator/testData/box/expression/cast/safeCastToReifiedNullable.kt
+++ b/js/js.translator/testData/box/expression/cast/safeCastToReifiedNullable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_NOT_CALLED: castTo
diff --git a/js/js.translator/testData/box/expression/cast/smartCastInExtensionFunction.kt b/js/js.translator/testData/box/expression/cast/smartCastInExtensionFunction.kt
index fc16d22..30c6440 100644
--- a/js/js.translator/testData/box/expression/cast/smartCastInExtensionFunction.kt
+++ b/js/js.translator/testData/box/expression/cast/smartCastInExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/cast/smartCastInFunction.kt b/js/js.translator/testData/box/expression/cast/smartCastInFunction.kt
index fdd5c62..daa3aa2 100644
--- a/js/js.translator/testData/box/expression/cast/smartCastInFunction.kt
+++ b/js/js.translator/testData/box/expression/cast/smartCastInFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/compareTo/booleanCompareTo.kt b/js/js.translator/testData/box/expression/compareTo/booleanCompareTo.kt
index 2cdeabe..0da0358 100644
--- a/js/js.translator/testData/box/expression/compareTo/booleanCompareTo.kt
+++ b/js/js.translator/testData/box/expression/compareTo/booleanCompareTo.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
fun box(): String {
val r1 = trueFun() > falseFun()
if (!r1) return "fail1"
diff --git a/js/js.translator/testData/box/expression/compareTo/customCompareToMethod.kt b/js/js.translator/testData/box/expression/compareTo/customCompareToMethod.kt
index efcfa59..bf67584 100644
--- a/js/js.translator/testData/box/expression/compareTo/customCompareToMethod.kt
+++ b/js/js.translator/testData/box/expression/compareTo/customCompareToMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class A(val value: Int) : Comparable<A> {
diff --git a/js/js.translator/testData/box/expression/dollarParameter/dollarParameter.kt b/js/js.translator/testData/box/expression/dollarParameter/dollarParameter.kt
index 3c94255..1bfabf3 100644
--- a/js/js.translator/testData/box/expression/dollarParameter/dollarParameter.kt
+++ b/js/js.translator/testData/box/expression/dollarParameter/dollarParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun MyController(`$scope`: String): String {
diff --git a/js/js.translator/testData/box/expression/equals/arrays.kt b/js/js.translator/testData/box/expression/equals/arrays.kt
index ebc916b..66c3f78 100644
--- a/js/js.translator/testData/box/expression/equals/arrays.kt
+++ b/js/js.translator/testData/box/expression/equals/arrays.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/equals/compareNullableListWithNull.kt b/js/js.translator/testData/box/expression/equals/compareNullableListWithNull.kt
index f4f2f93..d0e323e 100644
--- a/js/js.translator/testData/box/expression/equals/compareNullableListWithNull.kt
+++ b/js/js.translator/testData/box/expression/equals/compareNullableListWithNull.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 888
+// EXPECTED_REACHABLE_NODES: 1376
// KT-3518 Null pointer during null comparison in JS Backend
package foo
diff --git a/js/js.translator/testData/box/expression/equals/compareNullablesWithCustomEquals.kt b/js/js.translator/testData/box/expression/equals/compareNullablesWithCustomEquals.kt
index 62eaf33..1d8697d 100644
--- a/js/js.translator/testData/box/expression/equals/compareNullablesWithCustomEquals.kt
+++ b/js/js.translator/testData/box/expression/equals/compareNullablesWithCustomEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 524
+// EXPECTED_REACHABLE_NODES: 1411
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/equals/compareToNullWithCustomEquals.kt b/js/js.translator/testData/box/expression/equals/compareToNullWithCustomEquals.kt
index 000a186..a32b54b 100644
--- a/js/js.translator/testData/box/expression/equals/compareToNullWithCustomEquals.kt
+++ b/js/js.translator/testData/box/expression/equals/compareToNullWithCustomEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/equals/customEqualsMethod.kt b/js/js.translator/testData/box/expression/equals/customEqualsMethod.kt
index b989f32..ef65f85 100644
--- a/js/js.translator/testData/box/expression/equals/customEqualsMethod.kt
+++ b/js/js.translator/testData/box/expression/equals/customEqualsMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class Foo(val name: String) {
diff --git a/js/js.translator/testData/box/expression/equals/customEqualsMethodOnAny.kt b/js/js.translator/testData/box/expression/equals/customEqualsMethodOnAny.kt
index e9bc818..f5e3035 100644
--- a/js/js.translator/testData/box/expression/equals/customEqualsMethodOnAny.kt
+++ b/js/js.translator/testData/box/expression/equals/customEqualsMethodOnAny.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class Foo(val name: String) {
diff --git a/js/js.translator/testData/box/expression/equals/equalsBehaviorOnNull.kt b/js/js.translator/testData/box/expression/equals/equalsBehaviorOnNull.kt
index bdd64f3..5824659 100644
--- a/js/js.translator/testData/box/expression/equals/equalsBehaviorOnNull.kt
+++ b/js/js.translator/testData/box/expression/equals/equalsBehaviorOnNull.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
var log = ""
diff --git a/js/js.translator/testData/box/expression/equals/equalsNullOrUndefined.kt b/js/js.translator/testData/box/expression/equals/equalsNullOrUndefined.kt
index 800d788..8401111 100644
--- a/js/js.translator/testData/box/expression/equals/equalsNullOrUndefined.kt
+++ b/js/js.translator/testData/box/expression/equals/equalsNullOrUndefined.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/equals/explicitEqualsMethod.kt b/js/js.translator/testData/box/expression/equals/explicitEqualsMethod.kt
index 9f97f2a..7c27808 100644
--- a/js/js.translator/testData/box/expression/equals/explicitEqualsMethod.kt
+++ b/js/js.translator/testData/box/expression/equals/explicitEqualsMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Foo(val name: String) {
diff --git a/js/js.translator/testData/box/expression/equals/explicitEqualsMethodForPrimitives.kt b/js/js.translator/testData/box/expression/equals/explicitEqualsMethodForPrimitives.kt
index aa9a4e3..08cccd0 100644
--- a/js/js.translator/testData/box/expression/equals/explicitEqualsMethodForPrimitives.kt
+++ b/js/js.translator/testData/box/expression/equals/explicitEqualsMethodForPrimitives.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/equals/kt2370.kt b/js/js.translator/testData/box/expression/equals/kt2370.kt
index e6f27f6..4595b63 100644
--- a/js/js.translator/testData/box/expression/equals/kt2370.kt
+++ b/js/js.translator/testData/box/expression/equals/kt2370.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/equals/stringsEqual.kt b/js/js.translator/testData/box/expression/equals/stringsEqual.kt
index 2fec1c2..56c190f 100644
--- a/js/js.translator/testData/box/expression/equals/stringsEqual.kt
+++ b/js/js.translator/testData/box/expression/equals/stringsEqual.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/equals/superEquals.kt b/js/js.translator/testData/box/expression/equals/superEquals.kt
index afbe151..57fe302 100644
--- a/js/js.translator/testData/box/expression/equals/superEquals.kt
+++ b/js/js.translator/testData/box/expression/equals/superEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 515
+// EXPECTED_REACHABLE_NODES: 1402
package foo
open class A {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/2dangerousInExpression.kt b/js/js.translator/testData/box/expression/evaluationOrder/2dangerousInExpression.kt
index b9b0b26..3604ade 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/2dangerousInExpression.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/2dangerousInExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/andAndWithBreakContinueReturn.kt b/js/js.translator/testData/box/expression/evaluationOrder/andAndWithBreakContinueReturn.kt
index 84b12ebb..bfde8ff 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/andAndWithBreakContinueReturn.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/andAndWithBreakContinueReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/andAndWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/andAndWithSideEffect.kt
index ce66a4c..79c81c1 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/andAndWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/andAndWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/andAndWithTmpVarRhs.kt b/js/js.translator/testData/box/expression/evaluationOrder/andAndWithTmpVarRhs.kt
index 6d43b38..d111b94 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/andAndWithTmpVarRhs.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/andAndWithTmpVarRhs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 894
+// EXPECTED_REACHABLE_NODES: 1377
fun foo(arg: Any): Boolean {
return arg == "x"
}
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/assignToArrayElementWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/assignToArrayElementWithSideEffect.kt
index 08c731d..e440403 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/assignToArrayElementWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/assignToArrayElementWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/assignToDotQualifiedWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/assignToDotQualifiedWithSideEffect.kt
index eff4c60..afa17d5 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/assignToDotQualifiedWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/assignToDotQualifiedWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/callArgs.kt b/js/js.translator/testData/box/expression/evaluationOrder/callArgs.kt
index c507c17..86126e1 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/callArgs.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/callArgs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
var global = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/callVarargs.kt b/js/js.translator/testData/box/expression/evaluationOrder/callVarargs.kt
index ae7c208..ac421c8 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/callVarargs.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/callVarargs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/callWithBreakContinueReturn.kt b/js/js.translator/testData/box/expression/evaluationOrder/callWithBreakContinueReturn.kt
index 73efb0e..fb880ff 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/callWithBreakContinueReturn.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/callWithBreakContinueReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/castWithBreakContinueReturn.kt b/js/js.translator/testData/box/expression/evaluationOrder/castWithBreakContinueReturn.kt
index b55b3e2..1d66bde 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/castWithBreakContinueReturn.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/castWithBreakContinueReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
package foo
fun castWithReturn(): Int {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/compareToIntrinsicWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/compareToIntrinsicWithSideEffect.kt
index 84312ff..aa934d4 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/compareToIntrinsicWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/compareToIntrinsicWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt b/js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt
index ed9e8f5..ac656b3 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
var i = 0
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt b/js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt
index 797a412..5e3a035 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/elvisComplex.kt b/js/js.translator/testData/box/expression/evaluationOrder/elvisComplex.kt
index d7a6dfd..3f4b5b2 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/elvisComplex.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/elvisComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
var sideEffect: Int = 0;
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/elvisWithBreakContinueReturn.kt b/js/js.translator/testData/box/expression/evaluationOrder/elvisWithBreakContinueReturn.kt
index e0d5acd..c0203ee 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/elvisWithBreakContinueReturn.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/elvisWithBreakContinueReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
class A
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/equalsIntrinsicWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/equalsIntrinsicWithSideEffect.kt
index c03c6f6..f5cd045 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/equalsIntrinsicWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/equalsIntrinsicWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder1.kt b/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder1.kt
index 15625de..b33e923 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder1.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
var d = 0
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder2.kt b/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder2.kt
index 407bba3..ac84988 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder2.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// Order of evaluation differs for JVM and Javascript backend
// http://youtrack.jetbrains.com/issue/KT-5254
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/ifAsFunArgument.kt b/js/js.translator/testData/box/expression/evaluationOrder/ifAsFunArgument.kt
index fbeafdd..1754a9a 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/ifAsFunArgument.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/ifAsFunArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/ifAsPlusArgument.kt b/js/js.translator/testData/box/expression/evaluationOrder/ifAsPlusArgument.kt
index 70512c6..af5ed4b 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/ifAsPlusArgument.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/ifAsPlusArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/ifWithComplex.kt b/js/js.translator/testData/box/expression/evaluationOrder/ifWithComplex.kt
index 7912c66..81fe3d7 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/ifWithComplex.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/ifWithComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var sideEffect: Int = 0;
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/intrinsicComplex.kt b/js/js.translator/testData/box/expression/evaluationOrder/intrinsicComplex.kt
index ace56b9..324399a 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/intrinsicComplex.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/intrinsicComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/intrinsicWithBreakContinueReturn.kt b/js/js.translator/testData/box/expression/evaluationOrder/intrinsicWithBreakContinueReturn.kt
index 1989e17..0a15707 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/intrinsicWithBreakContinueReturn.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/intrinsicWithBreakContinueReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/literalFunctionAsArgumentWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/literalFunctionAsArgumentWithSideEffect.kt
index b9327f6..dfc5c05 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/literalFunctionAsArgumentWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/literalFunctionAsArgumentWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
// http://youtrack.jetbrains.com/issue/KT-4225
// Compiler to JavaScript produces semantically wrong code
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/loopWithBreakContinueReturnInCondition.kt b/js/js.translator/testData/box/expression/evaluationOrder/loopWithBreakContinueReturnInCondition.kt
index e4dc59e..ca75b6f 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/loopWithBreakContinueReturnInCondition.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/loopWithBreakContinueReturnInCondition.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/orOrWithBreakContinueReturn.kt b/js/js.translator/testData/box/expression/evaluationOrder/orOrWithBreakContinueReturn.kt
index b352d51..6578567 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/orOrWithBreakContinueReturn.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/orOrWithBreakContinueReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/orOrWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/orOrWithSideEffect.kt
index 66612e4..84d27d9 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/orOrWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/orOrWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/reassignmentLhsCaching.kt b/js/js.translator/testData/box/expression/evaluationOrder/reassignmentLhsCaching.kt
index 8669cb2..8bc56f8 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/reassignmentLhsCaching.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/reassignmentLhsCaching.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1394
package foo
var log = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/secondaryConstructorTemporaryVars.kt b/js/js.translator/testData/box/expression/evaluationOrder/secondaryConstructorTemporaryVars.kt
index 17e50c9..c2d2eff 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/secondaryConstructorTemporaryVars.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/secondaryConstructorTemporaryVars.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
// HAS_NO_CAPTURED_VARS: function=A_init except=Kotlin;A
class A() {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/whenAsMinusArgument.kt b/js/js.translator/testData/box/expression/evaluationOrder/whenAsMinusArgument.kt
index 9a5d24b..928696b 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/whenAsMinusArgument.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/whenAsMinusArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/whenJsLiteralWithSideEffect.kt b/js/js.translator/testData/box/expression/evaluationOrder/whenJsLiteralWithSideEffect.kt
index c15bda9..7c3c734 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/whenJsLiteralWithSideEffect.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/whenJsLiteralWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/evaluationOrder/whenWithComplexConditions.kt b/js/js.translator/testData/box/expression/evaluationOrder/whenWithComplexConditions.kt
index 23e3289..d768338 100644
--- a/js/js.translator/testData/box/expression/evaluationOrder/whenWithComplexConditions.kt
+++ b/js/js.translator/testData/box/expression/evaluationOrder/whenWithComplexConditions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/for/forIteratesOverArray.kt b/js/js.translator/testData/box/expression/for/forIteratesOverArray.kt
index f69ae18..6cf0ba7 100644
--- a/js/js.translator/testData/box/expression/for/forIteratesOverArray.kt
+++ b/js/js.translator/testData/box/expression/for/forIteratesOverArray.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
val a1 = arrayOfNulls<Int>(10)
diff --git a/js/js.translator/testData/box/expression/for/forIteratesOverLiteralRange.kt b/js/js.translator/testData/box/expression/for/forIteratesOverLiteralRange.kt
index 488e1a3..b05cb74 100644
--- a/js/js.translator/testData/box/expression/for/forIteratesOverLiteralRange.kt
+++ b/js/js.translator/testData/box/expression/for/forIteratesOverLiteralRange.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/for/forIteratesOverNonLiteralRange.kt b/js/js.translator/testData/box/expression/for/forIteratesOverNonLiteralRange.kt
index b02d6fe..cec2723 100644
--- a/js/js.translator/testData/box/expression/for/forIteratesOverNonLiteralRange.kt
+++ b/js/js.translator/testData/box/expression/for/forIteratesOverNonLiteralRange.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/for/forIteratesOverSomethingWithIterator.kt b/js/js.translator/testData/box/expression/for/forIteratesOverSomethingWithIterator.kt
index ef0cdbe..70b5e32 100644
--- a/js/js.translator/testData/box/expression/for/forIteratesOverSomethingWithIterator.kt
+++ b/js/js.translator/testData/box/expression/for/forIteratesOverSomethingWithIterator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class Iter(val upper: Int) {
diff --git a/js/js.translator/testData/box/expression/for/forIteratesOverTypeParameter.kt b/js/js.translator/testData/box/expression/for/forIteratesOverTypeParameter.kt
index cdecbab..850b340 100644
--- a/js/js.translator/testData/box/expression/for/forIteratesOverTypeParameter.kt
+++ b/js/js.translator/testData/box/expression/for/forIteratesOverTypeParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 890
+// EXPECTED_REACHABLE_NODES: 1378
public fun <T, C : Collection<T>> bar(collection: C, f: (T) -> Unit) { for (item in collection) f(item) }
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/for/forOnEmptyArray.kt b/js/js.translator/testData/box/expression/for/forOnEmptyArray.kt
index dbf14d1c..53f3894 100644
--- a/js/js.translator/testData/box/expression/for/forOnEmptyArray.kt
+++ b/js/js.translator/testData/box/expression/for/forOnEmptyArray.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
val a1 = arrayOfNulls<Int>(0)
diff --git a/js/js.translator/testData/box/expression/for/forWithComplexOneStatement.kt b/js/js.translator/testData/box/expression/for/forWithComplexOneStatement.kt
index 488bf2c..7e03e0b 100644
--- a/js/js.translator/testData/box/expression/for/forWithComplexOneStatement.kt
+++ b/js/js.translator/testData/box/expression/for/forWithComplexOneStatement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/for/forWithEmptyBody.kt b/js/js.translator/testData/box/expression/for/forWithEmptyBody.kt
index dcf3c9a..faef219 100644
--- a/js/js.translator/testData/box/expression/for/forWithEmptyBody.kt
+++ b/js/js.translator/testData/box/expression/for/forWithEmptyBody.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/for/forWithSideEffectImElementAccessAndWithEmptyBody.kt b/js/js.translator/testData/box/expression/for/forWithSideEffectImElementAccessAndWithEmptyBody.kt
index a1d28af..a388ee4 100644
--- a/js/js.translator/testData/box/expression/for/forWithSideEffectImElementAccessAndWithEmptyBody.kt
+++ b/js/js.translator/testData/box/expression/for/forWithSideEffectImElementAccessAndWithEmptyBody.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
var log = ""
diff --git a/js/js.translator/testData/box/expression/for/labeledFor.kt b/js/js.translator/testData/box/expression/for/labeledFor.kt
index d4395b3..03f5b414 100644
--- a/js/js.translator/testData/box/expression/for/labeledFor.kt
+++ b/js/js.translator/testData/box/expression/for/labeledFor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
val a1 = arrayOfNulls<Int>(0)
diff --git a/js/js.translator/testData/box/expression/for/labeledForWithContinue.kt b/js/js.translator/testData/box/expression/for/labeledForWithContinue.kt
index 546f2d5b..3906f47 100644
--- a/js/js.translator/testData/box/expression/for/labeledForWithContinue.kt
+++ b/js/js.translator/testData/box/expression/for/labeledForWithContinue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// http://youtrack.jetbrains.com/issue/KT-5257
// JS: for with continue with label fails on runtime
diff --git a/js/js.translator/testData/box/expression/for/labeledForWithWhile.kt b/js/js.translator/testData/box/expression/for/labeledForWithWhile.kt
index 445a12d..319fc84 100644
--- a/js/js.translator/testData/box/expression/for/labeledForWithWhile.kt
+++ b/js/js.translator/testData/box/expression/for/labeledForWithWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/KT-921.kt b/js/js.translator/testData/box/expression/function/KT-921.kt
index 70c845e..bfbb7c4 100644
--- a/js/js.translator/testData/box/expression/function/KT-921.kt
+++ b/js/js.translator/testData/box/expression/function/KT-921.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 905
+// EXPECTED_REACHABLE_NODES: 1393
var log = ""
diff --git a/js/js.translator/testData/box/expression/function/adderClosure.kt b/js/js.translator/testData/box/expression/function/adderClosure.kt
index f9a68df..3ffd73e 100644
--- a/js/js.translator/testData/box/expression/function/adderClosure.kt
+++ b/js/js.translator/testData/box/expression/function/adderClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/anonymousWithLambda.kt b/js/js.translator/testData/box/expression/function/anonymousWithLambda.kt
index 9c87970..9cc331c 100644
--- a/js/js.translator/testData/box/expression/function/anonymousWithLambda.kt
+++ b/js/js.translator/testData/box/expression/function/anonymousWithLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
fun box(): String {
val a = (fun(): String {
val o = { "O" }
diff --git a/js/js.translator/testData/box/expression/function/callFunInInit.kt b/js/js.translator/testData/box/expression/function/callFunInInit.kt
index 8e7cb3f..edee13a 100644
--- a/js/js.translator/testData/box/expression/function/callFunInInit.kt
+++ b/js/js.translator/testData/box/expression/function/callFunInInit.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A()
diff --git a/js/js.translator/testData/box/expression/function/closureWithParameter.kt b/js/js.translator/testData/box/expression/function/closureWithParameter.kt
index 3b1f8db..99e6f0d 100644
--- a/js/js.translator/testData/box/expression/function/closureWithParameter.kt
+++ b/js/js.translator/testData/box/expression/function/closureWithParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/closureWithParameterAndBoxing.kt b/js/js.translator/testData/box/expression/function/closureWithParameterAndBoxing.kt
index 23063ed..73fc4da 100644
--- a/js/js.translator/testData/box/expression/function/closureWithParameterAndBoxing.kt
+++ b/js/js.translator/testData/box/expression/function/closureWithParameterAndBoxing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/defaultParameters.kt b/js/js.translator/testData/box/expression/function/defaultParameters.kt
index 359a1be..fdd8c6d 100644
--- a/js/js.translator/testData/box/expression/function/defaultParameters.kt
+++ b/js/js.translator/testData/box/expression/function/defaultParameters.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun f(a: Int = 2, b: Int = 3) = a + b
diff --git a/js/js.translator/testData/box/expression/function/enclosingThis.kt b/js/js.translator/testData/box/expression/function/enclosingThis.kt
index 6b489a3..b2c7812 100644
--- a/js/js.translator/testData/box/expression/function/enclosingThis.kt
+++ b/js/js.translator/testData/box/expression/function/enclosingThis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Point(val x: Int, val y: Int) {
diff --git a/js/js.translator/testData/box/expression/function/expressionAsExtFunction.kt b/js/js.translator/testData/box/expression/function/expressionAsExtFunction.kt
index 6e1d5b2..ba644fc 100644
--- a/js/js.translator/testData/box/expression/function/expressionAsExtFunction.kt
+++ b/js/js.translator/testData/box/expression/function/expressionAsExtFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/expressionAsFunction.kt b/js/js.translator/testData/box/expression/function/expressionAsFunction.kt
index 28105f6..111c91c 100644
--- a/js/js.translator/testData/box/expression/function/expressionAsFunction.kt
+++ b/js/js.translator/testData/box/expression/function/expressionAsFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 896
+// EXPECTED_REACHABLE_NODES: 1384
package foo
diff --git a/js/js.translator/testData/box/expression/function/functionExpression.kt b/js/js.translator/testData/box/expression/function/functionExpression.kt
index 235d414..3dfdd4e 100644
--- a/js/js.translator/testData/box/expression/function/functionExpression.kt
+++ b/js/js.translator/testData/box/expression/function/functionExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
fun Any.foo1(): () -> String {
diff --git a/js/js.translator/testData/box/expression/function/functionInsideFunction.kt b/js/js.translator/testData/box/expression/function/functionInsideFunction.kt
index db63bff..c9f3ce0 100644
--- a/js/js.translator/testData/box/expression/function/functionInsideFunction.kt
+++ b/js/js.translator/testData/box/expression/function/functionInsideFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
diff --git a/js/js.translator/testData/box/expression/function/functionLiteral.kt b/js/js.translator/testData/box/expression/function/functionLiteral.kt
index bb41be5..15f786d 100644
--- a/js/js.translator/testData/box/expression/function/functionLiteral.kt
+++ b/js/js.translator/testData/box/expression/function/functionLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/functionLiteralAsLastParameter.kt b/js/js.translator/testData/box/expression/function/functionLiteralAsLastParameter.kt
index be7d4f9..b4dfc02 100644
--- a/js/js.translator/testData/box/expression/function/functionLiteralAsLastParameter.kt
+++ b/js/js.translator/testData/box/expression/function/functionLiteralAsLastParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun f(a: (Int) -> Int) = a(1)
diff --git a/js/js.translator/testData/box/expression/function/functionLiteralAsParameter.kt b/js/js.translator/testData/box/expression/function/functionLiteralAsParameter.kt
index 24ce9e1..cfee7a3 100644
--- a/js/js.translator/testData/box/expression/function/functionLiteralAsParameter.kt
+++ b/js/js.translator/testData/box/expression/function/functionLiteralAsParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun apply(f: (Int) -> Int, t: Int): Int {
diff --git a/js/js.translator/testData/box/expression/function/functionUsedBeforeDeclaration.kt b/js/js.translator/testData/box/expression/function/functionUsedBeforeDeclaration.kt
index 33f0f6a..0733957 100644
--- a/js/js.translator/testData/box/expression/function/functionUsedBeforeDeclaration.kt
+++ b/js/js.translator/testData/box/expression/function/functionUsedBeforeDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/expression/function/functionWithTwoParametersCall.kt b/js/js.translator/testData/box/expression/function/functionWithTwoParametersCall.kt
index 765ba58..8c64ff4 100644
--- a/js/js.translator/testData/box/expression/function/functionWithTwoParametersCall.kt
+++ b/js/js.translator/testData/box/expression/function/functionWithTwoParametersCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun sum(param1: Int, param2: Int): Int {
diff --git a/js/js.translator/testData/box/expression/function/implicitItParameter.kt b/js/js.translator/testData/box/expression/function/implicitItParameter.kt
index ae38bd8..f1242d8 100644
--- a/js/js.translator/testData/box/expression/function/implicitItParameter.kt
+++ b/js/js.translator/testData/box/expression/function/implicitItParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun test(f: (Int) -> Boolean, p: Int) = f(p)
diff --git a/js/js.translator/testData/box/expression/function/lambdaOrLocalFunInsideEnumMethod.kt b/js/js.translator/testData/box/expression/function/lambdaOrLocalFunInsideEnumMethod.kt
index 98109b5..6c4632d 100644
--- a/js/js.translator/testData/box/expression/function/lambdaOrLocalFunInsideEnumMethod.kt
+++ b/js/js.translator/testData/box/expression/function/lambdaOrLocalFunInsideEnumMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 524
+// EXPECTED_REACHABLE_NODES: 1391
package foo
enum class Foo {
diff --git a/js/js.translator/testData/box/expression/function/localExtFunction.kt b/js/js.translator/testData/box/expression/function/localExtFunction.kt
index 2ca54cf..ba98ed4 100644
--- a/js/js.translator/testData/box/expression/function/localExtFunction.kt
+++ b/js/js.translator/testData/box/expression/function/localExtFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/function/localInInitBlock.kt b/js/js.translator/testData/box/expression/function/localInInitBlock.kt
index 0fda3ae..be6ad38 100644
--- a/js/js.translator/testData/box/expression/function/localInInitBlock.kt
+++ b/js/js.translator/testData/box/expression/function/localInInitBlock.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/function/loopClosure.kt b/js/js.translator/testData/box/expression/function/loopClosure.kt
index ed9a5ff..e8d473f 100644
--- a/js/js.translator/testData/box/expression/function/loopClosure.kt
+++ b/js/js.translator/testData/box/expression/function/loopClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
var b = 0
diff --git a/js/js.translator/testData/box/expression/function/manglingAnyMethods.kt b/js/js.translator/testData/box/expression/function/manglingAnyMethods.kt
index 1f0c641..1cf2ef9 100644
--- a/js/js.translator/testData/box/expression/function/manglingAnyMethods.kt
+++ b/js/js.translator/testData/box/expression/function/manglingAnyMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 540
+// EXPECTED_REACHABLE_NODES: 1429
package foo
public class PublicClass {
diff --git a/js/js.translator/testData/box/expression/function/manglingClashWithFunctionsWithoutParameters.kt b/js/js.translator/testData/box/expression/function/manglingClashWithFunctionsWithoutParameters.kt
index 85d547f..24e5f4f 100644
--- a/js/js.translator/testData/box/expression/function/manglingClashWithFunctionsWithoutParameters.kt
+++ b/js/js.translator/testData/box/expression/function/manglingClashWithFunctionsWithoutParameters.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1400
package foo
fun foo(i: Int): String = "foo" + i
diff --git a/js/js.translator/testData/box/expression/function/manglingStability.kt b/js/js.translator/testData/box/expression/function/manglingStability.kt
index a27c255..e54dce8 100644
--- a/js/js.translator/testData/box/expression/function/manglingStability.kt
+++ b/js/js.translator/testData/box/expression/function/manglingStability.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 542
+// EXPECTED_REACHABLE_NODES: 1431
package foo
diff --git a/js/js.translator/testData/box/expression/function/namedArguments.kt b/js/js.translator/testData/box/expression/function/namedArguments.kt
index 71c66bbb..b247b0d 100644
--- a/js/js.translator/testData/box/expression/function/namedArguments.kt
+++ b/js/js.translator/testData/box/expression/function/namedArguments.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun test(x: Int, y: Int) = y - x
diff --git a/js/js.translator/testData/box/expression/function/overloadClassConstructorByFactoryMethod.kt b/js/js.translator/testData/box/expression/function/overloadClassConstructorByFactoryMethod.kt
index 400f346..42b6f8a 100644
--- a/js/js.translator/testData/box/expression/function/overloadClassConstructorByFactoryMethod.kt
+++ b/js/js.translator/testData/box/expression/function/overloadClassConstructorByFactoryMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// KT-2995 creating factory methods to simulate overloaded constructors don't work in JavaScript
package foo
diff --git a/js/js.translator/testData/box/expression/function/overloadOverridenFun.kt b/js/js.translator/testData/box/expression/function/overloadOverridenFun.kt
index 8bdc88b..5416b9f 100644
--- a/js/js.translator/testData/box/expression/function/overloadOverridenFun.kt
+++ b/js/js.translator/testData/box/expression/function/overloadOverridenFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// KT-2219 if function overload overridden function its name doesn't translated correctly
package foo
diff --git a/js/js.translator/testData/box/expression/function/overloadingWithInheritance.kt b/js/js.translator/testData/box/expression/function/overloadingWithInheritance.kt
index b9906b4..6391cb5 100644
--- a/js/js.translator/testData/box/expression/function/overloadingWithInheritance.kt
+++ b/js/js.translator/testData/box/expression/function/overloadingWithInheritance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
interface A {
diff --git a/js/js.translator/testData/box/expression/function/vararg.kt b/js/js.translator/testData/box/expression/function/vararg.kt
index d47775f..5d8c9df 100644
--- a/js/js.translator/testData/box/expression/function/vararg.kt
+++ b/js/js.translator/testData/box/expression/function/vararg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 523
+// EXPECTED_REACHABLE_NODES: 1410
package foo
fun testSize(expectedSize: Int, vararg i: Int): Boolean {
diff --git a/js/js.translator/testData/box/expression/function/whenFunction.kt b/js/js.translator/testData/box/expression/function/whenFunction.kt
index 7e1fd1e..fec5d9f 100644
--- a/js/js.translator/testData/box/expression/function/whenFunction.kt
+++ b/js/js.translator/testData/box/expression/function/whenFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun foo(a: Int): Int = when {
diff --git a/js/js.translator/testData/box/expression/identifierClash/overloadedFun.kt b/js/js.translator/testData/box/expression/identifierClash/overloadedFun.kt
index 770682b..6cc96f9 100644
--- a/js/js.translator/testData/box/expression/identifierClash/overloadedFun.kt
+++ b/js/js.translator/testData/box/expression/identifierClash/overloadedFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
abstract class B {
diff --git a/js/js.translator/testData/box/expression/identifierClash/useVariableOfNameOfFunction.kt b/js/js.translator/testData/box/expression/identifierClash/useVariableOfNameOfFunction.kt
index 2fd975c..89e3408 100644
--- a/js/js.translator/testData/box/expression/identifierClash/useVariableOfNameOfFunction.kt
+++ b/js/js.translator/testData/box/expression/identifierClash/useVariableOfNameOfFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethod.kt b/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethod.kt
index 9d9b51b..564ab71 100644
--- a/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethod.kt
+++ b/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class X
diff --git a/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethodForPrimitives.kt b/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethodForPrimitives.kt
index f584564..2e39580 100644
--- a/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethodForPrimitives.kt
+++ b/js/js.translator/testData/box/expression/identityEquals/identityEqualsMethodForPrimitives.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/if/ifElseAsExpressionWithThrow.kt b/js/js.translator/testData/box/expression/if/ifElseAsExpressionWithThrow.kt
index 07b38e3..b19c8d4 100644
--- a/js/js.translator/testData/box/expression/if/ifElseAsExpressionWithThrow.kt
+++ b/js/js.translator/testData/box/expression/if/ifElseAsExpressionWithThrow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/if/ifInsideLambda.kt b/js/js.translator/testData/box/expression/if/ifInsideLambda.kt
index 38946c7..865a809 100644
--- a/js/js.translator/testData/box/expression/if/ifInsideLambda.kt
+++ b/js/js.translator/testData/box/expression/if/ifInsideLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
// http://youtrack.jetbrains.com/issue/KT-5594
// JS: compiler crashes
diff --git a/js/js.translator/testData/box/expression/if/nestedIf.kt b/js/js.translator/testData/box/expression/if/nestedIf.kt
index d5a798d..de1bd47 100644
--- a/js/js.translator/testData/box/expression/if/nestedIf.kt
+++ b/js/js.translator/testData/box/expression/if/nestedIf.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// JS: generate wrong code for nested if
// http://youtrack.jetbrains.com/issue/KT-5576
diff --git a/js/js.translator/testData/box/expression/if/withEmptyBlocks.kt b/js/js.translator/testData/box/expression/if/withEmptyBlocks.kt
index b2fdda2..770012e 100644
--- a/js/js.translator/testData/box/expression/if/withEmptyBlocks.kt
+++ b/js/js.translator/testData/box/expression/if/withEmptyBlocks.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/invoke/explicitInvokeLambda.kt b/js/js.translator/testData/box/expression/invoke/explicitInvokeLambda.kt
index aea374a..33e5448 100644
--- a/js/js.translator/testData/box/expression/invoke/explicitInvokeLambda.kt
+++ b/js/js.translator/testData/box/expression/invoke/explicitInvokeLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/invoke/extensionInvoke.kt b/js/js.translator/testData/box/expression/invoke/extensionInvoke.kt
index dacbb8b..485f430 100644
--- a/js/js.translator/testData/box/expression/invoke/extensionInvoke.kt
+++ b/js/js.translator/testData/box/expression/invoke/extensionInvoke.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1386
package foo
class A(val f: (B.() -> Int)?)
diff --git a/js/js.translator/testData/box/expression/invoke/inheritFromFunctionTraits.kt b/js/js.translator/testData/box/expression/invoke/inheritFromFunctionTraits.kt
index 5c851d3..db2cf12 100644
--- a/js/js.translator/testData/box/expression/invoke/inheritFromFunctionTraits.kt
+++ b/js/js.translator/testData/box/expression/invoke/inheritFromFunctionTraits.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
/**
* NOTE: this test originally checked that values of classes inheriting from functions could be invoked as functions.
* However, Function{n} / ExtensionFunction{n} classes were incompatible with JS functions our lambdas were compiled to.
diff --git a/js/js.translator/testData/box/expression/invoke/internalFunctionFromSuperclass.kt b/js/js.translator/testData/box/expression/invoke/internalFunctionFromSuperclass.kt
index 02207b7..4aaa0a5 100644
--- a/js/js.translator/testData/box/expression/invoke/internalFunctionFromSuperclass.kt
+++ b/js/js.translator/testData/box/expression/invoke/internalFunctionFromSuperclass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
abstract class A {
final internal fun foo() = "OK"
}
diff --git a/js/js.translator/testData/box/expression/invoke/invokeInExtensionFunctionLiteral.kt b/js/js.translator/testData/box/expression/invoke/invokeInExtensionFunctionLiteral.kt
index cbfb651..61cb5aa 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeInExtensionFunctionLiteral.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeInExtensionFunctionLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/invoke/invokeInFunctionLiteral.kt b/js/js.translator/testData/box/expression/invoke/invokeInFunctionLiteral.kt
index df35da2..5f099f0 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeInFunctionLiteral.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeInFunctionLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/invoke/invokeMethod.kt b/js/js.translator/testData/box/expression/invoke/invokeMethod.kt
index 2c11145..d155c63 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeMethod.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class Foo(val postfix: String) {
diff --git a/js/js.translator/testData/box/expression/invoke/invokeOnExprByConvention.kt b/js/js.translator/testData/box/expression/invoke/invokeOnExprByConvention.kt
index 25f2ad4..5a01d13 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeOnExprByConvention.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeOnExprByConvention.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/invoke/invokeWithDispatchAndExtensionReceivers.kt b/js/js.translator/testData/box/expression/invoke/invokeWithDispatchAndExtensionReceivers.kt
index ea922a4..79da426 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeWithDispatchAndExtensionReceivers.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeWithDispatchAndExtensionReceivers.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
class A
diff --git a/js/js.translator/testData/box/expression/invoke/invokeWithDispatchReceiver.kt b/js/js.translator/testData/box/expression/invoke/invokeWithDispatchReceiver.kt
index 55e9f2a..aa0ae4d 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeWithDispatchReceiver.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeWithDispatchReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A {
diff --git a/js/js.translator/testData/box/expression/invoke/invokeWithExtensionReceiver.kt b/js/js.translator/testData/box/expression/invoke/invokeWithExtensionReceiver.kt
index 07277fc..fb294ac 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeWithExtensionReceiver.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeWithExtensionReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
operator fun Int.invoke(x: Int) = this + x
diff --git a/js/js.translator/testData/box/expression/invoke/invokeWithImplicitDispatchReceiverAndExtensionReceiver.kt b/js/js.translator/testData/box/expression/invoke/invokeWithImplicitDispatchReceiverAndExtensionReceiver.kt
index 4c25e2b..ffdbdca 100644
--- a/js/js.translator/testData/box/expression/invoke/invokeWithImplicitDispatchReceiverAndExtensionReceiver.kt
+++ b/js/js.translator/testData/box/expression/invoke/invokeWithImplicitDispatchReceiverAndExtensionReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun A.f(s: String) = value + s
diff --git a/js/js.translator/testData/box/expression/misc/KT-1052-2.kt b/js/js.translator/testData/box/expression/misc/KT-1052-2.kt
index 39fe6b0..5577694 100644
--- a/js/js.translator/testData/box/expression/misc/KT-1052-2.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-1052-2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/misc/KT-1052.kt b/js/js.translator/testData/box/expression/misc/KT-1052.kt
index 4d5872c..823ca7f 100644
--- a/js/js.translator/testData/box/expression/misc/KT-1052.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-1052.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
var log = ""
fun printlnLog(message: Any) {
diff --git a/js/js.translator/testData/box/expression/misc/KT-1361-1.kt b/js/js.translator/testData/box/expression/misc/KT-1361-1.kt
index 6f5d017..066d6a4 100644
--- a/js/js.translator/testData/box/expression/misc/KT-1361-1.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-1361-1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
class B {
diff --git a/js/js.translator/testData/box/expression/misc/KT-1361-2.kt b/js/js.translator/testData/box/expression/misc/KT-1361-2.kt
index 0b12741..355fcfd 100644
--- a/js/js.translator/testData/box/expression/misc/KT-1361-2.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-1361-2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1389
package foo
class Data(val rawData: Array<Int>, val width: Int, val height: Int) {
diff --git a/js/js.translator/testData/box/expression/misc/KT-1865.kt b/js/js.translator/testData/box/expression/misc/KT-1865.kt
index c0b4ee6..48b720d 100644
--- a/js/js.translator/testData/box/expression/misc/KT-1865.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-1865.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
open class A {
diff --git a/js/js.translator/testData/box/expression/misc/KT-2314.kt b/js/js.translator/testData/box/expression/misc/KT-2314.kt
index a22e423..4dfeaae 100644
--- a/js/js.translator/testData/box/expression/misc/KT-2314.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-2314.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/expression/misc/KT-5058.kt b/js/js.translator/testData/box/expression/misc/KT-5058.kt
index 4e6170e..04a4501 100644
--- a/js/js.translator/testData/box/expression/misc/KT-5058.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-5058.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun test():Any {
diff --git a/js/js.translator/testData/box/expression/misc/KT-740-2.kt b/js/js.translator/testData/box/expression/misc/KT-740-2.kt
index e66cf36..0da0ea0 100644
--- a/js/js.translator/testData/box/expression/misc/KT-740-2.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-740-2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
var c0 = 0
diff --git a/js/js.translator/testData/box/expression/misc/KT-740-3.kt b/js/js.translator/testData/box/expression/misc/KT-740-3.kt
index 2696ae6..0e2bab2 100644
--- a/js/js.translator/testData/box/expression/misc/KT-740-3.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-740-3.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
var c0 = 0
diff --git a/js/js.translator/testData/box/expression/misc/KT-740.kt b/js/js.translator/testData/box/expression/misc/KT-740.kt
index c9fe730..ecc704d 100644
--- a/js/js.translator/testData/box/expression/misc/KT-740.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-740.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
var c = 0
diff --git a/js/js.translator/testData/box/expression/misc/KT-817.kt b/js/js.translator/testData/box/expression/misc/KT-817.kt
index 258c447..4849b49 100644
--- a/js/js.translator/testData/box/expression/misc/KT-817.kt
+++ b/js/js.translator/testData/box/expression/misc/KT-817.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class Range() {
diff --git a/js/js.translator/testData/box/expression/misc/classWithoutPackage.kt b/js/js.translator/testData/box/expression/misc/classWithoutPackage.kt
index 2f7e92e..966c1e5 100644
--- a/js/js.translator/testData/box/expression/misc/classWithoutPackage.kt
+++ b/js/js.translator/testData/box/expression/misc/classWithoutPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
class A(var a: Int) {
init {
a = 3
diff --git a/js/js.translator/testData/box/expression/misc/elvis.kt b/js/js.translator/testData/box/expression/misc/elvis.kt
index fd984bb..b534a6e 100644
--- a/js/js.translator/testData/box/expression/misc/elvis.kt
+++ b/js/js.translator/testData/box/expression/misc/elvis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/misc/elvisReturnNested.kt b/js/js.translator/testData/box/expression/misc/elvisReturnNested.kt
index 81d87aa..0c1f8d5 100644
--- a/js/js.translator/testData/box/expression/misc/elvisReturnNested.kt
+++ b/js/js.translator/testData/box/expression/misc/elvisReturnNested.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
/*
* Issue: KT-4159 Kotlin to JS compiler crashes on code with ?: return
*
diff --git a/js/js.translator/testData/box/expression/misc/elvisReturnSimple.kt b/js/js.translator/testData/box/expression/misc/elvisReturnSimple.kt
index e4314a7..0fb49b5 100644
--- a/js/js.translator/testData/box/expression/misc/elvisReturnSimple.kt
+++ b/js/js.translator/testData/box/expression/misc/elvisReturnSimple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
/*
* Issue: KT-4159 Kotlin to JS compiler crashes on code with ?: return
*
diff --git a/js/js.translator/testData/box/expression/misc/elvisWithThrow.kt b/js/js.translator/testData/box/expression/misc/elvisWithThrow.kt
index db37805..3284e95 100644
--- a/js/js.translator/testData/box/expression/misc/elvisWithThrow.kt
+++ b/js/js.translator/testData/box/expression/misc/elvisWithThrow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
var i = 0
diff --git a/js/js.translator/testData/box/expression/misc/exclExcl.kt b/js/js.translator/testData/box/expression/misc/exclExcl.kt
index 832e40b..f7821a0 100644
--- a/js/js.translator/testData/box/expression/misc/exclExcl.kt
+++ b/js/js.translator/testData/box/expression/misc/exclExcl.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/misc/exclExclResultIsComputedOnce.kt b/js/js.translator/testData/box/expression/misc/exclExclResultIsComputedOnce.kt
index 2b4679f..4199c80 100644
--- a/js/js.translator/testData/box/expression/misc/exclExclResultIsComputedOnce.kt
+++ b/js/js.translator/testData/box/expression/misc/exclExclResultIsComputedOnce.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1376
package foo
var c = 0
diff --git a/js/js.translator/testData/box/expression/misc/exclExclThrows.kt b/js/js.translator/testData/box/expression/misc/exclExclThrows.kt
index 25c7f17..d31b5ab 100644
--- a/js/js.translator/testData/box/expression/misc/exclExclThrows.kt
+++ b/js/js.translator/testData/box/expression/misc/exclExclThrows.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/expression/misc/extensionLiteralCalledInsideExtensionFunction.kt b/js/js.translator/testData/box/expression/misc/extensionLiteralCalledInsideExtensionFunction.kt
index 9124ba6..d7aa4bc 100644
--- a/js/js.translator/testData/box/expression/misc/extensionLiteralCalledInsideExtensionFunction.kt
+++ b/js/js.translator/testData/box/expression/misc/extensionLiteralCalledInsideExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun A.create(init: A.() -> Unit): A {
diff --git a/js/js.translator/testData/box/expression/misc/extensionLiteralCreatedAtPackageLevel.kt b/js/js.translator/testData/box/expression/misc/extensionLiteralCreatedAtPackageLevel.kt
index 2880413..029e90e 100644
--- a/js/js.translator/testData/box/expression/misc/extensionLiteralCreatedAtPackageLevel.kt
+++ b/js/js.translator/testData/box/expression/misc/extensionLiteralCreatedAtPackageLevel.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/misc/funInConstructor.kt b/js/js.translator/testData/box/expression/misc/funInConstructor.kt
index df337d1..c6609ec 100644
--- a/js/js.translator/testData/box/expression/misc/funInConstructor.kt
+++ b/js/js.translator/testData/box/expression/misc/funInConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/misc/funInConstructorBlock.kt b/js/js.translator/testData/box/expression/misc/funInConstructorBlock.kt
index 1085a19..549decf 100644
--- a/js/js.translator/testData/box/expression/misc/funInConstructorBlock.kt
+++ b/js/js.translator/testData/box/expression/misc/funInConstructorBlock.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/misc/inheritFromJetIterator.kt b/js/js.translator/testData/box/expression/misc/inheritFromJetIterator.kt
index 63b2c6e..946e8cc 100644
--- a/js/js.translator/testData/box/expression/misc/inheritFromJetIterator.kt
+++ b/js/js.translator/testData/box/expression/misc/inheritFromJetIterator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class TabIterator : Iterator<Any?> {
diff --git a/js/js.translator/testData/box/expression/misc/intRange.kt b/js/js.translator/testData/box/expression/misc/intRange.kt
index d02d82d..a7eb380 100644
--- a/js/js.translator/testData/box/expression/misc/intRange.kt
+++ b/js/js.translator/testData/box/expression/misc/intRange.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class RangeIterator(val start: Int, var count: Int, val reversed: Boolean) {
diff --git a/js/js.translator/testData/box/expression/misc/kt9443.kt b/js/js.translator/testData/box/expression/misc/kt9443.kt
index 3dc5aed..53911f8 100644
--- a/js/js.translator/testData/box/expression/misc/kt9443.kt
+++ b/js/js.translator/testData/box/expression/misc/kt9443.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
abstract class BaseClass {
diff --git a/js/js.translator/testData/box/expression/misc/lazyProperty.kt b/js/js.translator/testData/box/expression/misc/lazyProperty.kt
index 7f8ddb4..bc6b7c5 100644
--- a/js/js.translator/testData/box/expression/misc/lazyProperty.kt
+++ b/js/js.translator/testData/box/expression/misc/lazyProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
var log = ""
fun printlnLog(message: Any) {
diff --git a/js/js.translator/testData/box/expression/misc/localProperty.kt b/js/js.translator/testData/box/expression/misc/localProperty.kt
index 7d662ae..3c0f06e 100644
--- a/js/js.translator/testData/box/expression/misc/localProperty.kt
+++ b/js/js.translator/testData/box/expression/misc/localProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
val y = 3
diff --git a/js/js.translator/testData/box/expression/misc/localVarAsFunction.kt b/js/js.translator/testData/box/expression/misc/localVarAsFunction.kt
index f1b0fde..358ff2e 100644
--- a/js/js.translator/testData/box/expression/misc/localVarAsFunction.kt
+++ b/js/js.translator/testData/box/expression/misc/localVarAsFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
var c = 2
diff --git a/js/js.translator/testData/box/expression/misc/packageLevelVarInPackage.kt b/js/js.translator/testData/box/expression/misc/packageLevelVarInPackage.kt
index 45f9e19..0aa6118 100644
--- a/js/js.translator/testData/box/expression/misc/packageLevelVarInPackage.kt
+++ b/js/js.translator/testData/box/expression/misc/packageLevelVarInPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
var c = 2
diff --git a/js/js.translator/testData/box/expression/misc/packageLevelVarInRoot.kt b/js/js.translator/testData/box/expression/misc/packageLevelVarInRoot.kt
index fbe7d3b..af5d6dd 100644
--- a/js/js.translator/testData/box/expression/misc/packageLevelVarInRoot.kt
+++ b/js/js.translator/testData/box/expression/misc/packageLevelVarInRoot.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
var c = 2
fun incC(i: Int) {
diff --git a/js/js.translator/testData/box/expression/misc/packagePropertyCalledAsFun.kt b/js/js.translator/testData/box/expression/misc/packagePropertyCalledAsFun.kt
index 61860ca..a8644cb 100644
--- a/js/js.translator/testData/box/expression/misc/packagePropertyCalledAsFun.kt
+++ b/js/js.translator/testData/box/expression/misc/packagePropertyCalledAsFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun lold() = true
diff --git a/js/js.translator/testData/box/expression/misc/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt b/js/js.translator/testData/box/expression/misc/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt
index 03a7d70..15e5a4a 100644
--- a/js/js.translator/testData/box/expression/misc/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt
+++ b/js/js.translator/testData/box/expression/misc/propertiesWithExplicitlyDefinedAccessorsWithoutBodies.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
diff --git a/js/js.translator/testData/box/expression/misc/propertyAsFunCalledOnConstructor.kt b/js/js.translator/testData/box/expression/misc/propertyAsFunCalledOnConstructor.kt
index dbe72f8..ea0e6b8 100644
--- a/js/js.translator/testData/box/expression/misc/propertyAsFunCalledOnConstructor.kt
+++ b/js/js.translator/testData/box/expression/misc/propertyAsFunCalledOnConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/misc/rightAssocForGeneratedConditionalOperator.kt b/js/js.translator/testData/box/expression/misc/rightAssocForGeneratedConditionalOperator.kt
index c3fbab0..c6b189c 100644
--- a/js/js.translator/testData/box/expression/misc/rightAssocForGeneratedConditionalOperator.kt
+++ b/js/js.translator/testData/box/expression/misc/rightAssocForGeneratedConditionalOperator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
// http://youtrack.jetbrains.com/issue/KT-5320
// KT-5320 Invalid JS code generated for typecast inside ternary operator
diff --git a/js/js.translator/testData/box/expression/misc/safeCallComputesExpressionOnlyOnce.kt b/js/js.translator/testData/box/expression/misc/safeCallComputesExpressionOnlyOnce.kt
index d840dea..82e284b 100644
--- a/js/js.translator/testData/box/expression/misc/safeCallComputesExpressionOnlyOnce.kt
+++ b/js/js.translator/testData/box/expression/misc/safeCallComputesExpressionOnlyOnce.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1378
package foo
var i = 0
diff --git a/js/js.translator/testData/box/expression/misc/stringInterpolationEvaluationOrder.kt b/js/js.translator/testData/box/expression/misc/stringInterpolationEvaluationOrder.kt
index 994bf78..2e40c8b 100644
--- a/js/js.translator/testData/box/expression/misc/stringInterpolationEvaluationOrder.kt
+++ b/js/js.translator/testData/box/expression/misc/stringInterpolationEvaluationOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
var s = ""
diff --git a/js/js.translator/testData/box/expression/misc/temporaryVariableCreatedInPackageInitializer.kt b/js/js.translator/testData/box/expression/misc/temporaryVariableCreatedInPackageInitializer.kt
index df30d35..513e751 100644
--- a/js/js.translator/testData/box/expression/misc/temporaryVariableCreatedInPackageInitializer.kt
+++ b/js/js.translator/testData/box/expression/misc/temporaryVariableCreatedInPackageInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
var p = 0
diff --git a/js/js.translator/testData/box/expression/misc/throwThrow.kt b/js/js.translator/testData/box/expression/misc/throwThrow.kt
index c6616ab..8107150 100644
--- a/js/js.translator/testData/box/expression/misc/throwThrow.kt
+++ b/js/js.translator/testData/box/expression/misc/throwThrow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1383
package foo
fun test() {
diff --git a/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt b/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt
index 4f83b37..4127297 100644
--- a/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt
+++ b/js/js.translator/testData/box/expression/misc/toGeneratorInStdlib.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 924
+// EXPECTED_REACHABLE_NODES: 1407
package foo
fun sequenceFromFunctionWithInitialValue() {
diff --git a/js/js.translator/testData/box/expression/misc/whenReturnedWithoutBlock.kt b/js/js.translator/testData/box/expression/misc/whenReturnedWithoutBlock.kt
index 7252fcb..deb183e 100644
--- a/js/js.translator/testData/box/expression/misc/whenReturnedWithoutBlock.kt
+++ b/js/js.translator/testData/box/expression/misc/whenReturnedWithoutBlock.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/stringClass/extensionMethods.kt b/js/js.translator/testData/box/expression/stringClass/extensionMethods.kt
index e48d975..4d6cff8 100644
--- a/js/js.translator/testData/box/expression/stringClass/extensionMethods.kt
+++ b/js/js.translator/testData/box/expression/stringClass/extensionMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
val testString = "foobarbaz"
diff --git a/js/js.translator/testData/box/expression/stringClass/intInTemplate.kt b/js/js.translator/testData/box/expression/stringClass/intInTemplate.kt
index d969802..8393493 100644
--- a/js/js.translator/testData/box/expression/stringClass/intInTemplate.kt
+++ b/js/js.translator/testData/box/expression/stringClass/intInTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=toString
package foo
diff --git a/js/js.translator/testData/box/expression/stringClass/kt2227.kt b/js/js.translator/testData/box/expression/stringClass/kt2227.kt
index f5d03df..ecb2519 100644
--- a/js/js.translator/testData/box/expression/stringClass/kt2227.kt
+++ b/js/js.translator/testData/box/expression/stringClass/kt2227.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/stringClass/kt2227_2.kt b/js/js.translator/testData/box/expression/stringClass/kt2227_2.kt
index e430727..51b350f 100644
--- a/js/js.translator/testData/box/expression/stringClass/kt2227_2.kt
+++ b/js/js.translator/testData/box/expression/stringClass/kt2227_2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
var i = 0
diff --git a/js/js.translator/testData/box/expression/stringClass/multipleExpressionsInTemplate.kt b/js/js.translator/testData/box/expression/stringClass/multipleExpressionsInTemplate.kt
index efb4f64..e28c78e 100644
--- a/js/js.translator/testData/box/expression/stringClass/multipleExpressionsInTemplate.kt
+++ b/js/js.translator/testData/box/expression/stringClass/multipleExpressionsInTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=toString
package foo
diff --git a/js/js.translator/testData/box/expression/stringClass/nullableTypeInStringTemplate.kt b/js/js.translator/testData/box/expression/stringClass/nullableTypeInStringTemplate.kt
index 2a6cc45..7f0fc58 100644
--- a/js/js.translator/testData/box/expression/stringClass/nullableTypeInStringTemplate.kt
+++ b/js/js.translator/testData/box/expression/stringClass/nullableTypeInStringTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// KT-2901 nullable type in string template
package foo
diff --git a/js/js.translator/testData/box/expression/stringClass/numbersInTemplate.kt b/js/js.translator/testData/box/expression/stringClass/numbersInTemplate.kt
index 2daa0a7..82a1f11 100644
--- a/js/js.translator/testData/box/expression/stringClass/numbersInTemplate.kt
+++ b/js/js.translator/testData/box/expression/stringClass/numbersInTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/stringClass/objectToStringCallInTemplate.kt b/js/js.translator/testData/box/expression/stringClass/objectToStringCallInTemplate.kt
index 8400917..28c2c5d 100644
--- a/js/js.translator/testData/box/expression/stringClass/objectToStringCallInTemplate.kt
+++ b/js/js.translator/testData/box/expression/stringClass/objectToStringCallInTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A(var i: Int) {
diff --git a/js/js.translator/testData/box/expression/stringClass/stringAssignment.kt b/js/js.translator/testData/box/expression/stringClass/stringAssignment.kt
index 582bd80..80f56f6 100644
--- a/js/js.translator/testData/box/expression/stringClass/stringAssignment.kt
+++ b/js/js.translator/testData/box/expression/stringClass/stringAssignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/stringClass/stringConstant.kt b/js/js.translator/testData/box/expression/stringClass/stringConstant.kt
index 78a7d05..959c206 100644
--- a/js/js.translator/testData/box/expression/stringClass/stringConstant.kt
+++ b/js/js.translator/testData/box/expression/stringClass/stringConstant.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/stringClass/stringInTemplate.kt b/js/js.translator/testData/box/expression/stringClass/stringInTemplate.kt
index 88ac951..65a8616 100644
--- a/js/js.translator/testData/box/expression/stringClass/stringInTemplate.kt
+++ b/js/js.translator/testData/box/expression/stringClass/stringInTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=toString
package foo
diff --git a/js/js.translator/testData/box/expression/stringClass/stringNotEqualToNumber.kt b/js/js.translator/testData/box/expression/stringClass/stringNotEqualToNumber.kt
index 1f390ce..ea2e9e0 100644
--- a/js/js.translator/testData/box/expression/stringClass/stringNotEqualToNumber.kt
+++ b/js/js.translator/testData/box/expression/stringClass/stringNotEqualToNumber.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/stringClass/subSequence.kt b/js/js.translator/testData/box/expression/stringClass/subSequence.kt
index 80691f4..721ecf1 100644
--- a/js/js.translator/testData/box/expression/stringClass/subSequence.kt
+++ b/js/js.translator/testData/box/expression/stringClass/subSequence.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class CC(val s: CharSequence) : CharSequence by s, MyCharSequence {}
diff --git a/js/js.translator/testData/box/expression/stringTemplates/objectWithToString.kt b/js/js.translator/testData/box/expression/stringTemplates/objectWithToString.kt
index 35db938..c3d867c 100644
--- a/js/js.translator/testData/box/expression/stringTemplates/objectWithToString.kt
+++ b/js/js.translator/testData/box/expression/stringTemplates/objectWithToString.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class Foo(val name: String) {
diff --git a/js/js.translator/testData/box/expression/stringTemplates/stringValues.kt b/js/js.translator/testData/box/expression/stringTemplates/stringValues.kt
index 9bc1fe8..c906afa 100644
--- a/js/js.translator/testData/box/expression/stringTemplates/stringValues.kt
+++ b/js/js.translator/testData/box/expression/stringTemplates/stringValues.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// test String template must have one or more entries.
diff --git a/js/js.translator/testData/box/expression/try/exceptionToString.kt b/js/js.translator/testData/box/expression/try/exceptionToString.kt
index 0fc427c..ee3019a 100644
--- a/js/js.translator/testData/box/expression/try/exceptionToString.kt
+++ b/js/js.translator/testData/box/expression/try/exceptionToString.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
class MyException(m: String? = null): Exception(m)
diff --git a/js/js.translator/testData/box/expression/try/multipleCatchBlocks.kt b/js/js.translator/testData/box/expression/try/multipleCatchBlocks.kt
index 0b730e5..35f6575 100644
--- a/js/js.translator/testData/box/expression/try/multipleCatchBlocks.kt
+++ b/js/js.translator/testData/box/expression/try/multipleCatchBlocks.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class UserException() : RuntimeException()
diff --git a/js/js.translator/testData/box/expression/try/rethrowExceptionIfNotCaught.kt b/js/js.translator/testData/box/expression/try/rethrowExceptionIfNotCaught.kt
index fa8bf3f..6c59e8e 100644
--- a/js/js.translator/testData/box/expression/try/rethrowExceptionIfNotCaught.kt
+++ b/js/js.translator/testData/box/expression/try/rethrowExceptionIfNotCaught.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun catchSomeExceptions(e: Exception) {
diff --git a/js/js.translator/testData/box/expression/try/tryCatchCorrectForSubclasses.kt b/js/js.translator/testData/box/expression/try/tryCatchCorrectForSubclasses.kt
index 5b3ea51..02392a4 100644
--- a/js/js.translator/testData/box/expression/try/tryCatchCorrectForSubclasses.kt
+++ b/js/js.translator/testData/box/expression/try/tryCatchCorrectForSubclasses.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
open class Ex: Exception()
diff --git a/js/js.translator/testData/box/expression/try/tryCatchDynamic.kt b/js/js.translator/testData/box/expression/try/tryCatchDynamic.kt
index e19a82f..e6ca662 100644
--- a/js/js.translator/testData/box/expression/try/tryCatchDynamic.kt
+++ b/js/js.translator/testData/box/expression/try/tryCatchDynamic.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/try/tryCatchExpr.kt b/js/js.translator/testData/box/expression/try/tryCatchExpr.kt
index 0e3758b..b37d12f 100644
--- a/js/js.translator/testData/box/expression/try/tryCatchExpr.kt
+++ b/js/js.translator/testData/box/expression/try/tryCatchExpr.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/try/tryCatchExpressionWithMessage.kt b/js/js.translator/testData/box/expression/try/tryCatchExpressionWithMessage.kt
index 5d6ae86..ef378fa 100644
--- a/js/js.translator/testData/box/expression/try/tryCatchExpressionWithMessage.kt
+++ b/js/js.translator/testData/box/expression/try/tryCatchExpressionWithMessage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/try/tryCatchThrowable.kt b/js/js.translator/testData/box/expression/try/tryCatchThrowable.kt
index db3b603..cc796a0 100644
--- a/js/js.translator/testData/box/expression/try/tryCatchThrowable.kt
+++ b/js/js.translator/testData/box/expression/try/tryCatchThrowable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/try/tryCatchWithDifferentParameterNames.kt b/js/js.translator/testData/box/expression/try/tryCatchWithDifferentParameterNames.kt
index cf44306..97cb50f 100644
--- a/js/js.translator/testData/box/expression/try/tryCatchWithDifferentParameterNames.kt
+++ b/js/js.translator/testData/box/expression/try/tryCatchWithDifferentParameterNames.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun bar(e: Exception): String {
diff --git a/js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt b/js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt
index 242a052..2c9a9dd 100644
--- a/js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt
+++ b/js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/when/empty.kt b/js/js.translator/testData/box/expression/when/empty.kt
index e38e91b..b7cf207 100644
--- a/js/js.translator/testData/box/expression/when/empty.kt
+++ b/js/js.translator/testData/box/expression/when/empty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/exhaustiveCheckException.kt b/js/js.translator/testData/box/expression/when/exhaustiveCheckException.kt
index 7e1be97..e991164 100644
--- a/js/js.translator/testData/box/expression/when/exhaustiveCheckException.kt
+++ b/js/js.translator/testData/box/expression/when/exhaustiveCheckException.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 555
+// EXPECTED_REACHABLE_NODES: 1422
fun <T> checkThrown(x: T, block: (T) -> Any?): Unit? {
return try {
println((block(x) ?: "").toString())
diff --git a/js/js.translator/testData/box/expression/when/forWithOneStmWhen.kt b/js/js.translator/testData/box/expression/when/forWithOneStmWhen.kt
index 6ba61c2b..4b28b39 100644
--- a/js/js.translator/testData/box/expression/when/forWithOneStmWhen.kt
+++ b/js/js.translator/testData/box/expression/when/forWithOneStmWhen.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/when/ifInWhen.kt b/js/js.translator/testData/box/expression/when/ifInWhen.kt
index d876a30..d993d73 100644
--- a/js/js.translator/testData/box/expression/when/ifInWhen.kt
+++ b/js/js.translator/testData/box/expression/when/ifInWhen.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1377
// KT-2221 if in when
package foo
diff --git a/js/js.translator/testData/box/expression/when/ifInWhenDanglingElseIssue.kt b/js/js.translator/testData/box/expression/when/ifInWhenDanglingElseIssue.kt
index 95710cd..1513ee8 100644
--- a/js/js.translator/testData/box/expression/when/ifInWhenDanglingElseIssue.kt
+++ b/js/js.translator/testData/box/expression/when/ifInWhenDanglingElseIssue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1377
// http://youtrack.jetbrains.com/issue/KT-5253
// JS: generated wrong code when use `if` inside `when`
diff --git a/js/js.translator/testData/box/expression/when/ifWithOneStmWhen.kt b/js/js.translator/testData/box/expression/when/ifWithOneStmWhen.kt
index 8498c7a..b8801f0 100644
--- a/js/js.translator/testData/box/expression/when/ifWithOneStmWhen.kt
+++ b/js/js.translator/testData/box/expression/when/ifWithOneStmWhen.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/when/kt1665.kt b/js/js.translator/testData/box/expression/when/kt1665.kt
index 7331c64..196a311 100644
--- a/js/js.translator/testData/box/expression/when/kt1665.kt
+++ b/js/js.translator/testData/box/expression/when/kt1665.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/matchNullableType.kt b/js/js.translator/testData/box/expression/when/matchNullableType.kt
index 1652d30..f611826 100644
--- a/js/js.translator/testData/box/expression/when/matchNullableType.kt
+++ b/js/js.translator/testData/box/expression/when/matchNullableType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/when/multipleCases.kt b/js/js.translator/testData/box/expression/when/multipleCases.kt
index fa0afe8..d57c5bd 100644
--- a/js/js.translator/testData/box/expression/when/multipleCases.kt
+++ b/js/js.translator/testData/box/expression/when/multipleCases.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/whenAsExpression.kt b/js/js.translator/testData/box/expression/when/whenAsExpression.kt
index 9c4363a..62f04e9 100644
--- a/js/js.translator/testData/box/expression/when/whenAsExpression.kt
+++ b/js/js.translator/testData/box/expression/when/whenAsExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenAsExpressionWithThrow.kt b/js/js.translator/testData/box/expression/when/whenAsExpressionWithThrow.kt
index 1a0f1b3..0b89e06c 100644
--- a/js/js.translator/testData/box/expression/when/whenAsExpressionWithThrow.kt
+++ b/js/js.translator/testData/box/expression/when/whenAsExpressionWithThrow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/whenConditionWithReturn.kt b/js/js.translator/testData/box/expression/when/whenConditionWithReturn.kt
index 54932be..f2a8410 100644
--- a/js/js.translator/testData/box/expression/when/whenConditionWithReturn.kt
+++ b/js/js.translator/testData/box/expression/when/whenConditionWithReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun test(): Int {
diff --git a/js/js.translator/testData/box/expression/when/whenEqualsPattern.kt b/js/js.translator/testData/box/expression/when/whenEqualsPattern.kt
index 0a5100c..0961a7a 100644
--- a/js/js.translator/testData/box/expression/when/whenEqualsPattern.kt
+++ b/js/js.translator/testData/box/expression/when/whenEqualsPattern.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 905
+// EXPECTED_REACHABLE_NODES: 1393
package foo
data class A(val bar: Int)
diff --git a/js/js.translator/testData/box/expression/when/whenEvaluatesArgumentOnlyOnce.kt b/js/js.translator/testData/box/expression/when/whenEvaluatesArgumentOnlyOnce.kt
index 590aeb4..9248962 100644
--- a/js/js.translator/testData/box/expression/when/whenEvaluatesArgumentOnlyOnce.kt
+++ b/js/js.translator/testData/box/expression/when/whenEvaluatesArgumentOnlyOnce.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/whenExecutesOnlyOnce.kt b/js/js.translator/testData/box/expression/when/whenExecutesOnlyOnce.kt
index 486d477..48fb33c 100644
--- a/js/js.translator/testData/box/expression/when/whenExecutesOnlyOnce.kt
+++ b/js/js.translator/testData/box/expression/when/whenExecutesOnlyOnce.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/when/whenNotType.kt b/js/js.translator/testData/box/expression/when/whenNotType.kt
index b6c7d17..f1adac3 100644
--- a/js/js.translator/testData/box/expression/when/whenNotType.kt
+++ b/js/js.translator/testData/box/expression/when/whenNotType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/when/whenStatementWithRangeClause.kt b/js/js.translator/testData/box/expression/when/whenStatementWithRangeClause.kt
index 4e97bfc..1039e89 100644
--- a/js/js.translator/testData/box/expression/when/whenStatementWithRangeClause.kt
+++ b/js/js.translator/testData/box/expression/when/whenStatementWithRangeClause.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// see KT-7683
// WhenTranslator must recognize KtWhenConditionInRange for when statement
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenType.kt b/js/js.translator/testData/box/expression/when/whenType.kt
index ad6ff67..d2f16c7 100644
--- a/js/js.translator/testData/box/expression/when/whenType.kt
+++ b/js/js.translator/testData/box/expression/when/whenType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/when/whenValue.kt b/js/js.translator/testData/box/expression/when/whenValue.kt
index 82d2fd4..bdc262c 100644
--- a/js/js.translator/testData/box/expression/when/whenValue.kt
+++ b/js/js.translator/testData/box/expression/when/whenValue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/whenValueOrType.kt b/js/js.translator/testData/box/expression/when/whenValueOrType.kt
index 11381aa..e6f8097 100644
--- a/js/js.translator/testData/box/expression/when/whenValueOrType.kt
+++ b/js/js.translator/testData/box/expression/when/whenValueOrType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/expression/when/whenWithCharRangeClause.kt b/js/js.translator/testData/box/expression/when/whenWithCharRangeClause.kt
index 42a36d9..5d2548f 100644
--- a/js/js.translator/testData/box/expression/when/whenWithCharRangeClause.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithCharRangeClause.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 536
+// EXPECTED_REACHABLE_NODES: 1415
// see KT-7683
// WhenTranslator must recognize KtWhenConditionInRange
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenWithCustomRangeClause.kt b/js/js.translator/testData/box/expression/when/whenWithCustomRangeClause.kt
index 828e9ee..0f383d3 100644
--- a/js/js.translator/testData/box/expression/when/whenWithCustomRangeClause.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithCustomRangeClause.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
// see KT-7683
// WhenTranslator must recognize KtWhenConditionInRange for custom classes that implement ClosedRange
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenWithIf.kt b/js/js.translator/testData/box/expression/when/whenWithIf.kt
index 05bf83d..4e0c2aa 100644
--- a/js/js.translator/testData/box/expression/when/whenWithIf.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithIf.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/whenWithIfConditionAndOnlyElse.kt b/js/js.translator/testData/box/expression/when/whenWithIfConditionAndOnlyElse.kt
index 18f852f..7245c52 100644
--- a/js/js.translator/testData/box/expression/when/whenWithIfConditionAndOnlyElse.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithIfConditionAndOnlyElse.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
var global = ""
diff --git a/js/js.translator/testData/box/expression/when/whenWithLongRangeClause.kt b/js/js.translator/testData/box/expression/when/whenWithLongRangeClause.kt
index b3baaa5..7435424 100644
--- a/js/js.translator/testData/box/expression/when/whenWithLongRangeClause.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithLongRangeClause.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// see KT-7683
// WhenTranslator must recognize KtWhenConditionInRange in general case of a class that has rangeTo method
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenWithOneStmWhen.kt b/js/js.translator/testData/box/expression/when/whenWithOneStmWhen.kt
index c4404d2..9e42ddd 100644
--- a/js/js.translator/testData/box/expression/when/whenWithOneStmWhen.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithOneStmWhen.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenWithOnlyElse.kt b/js/js.translator/testData/box/expression/when/whenWithOnlyElse.kt
index 2d8258c..8832660 100644
--- a/js/js.translator/testData/box/expression/when/whenWithOnlyElse.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithOnlyElse.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/expression/when/whenWithRangeClause.kt b/js/js.translator/testData/box/expression/when/whenWithRangeClause.kt
index c11798e..9636dd9 100644
--- a/js/js.translator/testData/box/expression/when/whenWithRangeClause.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithRangeClause.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// see KT-7683
// WhenTranslator must recognize KtWhenConditionInRange and produce faster code when matched expression is Int
package foo
diff --git a/js/js.translator/testData/box/expression/when/whenWithoutExpression.kt b/js/js.translator/testData/box/expression/when/whenWithoutExpression.kt
index 9786e82..fe22184 100644
--- a/js/js.translator/testData/box/expression/when/whenWithoutExpression.kt
+++ b/js/js.translator/testData/box/expression/when/whenWithoutExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box() = when {
diff --git a/js/js.translator/testData/box/expression/when/whileWithOneStmWhen.kt b/js/js.translator/testData/box/expression/when/whileWithOneStmWhen.kt
index 8bff4f0..c055d37 100644
--- a/js/js.translator/testData/box/expression/when/whileWithOneStmWhen.kt
+++ b/js/js.translator/testData/box/expression/when/whileWithOneStmWhen.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/expression/while/doWhileWithComplexCondition.kt b/js/js.translator/testData/box/expression/while/doWhileWithComplexCondition.kt
index b788d54..c706f7e 100644
--- a/js/js.translator/testData/box/expression/while/doWhileWithComplexCondition.kt
+++ b/js/js.translator/testData/box/expression/while/doWhileWithComplexCondition.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/while/doWhileWithComplexConditionAndContinue.kt b/js/js.translator/testData/box/expression/while/doWhileWithComplexConditionAndContinue.kt
index f139bbb..ae36635 100644
--- a/js/js.translator/testData/box/expression/while/doWhileWithComplexConditionAndContinue.kt
+++ b/js/js.translator/testData/box/expression/while/doWhileWithComplexConditionAndContinue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/while/whileWithComplexCondition.kt b/js/js.translator/testData/box/expression/while/whileWithComplexCondition.kt
index a01dbc6..19642ef 100644
--- a/js/js.translator/testData/box/expression/while/whileWithComplexCondition.kt
+++ b/js/js.translator/testData/box/expression/while/whileWithComplexCondition.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/while/whileWithComplexConditionAndContinue.kt b/js/js.translator/testData/box/expression/while/whileWithComplexConditionAndContinue.kt
index 429d237..c25fc0a 100644
--- a/js/js.translator/testData/box/expression/while/whileWithComplexConditionAndContinue.kt
+++ b/js/js.translator/testData/box/expression/while/whileWithComplexConditionAndContinue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/expression/while/whileWithComplexOneStatement.kt b/js/js.translator/testData/box/expression/while/whileWithComplexOneStatement.kt
index 8c45421..cc6edda 100644
--- a/js/js.translator/testData/box/expression/while/whileWithComplexOneStatement.kt
+++ b/js/js.translator/testData/box/expression/while/whileWithComplexOneStatement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionForSuperclass.kt b/js/js.translator/testData/box/extensionFunction/extensionForSuperclass.kt
index 694761b..c69b679 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionForSuperclass.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionForSuperclass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
open class A() {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromExtensionFunction.kt b/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromExtensionFunction.kt
index 06974a6..0b92bd2 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromExtensionFunction.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromFor.kt b/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromFor.kt
index 020099f..db630aa 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromFor.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionFunctionCalledFromFor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 613
+// EXPECTED_REACHABLE_NODES: 1386
package foo
class SimpleEnumerator {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionFunctionOnExpression.kt b/js/js.translator/testData/box/extensionFunction/extensionFunctionOnExpression.kt
index ba4c500..0dc5e9f 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionFunctionOnExpression.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionFunctionOnExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun Int.same(): Int {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionInsideFunctionLiteral.kt b/js/js.translator/testData/box/extensionFunction/extensionInsideFunctionLiteral.kt
index 6caff19..1bc41f5 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionInsideFunctionLiteral.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionInsideFunctionLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class M() {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionLiteralPassedToFunction.kt b/js/js.translator/testData/box/extensionFunction/extensionLiteralPassedToFunction.kt
index b82a4977..337b407 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionLiteralPassedToFunction.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionLiteralPassedToFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun apply(i: Int, f: Int.(Int) -> Int) = i.f(1);
diff --git a/js/js.translator/testData/box/extensionFunction/extensionOnClassWithExplicitAndImplicitReceiver.kt b/js/js.translator/testData/box/extensionFunction/extensionOnClassWithExplicitAndImplicitReceiver.kt
index 2feb292..7e1b56d 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionOnClassWithExplicitAndImplicitReceiver.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionOnClassWithExplicitAndImplicitReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
public class Foo {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt b/js/js.translator/testData/box/extensionFunction/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt
index 9e76549..b5eb28f 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionPropertyOnClassWithExplicitAndImplicitReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Foo {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionUsedInsideClass.kt b/js/js.translator/testData/box/extensionFunction/extensionUsedInsideClass.kt
index 2853f54..61d20c8 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionUsedInsideClass.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionUsedInsideClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class A(var a: Int) {
diff --git a/js/js.translator/testData/box/extensionFunction/extensionWithImplicitReceiver.kt b/js/js.translator/testData/box/extensionFunction/extensionWithImplicitReceiver.kt
index 3da5c31..081dc5e 100644
--- a/js/js.translator/testData/box/extensionFunction/extensionWithImplicitReceiver.kt
+++ b/js/js.translator/testData/box/extensionFunction/extensionWithImplicitReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun Int.same(): Int {
diff --git a/js/js.translator/testData/box/extensionFunction/generic.kt b/js/js.translator/testData/box/extensionFunction/generic.kt
index 93c3f43..bc6f9d3 100644
--- a/js/js.translator/testData/box/extensionFunction/generic.kt
+++ b/js/js.translator/testData/box/extensionFunction/generic.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 888
+// EXPECTED_REACHABLE_NODES: 1376
package foo
diff --git a/js/js.translator/testData/box/extensionFunction/implicitReceiverInExtension.kt b/js/js.translator/testData/box/extensionFunction/implicitReceiverInExtension.kt
index 5876cb5..54f8491 100644
--- a/js/js.translator/testData/box/extensionFunction/implicitReceiverInExtension.kt
+++ b/js/js.translator/testData/box/extensionFunction/implicitReceiverInExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun <T> T.toPrefixedString(prefix: String = "", suffix: String = "") = prefix + toString() + suffix
diff --git a/js/js.translator/testData/box/extensionFunction/intExtension.kt b/js/js.translator/testData/box/extensionFunction/intExtension.kt
index 663085a..4f18e88 100644
--- a/js/js.translator/testData/box/extensionFunction/intExtension.kt
+++ b/js/js.translator/testData/box/extensionFunction/intExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun Int.quadruple(): Int {
diff --git a/js/js.translator/testData/box/extensionFunction/superClassMemberInExtension.kt b/js/js.translator/testData/box/extensionFunction/superClassMemberInExtension.kt
index 2acae8e..bdd7a10 100644
--- a/js/js.translator/testData/box/extensionFunction/superClassMemberInExtension.kt
+++ b/js/js.translator/testData/box/extensionFunction/superClassMemberInExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
open class A() {
diff --git a/js/js.translator/testData/box/extensionFunction/virtualExtension.kt b/js/js.translator/testData/box/extensionFunction/virtualExtension.kt
index f2f2e64..5721cb2 100644
--- a/js/js.translator/testData/box/extensionFunction/virtualExtension.kt
+++ b/js/js.translator/testData/box/extensionFunction/virtualExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class A(var a: Int) {
diff --git a/js/js.translator/testData/box/extensionFunction/virtualExtensionOverride.kt b/js/js.translator/testData/box/extensionFunction/virtualExtensionOverride.kt
index 1bbabe5..d542158 100644
--- a/js/js.translator/testData/box/extensionFunction/virtualExtensionOverride.kt
+++ b/js/js.translator/testData/box/extensionFunction/virtualExtensionOverride.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
open class A(var a: Int) {
diff --git a/js/js.translator/testData/box/extensionProperty/absExtension.kt b/js/js.translator/testData/box/extensionProperty/absExtension.kt
index eb891e6..73ff05e 100644
--- a/js/js.translator/testData/box/extensionProperty/absExtension.kt
+++ b/js/js.translator/testData/box/extensionProperty/absExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
val Double.abs: Double
diff --git a/js/js.translator/testData/box/extensionProperty/externalExtensionProperty.kt b/js/js.translator/testData/box/extensionProperty/externalExtensionProperty.kt
index 0a5541a..770fe19 100644
--- a/js/js.translator/testData/box/extensionProperty/externalExtensionProperty.kt
+++ b/js/js.translator/testData/box/extensionProperty/externalExtensionProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/extensionProperty/inClass.kt b/js/js.translator/testData/box/extensionProperty/inClass.kt
index 8a3bca0..27c2cfd 100644
--- a/js/js.translator/testData/box/extensionProperty/inClass.kt
+++ b/js/js.translator/testData/box/extensionProperty/inClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
class A
class B {
diff --git a/js/js.translator/testData/box/extensionProperty/privateExtensionProperty.kt b/js/js.translator/testData/box/extensionProperty/privateExtensionProperty.kt
index 2720552..323adb8 100644
--- a/js/js.translator/testData/box/extensionProperty/privateExtensionProperty.kt
+++ b/js/js.translator/testData/box/extensionProperty/privateExtensionProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
class A {
fun result() = "OK"
}
diff --git a/js/js.translator/testData/box/extensionProperty/propertyWithGetterAndSetter.kt b/js/js.translator/testData/box/extensionProperty/propertyWithGetterAndSetter.kt
index b3434fa..04d5725 100644
--- a/js/js.translator/testData/box/extensionProperty/propertyWithGetterAndSetter.kt
+++ b/js/js.translator/testData/box/extensionProperty/propertyWithGetterAndSetter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
class Test() {
diff --git a/js/js.translator/testData/box/extensionProperty/simplePropertyWithGetter.kt b/js/js.translator/testData/box/extensionProperty/simplePropertyWithGetter.kt
index eee659e..7939fcf 100644
--- a/js/js.translator/testData/box/extensionProperty/simplePropertyWithGetter.kt
+++ b/js/js.translator/testData/box/extensionProperty/simplePropertyWithGetter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
val String.prop: Int
diff --git a/js/js.translator/testData/box/incremental/catchScope.kt b/js/js.translator/testData/box/incremental/catchScope.kt
index 70dd4ff..ae2383a 100644
--- a/js/js.translator/testData/box/incremental/catchScope.kt
+++ b/js/js.translator/testData/box/incremental/catchScope.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: a.kt
inline fun baz(): String =
diff --git a/js/js.translator/testData/box/incremental/coroutines.kt b/js/js.translator/testData/box/incremental/coroutines.kt
index 9e874ca..48d0f34 100644
--- a/js/js.translator/testData/box/incremental/coroutines.kt
+++ b/js/js.translator/testData/box/incremental/coroutines.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 552
+// EXPECTED_REACHABLE_NODES: 1439
// FILE: a.kt
// WITH_RUNTIME
import kotlin.coroutines.experimental.*
diff --git a/js/js.translator/testData/box/incremental/defaultArguments.kt b/js/js.translator/testData/box/incremental/defaultArguments.kt
index bf6195f..5363135 100644
--- a/js/js.translator/testData/box/incremental/defaultArguments.kt
+++ b/js/js.translator/testData/box/incremental/defaultArguments.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
// FILE: a.kt
inline fun foo(f: (Int) -> String, x: Int = 23): String = "foo(${f(x)})"
diff --git a/js/js.translator/testData/box/incremental/exportedPackage.kt b/js/js.translator/testData/box/incremental/exportedPackage.kt
index e12abdd..999f094 100644
--- a/js/js.translator/testData/box/incremental/exportedPackage.kt
+++ b/js/js.translator/testData/box/incremental/exportedPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// FILE: a.kt
package foo.bar
diff --git a/js/js.translator/testData/box/incremental/inline.kt b/js/js.translator/testData/box/incremental/inline.kt
index 5def79d..1797d85 100644
--- a/js/js.translator/testData/box/incremental/inline.kt
+++ b/js/js.translator/testData/box/incremental/inline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
// FILE: a.kt
private inline fun bar(f: () -> String): String = "bar(${f()})"
diff --git a/js/js.translator/testData/box/incremental/multipleExport.kt b/js/js.translator/testData/box/incremental/multipleExport.kt
index 944984f..1de1f60 100644
--- a/js/js.translator/testData/box/incremental/multipleExport.kt
+++ b/js/js.translator/testData/box/incremental/multipleExport.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// PROPERTY_WRITE_COUNT: name=foo_61zpoe$ count=1
// FILE: a.kt
fun foo(x: String): String = x
diff --git a/js/js.translator/testData/box/incremental/multipleReimport.kt b/js/js.translator/testData/box/incremental/multipleReimport.kt
index bc67f05..ccdd10b 100644
--- a/js/js.translator/testData/box/incremental/multipleReimport.kt
+++ b/js/js.translator/testData/box/incremental/multipleReimport.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// MODULE: lib1
// FILE: lib1.kt
diff --git a/js/js.translator/testData/box/incremental/simple.kt b/js/js.translator/testData/box/incremental/simple.kt
index 1d6cfd3..5d114fb 100644
--- a/js/js.translator/testData/box/incremental/simple.kt
+++ b/js/js.translator/testData/box/incremental/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
// FILE: a.kt
private fun bar(): String = "O"
diff --git a/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt b/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt
index 3b0737e..729f1e2 100644
--- a/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt
+++ b/js/js.translator/testData/box/incremental/sourceMapSourceEmbedding.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// SOURCE_MAP_EMBED_SOURCES: ALWAYS
// FILE: a.kt
fun foo() = "O"
diff --git a/js/js.translator/testData/box/incremental/syntheticStatement.kt b/js/js.translator/testData/box/incremental/syntheticStatement.kt
index 421de25..99b2592 100644
--- a/js/js.translator/testData/box/incremental/syntheticStatement.kt
+++ b/js/js.translator/testData/box/incremental/syntheticStatement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
/// FILE: a.kt
fun a() = "["
diff --git a/js/js.translator/testData/box/inheritance/abstractVarOverride.kt b/js/js.translator/testData/box/inheritance/abstractVarOverride.kt
index 5459600..e385d64 100644
--- a/js/js.translator/testData/box/inheritance/abstractVarOverride.kt
+++ b/js/js.translator/testData/box/inheritance/abstractVarOverride.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
open abstract class A() {
diff --git a/js/js.translator/testData/box/inheritance/baseCall.kt b/js/js.translator/testData/box/inheritance/baseCall.kt
index d8af6df..cd8c118 100644
--- a/js/js.translator/testData/box/inheritance/baseCall.kt
+++ b/js/js.translator/testData/box/inheritance/baseCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
open class A(val name: String)
diff --git a/js/js.translator/testData/box/inheritance/baseCallOrder.kt b/js/js.translator/testData/box/inheritance/baseCallOrder.kt
index 3277dbb..2be63c5 100644
--- a/js/js.translator/testData/box/inheritance/baseCallOrder.kt
+++ b/js/js.translator/testData/box/inheritance/baseCallOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
var x = false
diff --git a/js/js.translator/testData/box/inheritance/baseClassDefinedAfterDerived.kt b/js/js.translator/testData/box/inheritance/baseClassDefinedAfterDerived.kt
index 4d1c926..4400b20 100644
--- a/js/js.translator/testData/box/inheritance/baseClassDefinedAfterDerived.kt
+++ b/js/js.translator/testData/box/inheritance/baseClassDefinedAfterDerived.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
diff --git a/js/js.translator/testData/box/inheritance/complexInitializationOrder.kt b/js/js.translator/testData/box/inheritance/complexInitializationOrder.kt
index 80e59d6..4870e72 100644
--- a/js/js.translator/testData/box/inheritance/complexInitializationOrder.kt
+++ b/js/js.translator/testData/box/inheritance/complexInitializationOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
package foo
open class A() {
diff --git a/js/js.translator/testData/box/inheritance/definitionOrder.kt b/js/js.translator/testData/box/inheritance/definitionOrder.kt
index dceb865..a6e80ac 100644
--- a/js/js.translator/testData/box/inheritance/definitionOrder.kt
+++ b/js/js.translator/testData/box/inheritance/definitionOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 524
+// EXPECTED_REACHABLE_NODES: 1411
package foo
class C() : B() {
diff --git a/js/js.translator/testData/box/inheritance/fromFakeClasses.kt b/js/js.translator/testData/box/inheritance/fromFakeClasses.kt
index 6aa4560..25e58b6 100644
--- a/js/js.translator/testData/box/inheritance/fromFakeClasses.kt
+++ b/js/js.translator/testData/box/inheritance/fromFakeClasses.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
class FromAny : Any()
diff --git a/js/js.translator/testData/box/inheritance/fromNativeInterface.kt b/js/js.translator/testData/box/inheritance/fromNativeInterface.kt
index 7258888..a8ff2c8 100644
--- a/js/js.translator/testData/box/inheritance/fromNativeInterface.kt
+++ b/js/js.translator/testData/box/inheritance/fromNativeInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
external interface A {
diff --git a/js/js.translator/testData/box/inheritance/fromNestedNativeClass.kt b/js/js.translator/testData/box/inheritance/fromNestedNativeClass.kt
index e7b3a2e..52b14bf 100644
--- a/js/js.translator/testData/box/inheritance/fromNestedNativeClass.kt
+++ b/js/js.translator/testData/box/inheritance/fromNestedNativeClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// FILE: foo.kt
package foo
diff --git a/js/js.translator/testData/box/inheritance/inheritFromCharIterator.kt b/js/js.translator/testData/box/inheritance/inheritFromCharIterator.kt
index 3e381f2..eff3993 100644
--- a/js/js.translator/testData/box/inheritance/inheritFromCharIterator.kt
+++ b/js/js.translator/testData/box/inheritance/inheritFromCharIterator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class MyCharIterator : CharIterator() {
diff --git a/js/js.translator/testData/box/inheritance/initializationOrder.kt b/js/js.translator/testData/box/inheritance/initializationOrder.kt
index 40084fd..f377244 100644
--- a/js/js.translator/testData/box/inheritance/initializationOrder.kt
+++ b/js/js.translator/testData/box/inheritance/initializationOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
open class A() {
diff --git a/js/js.translator/testData/box/inheritance/initializersOfBasicClassExecute.kt b/js/js.translator/testData/box/inheritance/initializersOfBasicClassExecute.kt
index 55d1936..8bd5d37 100644
--- a/js/js.translator/testData/box/inheritance/initializersOfBasicClassExecute.kt
+++ b/js/js.translator/testData/box/inheritance/initializersOfBasicClassExecute.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
open class A() {
diff --git a/js/js.translator/testData/box/inheritance/interfaces/abstractClassInheritingDefaultMethod.kt b/js/js.translator/testData/box/inheritance/interfaces/abstractClassInheritingDefaultMethod.kt
index e397f60..f2533d0 100644
--- a/js/js.translator/testData/box/inheritance/interfaces/abstractClassInheritingDefaultMethod.kt
+++ b/js/js.translator/testData/box/inheritance/interfaces/abstractClassInheritingDefaultMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
interface I {
fun foo() = "OK"
}
diff --git a/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethod.kt b/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethod.kt
index 7c51c99..71ab577 100644
--- a/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethod.kt
+++ b/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
interface I {
fun foo() = "OK"
}
diff --git a/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethodFromSuperInterface.kt b/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethodFromSuperInterface.kt
index dd2de40..1e79216 100644
--- a/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethodFromSuperInterface.kt
+++ b/js/js.translator/testData/box/inheritance/interfaces/withDefaultMethodFromSuperInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
interface I {
fun foo() = "OK"
}
diff --git a/js/js.translator/testData/box/inheritance/interfaces/withDefaultProperty.kt b/js/js.translator/testData/box/inheritance/interfaces/withDefaultProperty.kt
index c286c23..1560746 100644
--- a/js/js.translator/testData/box/inheritance/interfaces/withDefaultProperty.kt
+++ b/js/js.translator/testData/box/inheritance/interfaces/withDefaultProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
interface I {
val foo: String
get() = "OK"
diff --git a/js/js.translator/testData/box/inheritance/kt3499.kt b/js/js.translator/testData/box/inheritance/kt3499.kt
index 7899ad6..da1b027 100644
--- a/js/js.translator/testData/box/inheritance/kt3499.kt
+++ b/js/js.translator/testData/box/inheritance/kt3499.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
interface A : B, E
diff --git a/js/js.translator/testData/box/inheritance/methodOverride.kt b/js/js.translator/testData/box/inheritance/methodOverride.kt
index bbc89c3..95525fe 100644
--- a/js/js.translator/testData/box/inheritance/methodOverride.kt
+++ b/js/js.translator/testData/box/inheritance/methodOverride.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
open class A {
diff --git a/js/js.translator/testData/box/inheritance/nativeNativeKotlin.kt b/js/js.translator/testData/box/inheritance/nativeNativeKotlin.kt
index 584c759..5275b3b 100644
--- a/js/js.translator/testData/box/inheritance/nativeNativeKotlin.kt
+++ b/js/js.translator/testData/box/inheritance/nativeNativeKotlin.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// FILE: nativeNativeKotlin.kt
package foo
diff --git a/js/js.translator/testData/box/inheritance/overrideAnyMethods.kt b/js/js.translator/testData/box/inheritance/overrideAnyMethods.kt
index 1b25262..c459be7 100644
--- a/js/js.translator/testData/box/inheritance/overrideAnyMethods.kt
+++ b/js/js.translator/testData/box/inheritance/overrideAnyMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
inline fun String.charCodeAt(i: Int): Int = asDynamic().charCodeAt(i)
diff --git a/js/js.translator/testData/box/inheritance/valOverride.kt b/js/js.translator/testData/box/inheritance/valOverride.kt
index 10369d1..5fa817b 100644
--- a/js/js.translator/testData/box/inheritance/valOverride.kt
+++ b/js/js.translator/testData/box/inheritance/valOverride.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
open class C() {
diff --git a/js/js.translator/testData/box/inheritance/valuePassedToAncestorConstructor.kt b/js/js.translator/testData/box/inheritance/valuePassedToAncestorConstructor.kt
index f7614f6..fcae73e 100644
--- a/js/js.translator/testData/box/inheritance/valuePassedToAncestorConstructor.kt
+++ b/js/js.translator/testData/box/inheritance/valuePassedToAncestorConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
open class C(a: Int) {
diff --git a/js/js.translator/testData/box/inheritance/withInitializeMethod.kt b/js/js.translator/testData/box/inheritance/withInitializeMethod.kt
index f6347bc..36eeb14 100644
--- a/js/js.translator/testData/box/inheritance/withInitializeMethod.kt
+++ b/js/js.translator/testData/box/inheritance/withInitializeMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A(val ok: String) {
diff --git a/js/js.translator/testData/box/initialize/classInitializer.kt b/js/js.translator/testData/box/initialize/classInitializer.kt
index c56955b..9677733 100644
--- a/js/js.translator/testData/box/initialize/classInitializer.kt
+++ b/js/js.translator/testData/box/initialize/classInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class B(val name: String)
diff --git a/js/js.translator/testData/box/initialize/complexPropertyInitializer.kt b/js/js.translator/testData/box/initialize/complexPropertyInitializer.kt
index e2a8733..031e98f 100644
--- a/js/js.translator/testData/box/initialize/complexPropertyInitializer.kt
+++ b/js/js.translator/testData/box/initialize/complexPropertyInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun f() {}
diff --git a/js/js.translator/testData/box/initialize/complexTopLevelPropertyInitializer.kt b/js/js.translator/testData/box/initialize/complexTopLevelPropertyInitializer.kt
index a3e925d..2900f5e 100644
--- a/js/js.translator/testData/box/initialize/complexTopLevelPropertyInitializer.kt
+++ b/js/js.translator/testData/box/initialize/complexTopLevelPropertyInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun f() {}
diff --git a/js/js.translator/testData/box/initialize/declarationInitializedWithThrow.kt b/js/js.translator/testData/box/initialize/declarationInitializedWithThrow.kt
index ca253ad..db64689 100644
--- a/js/js.translator/testData/box/initialize/declarationInitializedWithThrow.kt
+++ b/js/js.translator/testData/box/initialize/declarationInitializedWithThrow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// See KT-12254
package foo
diff --git a/js/js.translator/testData/box/initialize/lateinit.kt b/js/js.translator/testData/box/initialize/lateinit.kt
index 05dbf78..5e1365b 100644
--- a/js/js.translator/testData/box/initialize/lateinit.kt
+++ b/js/js.translator/testData/box/initialize/lateinit.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
class Greeting {
val noon = xrun {
verb = "Hello"
diff --git a/js/js.translator/testData/box/initialize/rootPackageValInit.kt b/js/js.translator/testData/box/initialize/rootPackageValInit.kt
index 122b70ce..f62ed6f 100644
--- a/js/js.translator/testData/box/initialize/rootPackageValInit.kt
+++ b/js/js.translator/testData/box/initialize/rootPackageValInit.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
class A(val a: Int)
val x = 1
diff --git a/js/js.translator/testData/box/initialize/rootValInit.kt b/js/js.translator/testData/box/initialize/rootValInit.kt
index 9f8f771..1242f73 100644
--- a/js/js.translator/testData/box/initialize/rootValInit.kt
+++ b/js/js.translator/testData/box/initialize/rootValInit.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A(val a: Int)
diff --git a/js/js.translator/testData/box/inline/anonymousFunction.kt b/js/js.translator/testData/box/inline/anonymousFunction.kt
index c33efab..2ec69ee 100644
--- a/js/js.translator/testData/box/inline/anonymousFunction.kt
+++ b/js/js.translator/testData/box/inline/anonymousFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inline/anonymousObjectInlineMethod.kt b/js/js.translator/testData/box/inline/anonymousObjectInlineMethod.kt
index 5d95d59..584a6a6 100644
--- a/js/js.translator/testData/box/inline/anonymousObjectInlineMethod.kt
+++ b/js/js.translator/testData/box/inline/anonymousObjectInlineMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun add(a: Int, b: Int): Int {
diff --git a/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt b/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt
index e6d2db31..999de6b 100644
--- a/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt
+++ b/js/js.translator/testData/box/inline/arrayLiteralAliasing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 903
+// EXPECTED_REACHABLE_NODES: 1391
/*
This tests that variables (aliases) are created for array literals.
diff --git a/js/js.translator/testData/box/inline/astCopy.kt b/js/js.translator/testData/box/inline/astCopy.kt
index 85b4b1d..357191b 100644
--- a/js/js.translator/testData/box/inline/astCopy.kt
+++ b/js/js.translator/testData/box/inline/astCopy.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1376
package foo
// CHECK_FUNCTIONS_HAVE_SAME_LINES: syntaxTestInline syntaxTest
diff --git a/js/js.translator/testData/box/inline/callFunction.kt b/js/js.translator/testData/box/inline/callFunction.kt
index 245d515..e00c314 100644
--- a/js/js.translator/testData/box/inline/callFunction.kt
+++ b/js/js.translator/testData/box/inline/callFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// CHECK_CONTAINS_NO_CALLS: box except=equals;Baz_getInstance;callLocal;callLocalExtension
// CHECK_CONTAINS_NO_CALLS: callLocal
// CHECK_CONTAINS_NO_CALLS: callLocalExtension
diff --git a/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevel.kt b/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevel.kt
index 175e2af..b26d24b 100644
--- a/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevel.kt
+++ b/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevel.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
// CHECK_NOT_CALLED: inline1
diff --git a/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevelSimple.kt b/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevelSimple.kt
index fb83842..e8865ca 100644
--- a/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevelSimple.kt
+++ b/js/js.translator/testData/box/inline/callInlineFunctionOnTopLevelSimple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_NOT_CALLED: abs
diff --git a/js/js.translator/testData/box/inline/callableReference.kt b/js/js.translator/testData/box/inline/callableReference.kt
index 9ad5568..1816121 100644
--- a/js/js.translator/testData/box/inline/callableReference.kt
+++ b/js/js.translator/testData/box/inline/callableReference.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: multiplyInline except=imul
diff --git a/js/js.translator/testData/box/inline/callableReferenceOfLocalInline.kt b/js/js.translator/testData/box/inline/callableReferenceOfLocalInline.kt
index eee6909..ad278bc 100644
--- a/js/js.translator/testData/box/inline/callableReferenceOfLocalInline.kt
+++ b/js/js.translator/testData/box/inline/callableReferenceOfLocalInline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun multiplyBy(x: Int): () -> ((Int) -> Int) {
diff --git a/js/js.translator/testData/box/inline/classObject.kt b/js/js.translator/testData/box/inline/classObject.kt
index 171112e..303a5c9 100644
--- a/js/js.translator/testData/box/inline/classObject.kt
+++ b/js/js.translator/testData/box/inline/classObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/classObject.1.kt
diff --git a/js/js.translator/testData/box/inline/dontInlineFunctionCall.kt b/js/js.translator/testData/box/inline/dontInlineFunctionCall.kt
index 8ee3aea..fd9b0a8 100644
--- a/js/js.translator/testData/box/inline/dontInlineFunctionCall.kt
+++ b/js/js.translator/testData/box/inline/dontInlineFunctionCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
inline fun block(p: () -> Int) = p()
diff --git a/js/js.translator/testData/box/inline/expressionBodyWithLambdaCall.kt b/js/js.translator/testData/box/inline/expressionBodyWithLambdaCall.kt
index 8c1abe4..0e132bb6f 100644
--- a/js/js.translator/testData/box/inline/expressionBodyWithLambdaCall.kt
+++ b/js/js.translator/testData/box/inline/expressionBodyWithLambdaCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inline/extension.kt b/js/js.translator/testData/box/inline/extension.kt
index a430156..fee2f25 100644
--- a/js/js.translator/testData/box/inline/extension.kt
+++ b/js/js.translator/testData/box/inline/extension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/extension.1.kt
diff --git a/js/js.translator/testData/box/inline/extensionWithManyArguments.kt b/js/js.translator/testData/box/inline/extensionWithManyArguments.kt
index 867724d..a714af4 100644
--- a/js/js.translator/testData/box/inline/extensionWithManyArguments.kt
+++ b/js/js.translator/testData/box/inline/extensionWithManyArguments.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_NOT_CALLED_IN_SCOPE: scope=multiply function=multiply$lambda
diff --git a/js/js.translator/testData/box/inline/identityEquals.kt b/js/js.translator/testData/box/inline/identityEquals.kt
index b5cf33d..83a3e3b 100644
--- a/js/js.translator/testData/box/inline/identityEquals.kt
+++ b/js/js.translator/testData/box/inline/identityEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A
diff --git a/js/js.translator/testData/box/inline/incrementProperty.kt b/js/js.translator/testData/box/inline/incrementProperty.kt
index fa00b0f..f9de665 100644
--- a/js/js.translator/testData/box/inline/incrementProperty.kt
+++ b/js/js.translator/testData/box/inline/incrementProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_NOT_CALLED: inc
diff --git a/js/js.translator/testData/box/inline/inlineCallInsideStringTemplate.kt b/js/js.translator/testData/box/inline/inlineCallInsideStringTemplate.kt
index bc75f43..d6836d8 100644
--- a/js/js.translator/testData/box/inline/inlineCallInsideStringTemplate.kt
+++ b/js/js.translator/testData/box/inline/inlineCallInsideStringTemplate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
inline fun foo(): Any? = "foo()"
diff --git a/js/js.translator/testData/box/inline/inlineCallNoInline.kt b/js/js.translator/testData/box/inline/inlineCallNoInline.kt
index aca756d..30d09ad 100644
--- a/js/js.translator/testData/box/inline/inlineCallNoInline.kt
+++ b/js/js.translator/testData/box/inline/inlineCallNoInline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_NOT_CALLED: sumEvenInRange
diff --git a/js/js.translator/testData/box/inline/inlineCapturingThis.kt b/js/js.translator/testData/box/inline/inlineCapturingThis.kt
index 12ffbd6..965cfb2 100644
--- a/js/js.translator/testData/box/inline/inlineCapturingThis.kt
+++ b/js/js.translator/testData/box/inline/inlineCapturingThis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inline/inlineChain.kt b/js/js.translator/testData/box/inline/inlineChain.kt
index b443ec8..5cc7d7e 100644
--- a/js/js.translator/testData/box/inline/inlineChain.kt
+++ b/js/js.translator/testData/box/inline/inlineChain.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_CONTAINS_NO_CALLS: squareMultipliedByTwo except=imul
diff --git a/js/js.translator/testData/box/inline/inlineChainWithFewStatements.kt b/js/js.translator/testData/box/inline/inlineChainWithFewStatements.kt
index 15792e5..89c4669 100644
--- a/js/js.translator/testData/box/inline/inlineChainWithFewStatements.kt
+++ b/js/js.translator/testData/box/inline/inlineChainWithFewStatements.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_CONTAINS_NO_CALLS: squareMultipliedByTwo except=imul
diff --git a/js/js.translator/testData/box/inline/inlineDefaultArgument.kt b/js/js.translator/testData/box/inline/inlineDefaultArgument.kt
index 9b7ba2a..4c99715 100644
--- a/js/js.translator/testData/box/inline/inlineDefaultArgument.kt
+++ b/js/js.translator/testData/box/inline/inlineDefaultArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: identity
diff --git a/js/js.translator/testData/box/inline/inlineFunctionInLambda.kt b/js/js.translator/testData/box/inline/inlineFunctionInLambda.kt
index 7a38e0a..2edbd7a 100644
--- a/js/js.translator/testData/box/inline/inlineFunctionInLambda.kt
+++ b/js/js.translator/testData/box/inline/inlineFunctionInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_CONTAINS_NO_CALLS: doNothingNoInline
diff --git a/js/js.translator/testData/box/inline/inlineGenericSimple.kt b/js/js.translator/testData/box/inline/inlineGenericSimple.kt
index bf2472c..7cb8770 100644
--- a/js/js.translator/testData/box/inline/inlineGenericSimple.kt
+++ b/js/js.translator/testData/box/inline/inlineGenericSimple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: doNothingInt
diff --git a/js/js.translator/testData/box/inline/inlineIf.kt b/js/js.translator/testData/box/inline/inlineIf.kt
index 28b6307..800d041 100644
--- a/js/js.translator/testData/box/inline/inlineIf.kt
+++ b/js/js.translator/testData/box/inline/inlineIf.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: testIf1
diff --git a/js/js.translator/testData/box/inline/inlineInc.kt b/js/js.translator/testData/box/inline/inlineInc.kt
index 98f4c3e..90b6811 100644
--- a/js/js.translator/testData/box/inline/inlineInc.kt
+++ b/js/js.translator/testData/box/inline/inlineInc.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_CONTAINS_NO_CALLS: multiplyNoInline except=imul
diff --git a/js/js.translator/testData/box/inline/inlineIntSimple.kt b/js/js.translator/testData/box/inline/inlineIntSimple.kt
index 74ba526..22313d5 100644
--- a/js/js.translator/testData/box/inline/inlineIntSimple.kt
+++ b/js/js.translator/testData/box/inline/inlineIntSimple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
// CHECK_CONTAINS_NO_CALLS: doNothing1
diff --git a/js/js.translator/testData/box/inline/inlineLambdaNoCapture.kt b/js/js.translator/testData/box/inline/inlineLambdaNoCapture.kt
index 20cbb13..5f43b65 100644
--- a/js/js.translator/testData/box/inline/inlineLambdaNoCapture.kt
+++ b/js/js.translator/testData/box/inline/inlineLambdaNoCapture.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_CONTAINS_NO_CALLS: sumEven
diff --git a/js/js.translator/testData/box/inline/inlineLambdaWithCapture.kt b/js/js.translator/testData/box/inline/inlineLambdaWithCapture.kt
index 5ef24c0..61ab31f 100644
--- a/js/js.translator/testData/box/inline/inlineLambdaWithCapture.kt
+++ b/js/js.translator/testData/box/inline/inlineLambdaWithCapture.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
// CHECK_CONTAINS_NO_CALLS: maxBySquare except=imul
diff --git a/js/js.translator/testData/box/inline/inlineMethod.kt b/js/js.translator/testData/box/inline/inlineMethod.kt
index 69a7af3..a1a8c3e 100644
--- a/js/js.translator/testData/box/inline/inlineMethod.kt
+++ b/js/js.translator/testData/box/inline/inlineMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
// CHECK_CONTAINS_NO_CALLS: add
diff --git a/js/js.translator/testData/box/inline/inlineNoReturn.kt b/js/js.translator/testData/box/inline/inlineNoReturn.kt
index a84bb7f..748d78a 100644
--- a/js/js.translator/testData/box/inline/inlineNoReturn.kt
+++ b/js/js.translator/testData/box/inline/inlineNoReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 528
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: factAbsNoInline1 except=imul
diff --git a/js/js.translator/testData/box/inline/inlineOrder.kt b/js/js.translator/testData/box/inline/inlineOrder.kt
index ebbb293..bde42cc 100644
--- a/js/js.translator/testData/box/inline/inlineOrder.kt
+++ b/js/js.translator/testData/box/inline/inlineOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_FUNCTIONS_HAVE_SAME_LINES: declaredBefore declaredAfter match=(h|g)1 replace=$1
diff --git a/js/js.translator/testData/box/inline/inlineSimpleAssignment.kt b/js/js.translator/testData/box/inline/inlineSimpleAssignment.kt
index 55a251a..420d4bd 100644
--- a/js/js.translator/testData/box/inline/inlineSimpleAssignment.kt
+++ b/js/js.translator/testData/box/inline/inlineSimpleAssignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// CHECK_NOT_CALLED: sum
diff --git a/js/js.translator/testData/box/inline/innerOuterThis.kt b/js/js.translator/testData/box/inline/innerOuterThis.kt
index 614a0cb..585a32f 100644
--- a/js/js.translator/testData/box/inline/innerOuterThis.kt
+++ b/js/js.translator/testData/box/inline/innerOuterThis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
inline fun<T> with1(value: T, p: T.() -> Unit) = value.p()
diff --git a/js/js.translator/testData/box/inline/iteratorOnInlineFunctionResult.kt b/js/js.translator/testData/box/inline/iteratorOnInlineFunctionResult.kt
index 8d2e218..8228e14 100644
--- a/js/js.translator/testData/box/inline/iteratorOnInlineFunctionResult.kt
+++ b/js/js.translator/testData/box/inline/iteratorOnInlineFunctionResult.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 605
+// EXPECTED_REACHABLE_NODES: 1378
package foo
inline fun bar(f: () -> Int): Array<Int> = arrayOf(f())
diff --git a/js/js.translator/testData/box/inline/jsCode.kt b/js/js.translator/testData/box/inline/jsCode.kt
index d6d1c71..9c51eea 100644
--- a/js/js.translator/testData/box/inline/jsCode.kt
+++ b/js/js.translator/testData/box/inline/jsCode.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inline/jsCodeVarDeclared.kt b/js/js.translator/testData/box/inline/jsCodeVarDeclared.kt
index d1f482a..c726eab 100644
--- a/js/js.translator/testData/box/inline/jsCodeVarDeclared.kt
+++ b/js/js.translator/testData/box/inline/jsCodeVarDeclared.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inline/lambdaInLambda.kt b/js/js.translator/testData/box/inline/lambdaInLambda.kt
index d0caf4b..7df27a0 100644
--- a/js/js.translator/testData/box/inline/lambdaInLambda.kt
+++ b/js/js.translator/testData/box/inline/lambdaInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CALLED_IN_SCOPE: scope=multiplyBy2 function=multiplyBy2$lambda
diff --git a/js/js.translator/testData/box/inline/lambdaReassignment.kt b/js/js.translator/testData/box/inline/lambdaReassignment.kt
index de61b25..9876985 100644
--- a/js/js.translator/testData/box/inline/lambdaReassignment.kt
+++ b/js/js.translator/testData/box/inline/lambdaReassignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
inline fun run(func: () -> Int): Int {
diff --git a/js/js.translator/testData/box/inline/lambdaReassignmentWithCapture.kt b/js/js.translator/testData/box/inline/lambdaReassignmentWithCapture.kt
index de0e623..a5fe161 100644
--- a/js/js.translator/testData/box/inline/lambdaReassignmentWithCapture.kt
+++ b/js/js.translator/testData/box/inline/lambdaReassignmentWithCapture.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
package foo
data class IntPair(public var fst: Int, public var snd: Int)
diff --git a/js/js.translator/testData/box/inline/localInlineExtensionFunction.kt b/js/js.translator/testData/box/inline/localInlineExtensionFunction.kt
index 133d1b4..6bcc958 100644
--- a/js/js.translator/testData/box/inline/localInlineExtensionFunction.kt
+++ b/js/js.translator/testData/box/inline/localInlineExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 535
+// EXPECTED_REACHABLE_NODES: 1387
package foo
// CHECK_CONTAINS_NO_CALLS: capturedInLambda
diff --git a/js/js.translator/testData/box/inline/localInlineFunction.kt b/js/js.translator/testData/box/inline/localInlineFunction.kt
index 47b8d6b..5dbfdba 100644
--- a/js/js.translator/testData/box/inline/localInlineFunction.kt
+++ b/js/js.translator/testData/box/inline/localInlineFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: localWithCapture
diff --git a/js/js.translator/testData/box/inline/localInlineFunctionComplex.kt b/js/js.translator/testData/box/inline/localInlineFunctionComplex.kt
index b473814..47c4b31 100644
--- a/js/js.translator/testData/box/inline/localInlineFunctionComplex.kt
+++ b/js/js.translator/testData/box/inline/localInlineFunctionComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 535
+// EXPECTED_REACHABLE_NODES: 1387
package foo
// CHECK_CONTAINS_NO_CALLS: add
diff --git a/js/js.translator/testData/box/inline/localInlineFunctionDeclaredInLambda.kt b/js/js.translator/testData/box/inline/localInlineFunctionDeclaredInLambda.kt
index 041f091..f18faa5 100644
--- a/js/js.translator/testData/box/inline/localInlineFunctionDeclaredInLambda.kt
+++ b/js/js.translator/testData/box/inline/localInlineFunctionDeclaredInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: localWithCapture
diff --git a/js/js.translator/testData/box/inline/localInlineFunctionNameClash.kt b/js/js.translator/testData/box/inline/localInlineFunctionNameClash.kt
index 08a2bb6..fe33141 100644
--- a/js/js.translator/testData/box/inline/localInlineFunctionNameClash.kt
+++ b/js/js.translator/testData/box/inline/localInlineFunctionNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CONTAINS_NO_CALLS: add
diff --git a/js/js.translator/testData/box/inline/localInlineFunctionReference.kt b/js/js.translator/testData/box/inline/localInlineFunctionReference.kt
index 5cc47b4..d87578f 100644
--- a/js/js.translator/testData/box/inline/localInlineFunctionReference.kt
+++ b/js/js.translator/testData/box/inline/localInlineFunctionReference.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun multiplyBy(a: Int): (Int) -> Int {
diff --git a/js/js.translator/testData/box/inline/metadataForPublicFunction.kt b/js/js.translator/testData/box/inline/metadataForPublicFunction.kt
index b9f8f12..7fbba9b 100644
--- a/js/js.translator/testData/box/inline/metadataForPublicFunction.kt
+++ b/js/js.translator/testData/box/inline/metadataForPublicFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
package foo
// CHECK_CONTAINS_NO_CALLS: test1 except=imul
diff --git a/js/js.translator/testData/box/inline/multiDeclaration.kt b/js/js.translator/testData/box/inline/multiDeclaration.kt
index 159669b..87b1ed0 100644
--- a/js/js.translator/testData/box/inline/multiDeclaration.kt
+++ b/js/js.translator/testData/box/inline/multiDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_NOT_CALLED: component1
diff --git a/js/js.translator/testData/box/inline/noInlineLambda.kt b/js/js.translator/testData/box/inline/noInlineLambda.kt
index 691f3f5..2dee72b 100644
--- a/js/js.translator/testData/box/inline/noInlineLambda.kt
+++ b/js/js.translator/testData/box/inline/noInlineLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_CALLED_IN_SCOPE: scope=multiplyBy2 function=multiplyBy2$lambda
diff --git a/js/js.translator/testData/box/inline/operators.kt b/js/js.translator/testData/box/inline/operators.kt
index 8409063..a197630 100644
--- a/js/js.translator/testData/box/inline/operators.kt
+++ b/js/js.translator/testData/box/inline/operators.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
// CHECK_NOT_CALLED_IN_SCOPE: function=plus_za3lpa$ scope=box
// CHECK_NOT_CALLED_IN_SCOPE: function=plus scope=box
// CHECK_NOT_CALLED_IN_SCOPE: function=invoke scope=box
diff --git a/js/js.translator/testData/box/inline/params.kt b/js/js.translator/testData/box/inline/params.kt
index 1c215d4..90dfe3f 100644
--- a/js/js.translator/testData/box/inline/params.kt
+++ b/js/js.translator/testData/box/inline/params.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/params.1.kt
diff --git a/js/js.translator/testData/box/inline/rootConstructor.kt b/js/js.translator/testData/box/inline/rootConstructor.kt
index a3991b2..fd6c3ed 100644
--- a/js/js.translator/testData/box/inline/rootConstructor.kt
+++ b/js/js.translator/testData/box/inline/rootConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt
diff --git a/js/js.translator/testData/box/inline/safeCall.kt b/js/js.translator/testData/box/inline/safeCall.kt
index 57a1c11..2a1a719 100644
--- a/js/js.translator/testData/box/inline/safeCall.kt
+++ b/js/js.translator/testData/box/inline/safeCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_CONTAINS_NO_CALLS: sum
diff --git a/js/js.translator/testData/box/inline/severalClosures.kt b/js/js.translator/testData/box/inline/severalClosures.kt
index 9cad888..46006ad 100644
--- a/js/js.translator/testData/box/inline/severalClosures.kt
+++ b/js/js.translator/testData/box/inline/severalClosures.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/severalClosures.1.kt
diff --git a/js/js.translator/testData/box/inline/severalUsage.kt b/js/js.translator/testData/box/inline/severalUsage.kt
index 02470a1..71d05d0 100644
--- a/js/js.translator/testData/box/inline/severalUsage.kt
+++ b/js/js.translator/testData/box/inline/severalUsage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/severalUsage.1.kt
diff --git a/js/js.translator/testData/box/inline/simpleDouble.kt b/js/js.translator/testData/box/inline/simpleDouble.kt
index a03df34..a029588 100644
--- a/js/js.translator/testData/box/inline/simpleDouble.kt
+++ b/js/js.translator/testData/box/inline/simpleDouble.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt
diff --git a/js/js.translator/testData/box/inline/simpleEnum.kt b/js/js.translator/testData/box/inline/simpleEnum.kt
index e9514ed..0f9f647 100644
--- a/js/js.translator/testData/box/inline/simpleEnum.kt
+++ b/js/js.translator/testData/box/inline/simpleEnum.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 521
+// EXPECTED_REACHABLE_NODES: 1388
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt
diff --git a/js/js.translator/testData/box/inline/simpleInt.kt b/js/js.translator/testData/box/inline/simpleInt.kt
index acb9bd4..a10ea54 100644
--- a/js/js.translator/testData/box/inline/simpleInt.kt
+++ b/js/js.translator/testData/box/inline/simpleInt.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/simpleInt.1.kt
diff --git a/js/js.translator/testData/box/inline/simpleLambda.kt b/js/js.translator/testData/box/inline/simpleLambda.kt
index 59b04b3..31d5033 100644
--- a/js/js.translator/testData/box/inline/simpleLambda.kt
+++ b/js/js.translator/testData/box/inline/simpleLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt
diff --git a/js/js.translator/testData/box/inline/simpleObject.kt b/js/js.translator/testData/box/inline/simpleObject.kt
index 98058e1..8b13f4b 100644
--- a/js/js.translator/testData/box/inline/simpleObject.kt
+++ b/js/js.translator/testData/box/inline/simpleObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/simple/simpleObject.1.kt
diff --git a/js/js.translator/testData/box/inline/simpleReturnFunctionWithResultUnused.kt b/js/js.translator/testData/box/inline/simpleReturnFunctionWithResultUnused.kt
index 3f8a17a..d51d7ba 100644
--- a/js/js.translator/testData/box/inline/simpleReturnFunctionWithResultUnused.kt
+++ b/js/js.translator/testData/box/inline/simpleReturnFunctionWithResultUnused.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
var flag = false
diff --git a/js/js.translator/testData/box/inline/statementsAfterReturn.kt b/js/js.translator/testData/box/inline/statementsAfterReturn.kt
index f51edf4..a2e6019 100644
--- a/js/js.translator/testData/box/inline/statementsAfterReturn.kt
+++ b/js/js.translator/testData/box/inline/statementsAfterReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 533
+// EXPECTED_REACHABLE_NODES: 1385
package foo
data class State(public var value: Int = 10)
diff --git a/js/js.translator/testData/box/inline/thisImplicitlyCaptured.kt b/js/js.translator/testData/box/inline/thisImplicitlyCaptured.kt
index 97a94da..aa89c03 100644
--- a/js/js.translator/testData/box/inline/thisImplicitlyCaptured.kt
+++ b/js/js.translator/testData/box/inline/thisImplicitlyCaptured.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1391
package foo
class Runner {
diff --git a/js/js.translator/testData/box/inline/thisLiteralAliasing.kt b/js/js.translator/testData/box/inline/thisLiteralAliasing.kt
index 7c1fd5b..38a0fb6 100644
--- a/js/js.translator/testData/box/inline/thisLiteralAliasing.kt
+++ b/js/js.translator/testData/box/inline/thisLiteralAliasing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class A() {
diff --git a/js/js.translator/testData/box/inline/vararg.kt b/js/js.translator/testData/box/inline/vararg.kt
index 0892f77..9717334 100644
--- a/js/js.translator/testData/box/inline/vararg.kt
+++ b/js/js.translator/testData/box/inline/vararg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/alsoWithReassingment.kt b/js/js.translator/testData/box/inlineEvaluationOrder/alsoWithReassingment.kt
index 70b593b..540ef25 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/alsoWithReassingment.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/alsoWithReassingment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
private var _value: String = "OK"
private inline fun String.myAlso(f: (String) -> Unit): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCall.kt b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCall.kt
index c5a4697..361dcaa 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCall.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun sum(x: Int, y: Int): Int {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCallMultipleInlineCalls.kt b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCallMultipleInlineCalls.kt
index 7dc47d0..c3a3721 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCallMultipleInlineCalls.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfCallMultipleInlineCalls.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun sum(a: Int, b: Int, c: Int, d: Int): Int {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfInlineCall.kt b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfInlineCall.kt
index 23c7f968..dd57057 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfInlineCall.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfInlineCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_NOT_CALLED: max
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfNew.kt b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfNew.kt
index 5f2dae2..cea7c88 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfNew.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/argumentOfNew.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class Sum(x: Int, y: Int) {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess1.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess1.kt
index 962f443..181ffa9 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess1.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess1.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess2.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess2.kt
index e6522d5..2003d6e 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess2.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess3.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess3.kt
index 7c8b1e8..2676cc0 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess3.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccess3.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt
index 9cfd240..646626c 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayAccessLhsDecomposed.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 896
+// EXPECTED_REACHABLE_NODES: 1384
package foo
var global = ""
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteral.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteral.kt
index e0fd559..6234490 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteral.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralMultipleInlineCalls.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralMultipleInlineCalls.kt
index d6d95449..8cf6570 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralMultipleInlineCalls.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralMultipleInlineCalls.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralNested.kt b/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralNested.kt
index f760cbb..045d4af 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralNested.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/arrayLiteralNested.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/assignment.kt b/js/js.translator/testData/box/inlineEvaluationOrder/assignment.kt
index c3a1c65..36d68fd 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/assignment.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/assignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
class A(var x: Int) {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperator.kt b/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperator.kt
index c7dd4cf..dacbe88 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperator.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperatorMultipleInlineCalls.kt b/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperatorMultipleInlineCalls.kt
index f833d33..9950d0c 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperatorMultipleInlineCalls.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/binaryOperatorMultipleInlineCalls.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/callQualifier.kt b/js/js.translator/testData/box/inlineEvaluationOrder/callQualifier.kt
index e9a373a..7dae368 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/callQualifier.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/callQualifier.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun multiplyFun(): (Int, Int)->Int {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/callQualifierComplex.kt b/js/js.translator/testData/box/inlineEvaluationOrder/callQualifierComplex.kt
index 608a49d..aae90dc1 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/callQualifierComplex.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/callQualifierComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
// CHECK_NOT_CALLED: multiplyFunInline
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/conditional.kt b/js/js.translator/testData/box/inlineEvaluationOrder/conditional.kt
index 3a75b65..9aeac8b 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/conditional.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/conditional.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun test(x: Boolean): Boolean =
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalElvis.kt b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalElvis.kt
index 3d3c4d8..00d4977 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalElvis.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalElvis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun test(x: Boolean?): Boolean = fizz(x) ?: buzz(true)
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalNested.kt b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalNested.kt
index faa1133..ded6468 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalNested.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalNested.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun test(x: Boolean, y: Boolean): Int =
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpression.kt b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpression.kt
index 1a40389..2013c1e 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpression.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun test(x: Boolean): Boolean =
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpressionElvis.kt b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpressionElvis.kt
index 3c3ad4f..5be20ab 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpressionElvis.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/conditionalTestExpressionElvis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun test(x: Boolean?): Boolean = buzz(x) ?: fizz(true)
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/continueInExtractedDoWhile.kt b/js/js.translator/testData/box/inlineEvaluationOrder/continueInExtractedDoWhile.kt
index d41484b..f3788fd 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/continueInExtractedDoWhile.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/continueInExtractedDoWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1383
package foo
private inline fun bar(predicate: (Char) -> Boolean): Int {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/doWhile.kt b/js/js.translator/testData/box/inlineEvaluationOrder/doWhile.kt
index 7349599..2559b87 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/doWhile.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/doWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/doWhileComplex.kt b/js/js.translator/testData/box/inlineEvaluationOrder/doWhileComplex.kt
index 2b2ab6d..61cede9 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/doWhileComplex.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/doWhileComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/for.kt b/js/js.translator/testData/box/inlineEvaluationOrder/for.kt
index 38f16fa..1fd92dc 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/for.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/for.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/if.kt b/js/js.translator/testData/box/inlineEvaluationOrder/if.kt
index 2166e77..eea8541 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/if.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/if.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun test(x: Boolean, y: Boolean): Boolean {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/inlineFunctionAsParameterOfQualifiedCall.kt b/js/js.translator/testData/box/inlineEvaluationOrder/inlineFunctionAsParameterOfQualifiedCall.kt
index de0447d..346a59a 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/inlineFunctionAsParameterOfQualifiedCall.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/inlineFunctionAsParameterOfQualifiedCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1446
+// EXPECTED_REACHABLE_NODES: 1634
// See KT-11711
package foo
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/lambdaPropertyExtracted.kt b/js/js.translator/testData/box/inlineEvaluationOrder/lambdaPropertyExtracted.kt
index b690671..009f774 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/lambdaPropertyExtracted.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/lambdaPropertyExtracted.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// See KT-7674
package foo
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/lambdaWithClosure.kt b/js/js.translator/testData/box/inlineEvaluationOrder/lambdaWithClosure.kt
index 5fd8b4e..f9778b5 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/lambdaWithClosure.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/lambdaWithClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
/* This tests checks, that lambda fabric invocation is not extracted.
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/logicalAnd.kt b/js/js.translator/testData/box/inlineEvaluationOrder/logicalAnd.kt
index 5ef443f..791f2e6 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/logicalAnd.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/logicalAnd.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/logicalAndOrMultipleInlineCalls.kt b/js/js.translator/testData/box/inlineEvaluationOrder/logicalAndOrMultipleInlineCalls.kt
index cd18f4a..d4d7f1a 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/logicalAndOrMultipleInlineCalls.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/logicalAndOrMultipleInlineCalls.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/logicalOr.kt b/js/js.translator/testData/box/inlineEvaluationOrder/logicalOr.kt
index 0505ca7..d498116 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/logicalOr.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/logicalOr.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/methodCallQualifierWithSideEffect.kt b/js/js.translator/testData/box/inlineEvaluationOrder/methodCallQualifierWithSideEffect.kt
index 496f66c..bc2b300 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/methodCallQualifierWithSideEffect.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/methodCallQualifierWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
// Test for KT-7502
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/methodDecomposedWithBind.kt b/js/js.translator/testData/box/inlineEvaluationOrder/methodDecomposedWithBind.kt
index ff36f94..5fad2be 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/methodDecomposedWithBind.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/methodDecomposedWithBind.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1219
+// EXPECTED_REACHABLE_NODES: 1386
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/methodInlineCallQualifierWithSideEffect.kt b/js/js.translator/testData/box/inlineEvaluationOrder/methodInlineCallQualifierWithSideEffect.kt
index f699417..3aaeb26 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/methodInlineCallQualifierWithSideEffect.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/methodInlineCallQualifierWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
// Test for KT-7502
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclaration.kt b/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclaration.kt
index 276a3c5..cc0403d 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclaration.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
// CHECK_NOT_CALLED: component2
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclarationComplex.kt b/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclarationComplex.kt
index 4f85d4b..63da144 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclarationComplex.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/multiDeclarationComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
// CHECK_NOT_CALLED: component2
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/nestedContinueInExtractedDoWhile.kt b/js/js.translator/testData/box/inlineEvaluationOrder/nestedContinueInExtractedDoWhile.kt
index ef25e04..f14bbb0 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/nestedContinueInExtractedDoWhile.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/nestedContinueInExtractedDoWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
private inline fun bar(predicate: (Int) -> Boolean) {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/nestedInlineCall.kt b/js/js.translator/testData/box/inlineEvaluationOrder/nestedInlineCall.kt
index fb306a0..27294fa 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/nestedInlineCall.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/nestedInlineCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrder.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrder.kt
index ba55ba0..e7371bb 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrder.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class A(val x: Int = fizz(1) + 1) {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrderSimple.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrderSimple.kt
index a879599..ab4d4934 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrderSimple.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertiesInitializationOrderSimple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class A {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAfterModification.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAfterModification.kt
index 3381856..8acc8ab 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAfterModification.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAfterModification.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
class A {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAndInitializer.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAndInitializer.kt
index da9e462..e48ed00 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAndInitializer.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessAndInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
object A {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessWithSideEffect.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessWithSideEffect.kt
index 1b75d50..055dff5 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessWithSideEffect.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertyAccessWithSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 543
+// EXPECTED_REACHABLE_NODES: 1386
package foo
var g: Any?
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectExtracted.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectExtracted.kt
index d91ffb5..a681ce6 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectExtracted.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectExtracted.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// Looks similar to KT-7674
package foo
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectPassedToInlineFunction.kt b/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectPassedToInlineFunction.kt
index 76cb181..59f0b39 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectPassedToInlineFunction.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/propertyWithSideEffectPassedToInlineFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// See KT-7043, KT-11711
package foo
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/ternaryConditional.kt b/js/js.translator/testData/box/inlineEvaluationOrder/ternaryConditional.kt
index 1f2d751..e2c6a83 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/ternaryConditional.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/ternaryConditional.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_NOT_CALLED: bar_vux9f0$
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/while.kt b/js/js.translator/testData/box/inlineEvaluationOrder/while.kt
index df0446c..1e1a219 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/while.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/while.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/whileComplex.kt b/js/js.translator/testData/box/inlineEvaluationOrder/whileComplex.kt
index ce78844..9a12184 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/whileComplex.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/whileComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/inlineEvaluationOrder/whileConditionExtracted.kt b/js/js.translator/testData/box/inlineEvaluationOrder/whileConditionExtracted.kt
index 20049dd..3d0eb26 100644
--- a/js/js.translator/testData/box/inlineEvaluationOrder/whileConditionExtracted.kt
+++ b/js/js.translator/testData/box/inlineEvaluationOrder/whileConditionExtracted.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1381
// See KT-8005
package foo
diff --git a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectInSimilarFunctions.kt b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectInSimilarFunctions.kt
index dede3e6..21c7f09 100644
--- a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectInSimilarFunctions.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectInSimilarFunctions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// FILE: a.kt
inline fun foo(x: String): I = object : I {
diff --git a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSite.kt b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSite.kt
index 71b7021..c813689 100644
--- a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSite.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSite.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSiteSuperParams.kt b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSiteSuperParams.kt
index 0ce57ac..9d95950 100644
--- a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSiteSuperParams.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnCallSiteSuperParams.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSite.kt b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSite.kt
index 4ede3e0..0b24931 100644
--- a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSite.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSite.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 515
+// EXPECTED_REACHABLE_NODES: 1402
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSiteSuperParams.kt b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSiteSuperParams.kt
index 1918505..c896a37 100644
--- a/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSiteSuperParams.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/anonymousObjectOnDeclarationSiteSuperParams.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 513
+// EXPECTED_REACHABLE_NODES: 1400
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/builders.kt b/js/js.translator/testData/box/inlineMultiFile/builders.kt
index 42a0ff2..cd50e26 100644
--- a/js/js.translator/testData/box/inlineMultiFile/builders.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/builders.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1261
+// EXPECTED_REACHABLE_NODES: 1509
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/builders/builders.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt b/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt
index e992df3..7cbc26d 100644
--- a/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/buildersAndLambdaCapturing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1272
+// EXPECTED_REACHABLE_NODES: 1520
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/captureInlinable.kt b/js/js.translator/testData/box/inlineMultiFile/captureInlinable.kt
index 0c7bdec..c318328 100644
--- a/js/js.translator/testData/box/inlineMultiFile/captureInlinable.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/captureInlinable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/captureInlinableAndOther.kt b/js/js.translator/testData/box/inlineMultiFile/captureInlinableAndOther.kt
index 19721eb..7330d2f 100644
--- a/js/js.translator/testData/box/inlineMultiFile/captureInlinableAndOther.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/captureInlinableAndOther.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/captureThisAndReceiver.kt b/js/js.translator/testData/box/inlineMultiFile/captureThisAndReceiver.kt
index 6290875..e7e9195 100644
--- a/js/js.translator/testData/box/inlineMultiFile/captureThisAndReceiver.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/captureThisAndReceiver.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/closureChain.kt b/js/js.translator/testData/box/inlineMultiFile/closureChain.kt
index 35e1915..e46d4e0 100644
--- a/js/js.translator/testData/box/inlineMultiFile/closureChain.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/closureChain.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/complex/closureChain.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/defaultMethod.kt b/js/js.translator/testData/box/inlineMultiFile/defaultMethod.kt
index 722a002..288b84f 100644
--- a/js/js.translator/testData/box/inlineMultiFile/defaultMethod.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/defaultMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/generics.kt b/js/js.translator/testData/box/inlineMultiFile/generics.kt
index 4118f4c..8d43da4 100644
--- a/js/js.translator/testData/box/inlineMultiFile/generics.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/generics.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/capture/generics.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/inlineInDefaultParameter.kt b/js/js.translator/testData/box/inlineMultiFile/inlineInDefaultParameter.kt
index 60b3dc2..5f3e522 100644
--- a/js/js.translator/testData/box/inlineMultiFile/inlineInDefaultParameter.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/inlineInDefaultParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/inlineMultiFileSimple.kt b/js/js.translator/testData/box/inlineMultiFile/inlineMultiFileSimple.kt
index 0396283..426e45a 100644
--- a/js/js.translator/testData/box/inlineMultiFile/inlineMultiFileSimple.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/inlineMultiFileSimple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// FILE: a.kt
package foo
diff --git a/js/js.translator/testData/box/inlineMultiFile/lambdaCloning.kt b/js/js.translator/testData/box/inlineMultiFile/lambdaCloning.kt
index bc00028..c0a57a6 100644
--- a/js/js.translator/testData/box/inlineMultiFile/lambdaCloning.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/lambdaCloning.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/lambdaInLambda2.kt b/js/js.translator/testData/box/inlineMultiFile/lambdaInLambda2.kt
index 6e121b9..839cb1d 100644
--- a/js/js.translator/testData/box/inlineMultiFile/lambdaInLambda2.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/lambdaInLambda2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/lambdaInLambdaNoInline.kt b/js/js.translator/testData/box/inlineMultiFile/lambdaInLambdaNoInline.kt
index c24f93e..b22a422 100644
--- a/js/js.translator/testData/box/inlineMultiFile/lambdaInLambdaNoInline.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/lambdaInLambdaNoInline.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/regeneratedLambdaName.kt b/js/js.translator/testData/box/inlineMultiFile/regeneratedLambdaName.kt
index cacc653..c2b6dff 100644
--- a/js/js.translator/testData/box/inlineMultiFile/regeneratedLambdaName.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/regeneratedLambdaName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/sameCaptured.kt b/js/js.translator/testData/box/inlineMultiFile/sameCaptured.kt
index 453159b..759498e 100644
--- a/js/js.translator/testData/box/inlineMultiFile/sameCaptured.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/sameCaptured.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInClass.kt b/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInClass.kt
index b21aa78..b67fa4a 100644
--- a/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInClass.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInPackage.kt b/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInPackage.kt
index 88a4127..6aa5111 100644
--- a/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInPackage.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/simpleCapturingInPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/simpleDefaultMethod.kt b/js/js.translator/testData/box/inlineMultiFile/simpleDefaultMethod.kt
index 2d4d8ba..fd87f6e 100644
--- a/js/js.translator/testData/box/inlineMultiFile/simpleDefaultMethod.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/simpleDefaultMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/trait.kt b/js/js.translator/testData/box/inlineMultiFile/trait.kt
index ed017c8..b164615 100644
--- a/js/js.translator/testData/box/inlineMultiFile/trait.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/trait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/trait/trait.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/tryCatch.kt b/js/js.translator/testData/box/inlineMultiFile/tryCatch.kt
index 43c8932..a94f871 100644
--- a/js/js.translator/testData/box/inlineMultiFile/tryCatch.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/tryCatch.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 514
+// EXPECTED_REACHABLE_NODES: 1396
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/tryCatch2.kt b/js/js.translator/testData/box/inlineMultiFile/tryCatch2.kt
index 5d7f2f1..e268697 100644
--- a/js/js.translator/testData/box/inlineMultiFile/tryCatch2.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/tryCatch2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 517
+// EXPECTED_REACHABLE_NODES: 1399
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/tryCatchFinally.kt b/js/js.translator/testData/box/inlineMultiFile/tryCatchFinally.kt
index a70317d..5f108b1 100644
--- a/js/js.translator/testData/box/inlineMultiFile/tryCatchFinally.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/tryCatchFinally.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1393
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/use.kt b/js/js.translator/testData/box/inlineMultiFile/use.kt
index cf2abb7..1e6d272 100644
--- a/js/js.translator/testData/box/inlineMultiFile/use.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/use.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 512
+// EXPECTED_REACHABLE_NODES: 1399
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/complex/use.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiFile/with.kt b/js/js.translator/testData/box/inlineMultiFile/with.kt
index 9479786..85cee07 100644
--- a/js/js.translator/testData/box/inlineMultiFile/with.kt
+++ b/js/js.translator/testData/box/inlineMultiFile/with.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
/*
* Copy of JVM-backend test
* Found at: compiler/testData/codegen/boxInline/complex/with.1.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/anotherModuleValInClosure.kt b/js/js.translator/testData/box/inlineMultiModule/anotherModuleValInClosure.kt
index e17060e..be62086 100644
--- a/js/js.translator/testData/box/inlineMultiModule/anotherModuleValInClosure.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/anotherModuleValInClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/callFunction.kt b/js/js.translator/testData/box/inlineMultiModule/callFunction.kt
index e9a35c1..5bc6da8 100644
--- a/js/js.translator/testData/box/inlineMultiModule/callFunction.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/callFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/callableReference.kt b/js/js.translator/testData/box/inlineMultiModule/callableReference.kt
index 5716c24..ea37aba 100644
--- a/js/js.translator/testData/box/inlineMultiModule/callableReference.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/callableReference.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/calledByFqName.kt b/js/js.translator/testData/box/inlineMultiModule/calledByFqName.kt
index e1919a4..2036832 100644
--- a/js/js.translator/testData/box/inlineMultiModule/calledByFqName.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/calledByFqName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
package utils
diff --git a/js/js.translator/testData/box/inlineMultiModule/extensionLambda.kt b/js/js.translator/testData/box/inlineMultiModule/extensionLambda.kt
index 882fba9..72de4dc 100644
--- a/js/js.translator/testData/box/inlineMultiModule/extensionLambda.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/extensionLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/externalInlineCallDecomposed.kt b/js/js.translator/testData/box/inlineMultiModule/externalInlineCallDecomposed.kt
index fa3f9fe..a1f1371 100644
--- a/js/js.translator/testData/box/inlineMultiModule/externalInlineCallDecomposed.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/externalInlineCallDecomposed.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/keywordAsMemberName.kt b/js/js.translator/testData/box/inlineMultiModule/keywordAsMemberName.kt
index 16fcbaf..3762986 100644
--- a/js/js.translator/testData/box/inlineMultiModule/keywordAsMemberName.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/keywordAsMemberName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// MODULE: lib
// FILE: lib.kt
class A {
diff --git a/js/js.translator/testData/box/inlineMultiModule/kt16144.kt b/js/js.translator/testData/box/inlineMultiModule/kt16144.kt
index e7d1fc7..b809d2bb 100644
--- a/js/js.translator/testData/box/inlineMultiModule/kt16144.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/kt16144.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
// MODULE: m3
// FILE: m3.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/kt16160.kt b/js/js.translator/testData/box/inlineMultiModule/kt16160.kt
index d6dcfdd..4557617 100644
--- a/js/js.translator/testData/box/inlineMultiModule/kt16160.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/kt16160.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
// MODULE: main(module2)
// FILE: main.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/lambda.kt b/js/js.translator/testData/box/inlineMultiModule/lambda.kt
index 9de09fb..026b0f8 100644
--- a/js/js.translator/testData/box/inlineMultiModule/lambda.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/lambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/lambdaCalledInObjectLiteral.kt b/js/js.translator/testData/box/inlineMultiModule/lambdaCalledInObjectLiteral.kt
index 209fe57..34267f6 100644
--- a/js/js.translator/testData/box/inlineMultiModule/lambdaCalledInObjectLiteral.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/lambdaCalledInObjectLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1386
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/lambdaWithClosure.kt b/js/js.translator/testData/box/inlineMultiModule/lambdaWithClosure.kt
index 30d9d91..6554503 100644
--- a/js/js.translator/testData/box/inlineMultiModule/lambdaWithClosure.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/lambdaWithClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/localNameClash.kt b/js/js.translator/testData/box/inlineMultiModule/localNameClash.kt
index 0d61449..132584b 100644
--- a/js/js.translator/testData/box/inlineMultiModule/localNameClash.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/localNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/method.kt b/js/js.translator/testData/box/inlineMultiModule/method.kt
index 2e72dac..c7de5da 100644
--- a/js/js.translator/testData/box/inlineMultiModule/method.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/method.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1388
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/operators.kt b/js/js.translator/testData/box/inlineMultiModule/operators.kt
index a523633..868fef0 100644
--- a/js/js.translator/testData/box/inlineMultiModule/operators.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/operators.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/parameterWithDefaultValue.kt b/js/js.translator/testData/box/inlineMultiModule/parameterWithDefaultValue.kt
index a5e5d72..d568279 100644
--- a/js/js.translator/testData/box/inlineMultiModule/parameterWithDefaultValue.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/parameterWithDefaultValue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/property.kt b/js/js.translator/testData/box/inlineMultiModule/property.kt
index ae16cdb..ffc9fdc 100644
--- a/js/js.translator/testData/box/inlineMultiModule/property.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/property.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/simple.kt b/js/js.translator/testData/box/inlineMultiModule/simple.kt
index 0f016cc..1fb7605 100644
--- a/js/js.translator/testData/box/inlineMultiModule/simple.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineMultiModule/typealiases.kt b/js/js.translator/testData/box/inlineMultiModule/typealiases.kt
index 0e8718f..fd27e8f 100644
--- a/js/js.translator/testData/box/inlineMultiModule/typealiases.kt
+++ b/js/js.translator/testData/box/inlineMultiModule/typealiases.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/inlineSizeReduction/inlineImportCleanup.kt b/js/js.translator/testData/box/inlineSizeReduction/inlineImportCleanup.kt
index a499c6b..d446b22 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/inlineImportCleanup.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/inlineImportCleanup.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/inlineSizeReduction/inlineLambdaCleanup.kt b/js/js.translator/testData/box/inlineSizeReduction/inlineLambdaCleanup.kt
index 0b6339f..3207b04 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/inlineLambdaCleanup.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/inlineLambdaCleanup.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// CHECK_NOT_CALLED: produceOK except=box
fun produceOK() = "OK"
diff --git a/js/js.translator/testData/box/inlineSizeReduction/inlineOrder.kt b/js/js.translator/testData/box/inlineSizeReduction/inlineOrder.kt
index e736b51..2e3b9d2 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/inlineOrder.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/inlineOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
// CHECK_VARS_COUNT: function=test1 count=0
diff --git a/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt b/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt
index 752700a7..becc328 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/lastBreak.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 895
+// EXPECTED_REACHABLE_NODES: 1385
package foo
// CHECK_NOT_CALLED: f1
diff --git a/js/js.translator/testData/box/inlineSizeReduction/noDuplicateVariableDeclaration.kt b/js/js.translator/testData/box/inlineSizeReduction/noDuplicateVariableDeclaration.kt
index a7b52b5..e496344 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/noDuplicateVariableDeclaration.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/noDuplicateVariableDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1377
package foo
// CHECK_VARS_COUNT: function=test count=3
diff --git a/js/js.translator/testData/box/inlineSizeReduction/oneTopLevelReturn.kt b/js/js.translator/testData/box/inlineSizeReduction/oneTopLevelReturn.kt
index 6311a59..d0a7611 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/oneTopLevelReturn.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/oneTopLevelReturn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test1
diff --git a/js/js.translator/testData/box/inlineSizeReduction/propertyAssignment.kt b/js/js.translator/testData/box/inlineSizeReduction/propertyAssignment.kt
index c06fa22..8539d791 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/propertyAssignment.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/propertyAssignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1385
package foo
// CHECK_CONTAINS_NO_CALLS: test except=SumHolder_getInstance
diff --git a/js/js.translator/testData/box/inlineSizeReduction/propertyReassignment.kt b/js/js.translator/testData/box/inlineSizeReduction/propertyReassignment.kt
index 5971802..585694b 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/propertyReassignment.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/propertyReassignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// CHECK_VARS_COUNT: function=test1 count=0
// CHECK_VARS_COUNT: function=test2 count=1
// CHECK_VARS_COUNT: function=test3 count=0
diff --git a/js/js.translator/testData/box/inlineSizeReduction/propertyReferenceDoesNotProduceSideEffect.kt b/js/js.translator/testData/box/inlineSizeReduction/propertyReferenceDoesNotProduceSideEffect.kt
index 61fb017..b2d15db 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/propertyReferenceDoesNotProduceSideEffect.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/propertyReferenceDoesNotProduceSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// CHECK_VARS_COUNT: function=box count=1
package foo
diff --git a/js/js.translator/testData/box/inlineSizeReduction/returnInlineCall.kt b/js/js.translator/testData/box/inlineSizeReduction/returnInlineCall.kt
index 0dbf7ec..6027f8a 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/returnInlineCall.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/returnInlineCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineSizeReduction/simpleReturnFunction.kt b/js/js.translator/testData/box/inlineSizeReduction/simpleReturnFunction.kt
index 4fc34ff..9638e98 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/simpleReturnFunction.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/simpleReturnFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test except=imul
diff --git a/js/js.translator/testData/box/inlineSizeReduction/ternaryConditional.kt b/js/js.translator/testData/box/inlineSizeReduction/ternaryConditional.kt
index e5af109..3f910e8 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/ternaryConditional.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/ternaryConditional.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_VARS_COUNT: function=test1 count=0
diff --git a/js/js.translator/testData/box/inlineSizeReduction/this.kt b/js/js.translator/testData/box/inlineSizeReduction/this.kt
index f3636bf..1145862 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/this.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/this.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1386
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineSizeReduction/valAssignment.kt b/js/js.translator/testData/box/inlineSizeReduction/valAssignment.kt
index 853e6b9..e749665 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/valAssignment.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/valAssignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineSizeReduction/valDeclaration.kt b/js/js.translator/testData/box/inlineSizeReduction/valDeclaration.kt
index 4bc9f4b..d421597 100644
--- a/js/js.translator/testData/box/inlineSizeReduction/valDeclaration.kt
+++ b/js/js.translator/testData/box/inlineSizeReduction/valDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineStdlib/callNameClash.kt b/js/js.translator/testData/box/inlineStdlib/callNameClash.kt
index 1c98046..7526f0d 100644
--- a/js/js.translator/testData/box/inlineStdlib/callNameClash.kt
+++ b/js/js.translator/testData/box/inlineStdlib/callNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1393
package foo
// CHECK_NOT_CALLED: with_dbz3ex
diff --git a/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt b/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt
index aec88df..226a5dc 100644
--- a/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt
+++ b/js/js.translator/testData/box/inlineStdlib/callableRefToFunInCurrentModule.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 893
+// EXPECTED_REACHABLE_NODES: 1383
package foo
// CHECK_NOT_CALLED_IN_SCOPE: scope=test function=even
diff --git a/js/js.translator/testData/box/inlineStdlib/closure.kt b/js/js.translator/testData/box/inlineStdlib/closure.kt
index 69dce03..be0de0f 100644
--- a/js/js.translator/testData/box/inlineStdlib/closure.kt
+++ b/js/js.translator/testData/box/inlineStdlib/closure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineStdlib/closureInObjectLiteral.kt b/js/js.translator/testData/box/inlineStdlib/closureInObjectLiteral.kt
index 954f850..94310bb 100644
--- a/js/js.translator/testData/box/inlineStdlib/closureInObjectLiteral.kt
+++ b/js/js.translator/testData/box/inlineStdlib/closureInObjectLiteral.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 909
+// EXPECTED_REACHABLE_NODES: 1400
package foo
import kotlin.comparisons.*
diff --git a/js/js.translator/testData/box/inlineStdlib/closureNested.kt b/js/js.translator/testData/box/inlineStdlib/closureNested.kt
index 48ffac7..6d288a9 100644
--- a/js/js.translator/testData/box/inlineStdlib/closureNested.kt
+++ b/js/js.translator/testData/box/inlineStdlib/closureNested.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineStdlib/localNamesClash.kt b/js/js.translator/testData/box/inlineStdlib/localNamesClash.kt
index c05daaa..47cb027c 100644
--- a/js/js.translator/testData/box/inlineStdlib/localNamesClash.kt
+++ b/js/js.translator/testData/box/inlineStdlib/localNamesClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineStdlib/simple.kt b/js/js.translator/testData/box/inlineStdlib/simple.kt
index efaf1dc..33eab9d 100644
--- a/js/js.translator/testData/box/inlineStdlib/simple.kt
+++ b/js/js.translator/testData/box/inlineStdlib/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/inlineStdlib/thisInExtension.kt b/js/js.translator/testData/box/inlineStdlib/thisInExtension.kt
index b534258..e2284a4 100644
--- a/js/js.translator/testData/box/inlineStdlib/thisInExtension.kt
+++ b/js/js.translator/testData/box/inlineStdlib/thisInExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_CONTAINS_NO_CALLS: testImplicitThis
diff --git a/js/js.translator/testData/box/inlineStdlib/unsafeCast.kt b/js/js.translator/testData/box/inlineStdlib/unsafeCast.kt
index 7924ba7..08c5b5a 100644
--- a/js/js.translator/testData/box/inlineStdlib/unsafeCast.kt
+++ b/js/js.translator/testData/box/inlineStdlib/unsafeCast.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
// CHECK_NOT_CALLED_IN_SCOPE: scope=box function=isType
diff --git a/js/js.translator/testData/box/java/abstractList/iterator.kt b/js/js.translator/testData/box/java/abstractList/iterator.kt
index 8f06c22..7c66490c 100644
--- a/js/js.translator/testData/box/java/abstractList/iterator.kt
+++ b/js/js.translator/testData/box/java/abstractList/iterator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 606
+// EXPECTED_REACHABLE_NODES: 1431
package foo
class MyList<T>(vararg val data: T) : AbstractList<T>() {
diff --git a/js/js.translator/testData/box/java/arrayList/access.kt b/js/js.translator/testData/box/java/arrayList/access.kt
index 830763f..a521da8 100644
--- a/js/js.translator/testData/box/java/arrayList/access.kt
+++ b/js/js.translator/testData/box/java/arrayList/access.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/arrayAccess.kt b/js/js.translator/testData/box/java/arrayList/arrayAccess.kt
index 3d2c1ca..11453f7 100644
--- a/js/js.translator/testData/box/java/arrayList/arrayAccess.kt
+++ b/js/js.translator/testData/box/java/arrayList/arrayAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt b/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt
index b821a87..ac6ea45 100644
--- a/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt
+++ b/js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt b/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt
index f7ef9e0..cf492f9 100644
--- a/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt
+++ b/js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 888
+// EXPECTED_REACHABLE_NODES: 1376
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/containsAll.kt b/js/js.translator/testData/box/java/arrayList/containsAll.kt
index c88f298..1353e16 100644
--- a/js/js.translator/testData/box/java/arrayList/containsAll.kt
+++ b/js/js.translator/testData/box/java/arrayList/containsAll.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/java/arrayList/emptyList.kt b/js/js.translator/testData/box/java/arrayList/emptyList.kt
index 091ebbb..84cf893 100644
--- a/js/js.translator/testData/box/java/arrayList/emptyList.kt
+++ b/js/js.translator/testData/box/java/arrayList/emptyList.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/indexOOB.kt b/js/js.translator/testData/box/java/arrayList/indexOOB.kt
index 6ccd093..a19517f 100644
--- a/js/js.translator/testData/box/java/arrayList/indexOOB.kt
+++ b/js/js.translator/testData/box/java/arrayList/indexOOB.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/indexOf.kt b/js/js.translator/testData/box/java/arrayList/indexOf.kt
index 4ec20e7..064245e 100644
--- a/js/js.translator/testData/box/java/arrayList/indexOf.kt
+++ b/js/js.translator/testData/box/java/arrayList/indexOf.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 891
+// EXPECTED_REACHABLE_NODES: 1381
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/isEmpty.kt b/js/js.translator/testData/box/java/arrayList/isEmpty.kt
index 2ab6ccd..77312ee 100644
--- a/js/js.translator/testData/box/java/arrayList/isEmpty.kt
+++ b/js/js.translator/testData/box/java/arrayList/isEmpty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/iterate.kt b/js/js.translator/testData/box/java/arrayList/iterate.kt
index 8d3ee54..a986096 100644
--- a/js/js.translator/testData/box/java/arrayList/iterate.kt
+++ b/js/js.translator/testData/box/java/arrayList/iterate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/misc.kt b/js/js.translator/testData/box/java/arrayList/misc.kt
index 8c83ddb..cab810b 100644
--- a/js/js.translator/testData/box/java/arrayList/misc.kt
+++ b/js/js.translator/testData/box/java/arrayList/misc.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 896
+// EXPECTED_REACHABLE_NODES: 1384
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/remove.kt b/js/js.translator/testData/box/java/arrayList/remove.kt
index 40102a7..2780ba9 100644
--- a/js/js.translator/testData/box/java/arrayList/remove.kt
+++ b/js/js.translator/testData/box/java/arrayList/remove.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/removeAll.kt b/js/js.translator/testData/box/java/arrayList/removeAll.kt
index 4af9fc1..984386f 100644
--- a/js/js.translator/testData/box/java/arrayList/removeAll.kt
+++ b/js/js.translator/testData/box/java/arrayList/removeAll.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 889
+// EXPECTED_REACHABLE_NODES: 1379
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt b/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt
index c37e588..45960ec 100644
--- a/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt
+++ b/js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/retainAll.kt b/js/js.translator/testData/box/java/arrayList/retainAll.kt
index bea1992..54788e1 100644
--- a/js/js.translator/testData/box/java/arrayList/retainAll.kt
+++ b/js/js.translator/testData/box/java/arrayList/retainAll.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 889
+// EXPECTED_REACHABLE_NODES: 1379
package foo
diff --git a/js/js.translator/testData/box/java/arrayList/toArray.kt b/js/js.translator/testData/box/java/arrayList/toArray.kt
index 3423f6d..22f6229 100644
--- a/js/js.translator/testData/box/java/arrayList/toArray.kt
+++ b/js/js.translator/testData/box/java/arrayList/toArray.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/jsCode/break.kt b/js/js.translator/testData/box/jsCode/break.kt
index 0491d1b..f81ac47 100644
--- a/js/js.translator/testData/box/jsCode/break.kt
+++ b/js/js.translator/testData/box/jsCode/break.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/jsCode/catchScope.kt b/js/js.translator/testData/box/jsCode/catchScope.kt
index 7c3b773..aeaa0bb 100644
--- a/js/js.translator/testData/box/jsCode/catchScope.kt
+++ b/js/js.translator/testData/box/jsCode/catchScope.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1384
package foo
fun test(action: ()->Unit): String = js("""
diff --git a/js/js.translator/testData/box/jsCode/codeFromVariable.kt b/js/js.translator/testData/box/jsCode/codeFromVariable.kt
index bc43363..9ea2795 100644
--- a/js/js.translator/testData/box/jsCode/codeFromVariable.kt
+++ b/js/js.translator/testData/box/jsCode/codeFromVariable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/jsCode/continue.kt b/js/js.translator/testData/box/jsCode/continue.kt
index 792f68b..969e3d5 100644
--- a/js/js.translator/testData/box/jsCode/continue.kt
+++ b/js/js.translator/testData/box/jsCode/continue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/jsCode/doWhile.kt b/js/js.translator/testData/box/jsCode/doWhile.kt
index 1405a89..8df44d1 100644
--- a/js/js.translator/testData/box/jsCode/doWhile.kt
+++ b/js/js.translator/testData/box/jsCode/doWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun factorial(n: Int): Int = js("""
diff --git a/js/js.translator/testData/box/jsCode/for.kt b/js/js.translator/testData/box/jsCode/for.kt
index 12fe81c..8119cdf 100644
--- a/js/js.translator/testData/box/jsCode/for.kt
+++ b/js/js.translator/testData/box/jsCode/for.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun factorial(n: Int): Int = js("""
diff --git a/js/js.translator/testData/box/jsCode/forIn.kt b/js/js.translator/testData/box/jsCode/forIn.kt
index 34ae94e..b9124d6 100644
--- a/js/js.translator/testData/box/jsCode/forIn.kt
+++ b/js/js.translator/testData/box/jsCode/forIn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun countKeys(a: Array<Int>): Int = js("""
diff --git a/js/js.translator/testData/box/jsCode/function.kt b/js/js.translator/testData/box/jsCode/function.kt
index e21ae41..e8d4787 100644
--- a/js/js.translator/testData/box/jsCode/function.kt
+++ b/js/js.translator/testData/box/jsCode/function.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun callWithArgs(sumFunc: (Int, Int) -> Int, a: Int, b: Int): Int {
diff --git a/js/js.translator/testData/box/jsCode/functionName.kt b/js/js.translator/testData/box/jsCode/functionName.kt
index 6d2bfd32..6ec19b9 100644
--- a/js/js.translator/testData/box/jsCode/functionName.kt
+++ b/js/js.translator/testData/box/jsCode/functionName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
fun box(): String {
return js("""
function foo() {
diff --git a/js/js.translator/testData/box/jsCode/if.kt b/js/js.translator/testData/box/jsCode/if.kt
index 288316e..fee7c52 100644
--- a/js/js.translator/testData/box/jsCode/if.kt
+++ b/js/js.translator/testData/box/jsCode/if.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun testIf(flag: Boolean): Int = js("""
diff --git a/js/js.translator/testData/box/jsCode/invocation.kt b/js/js.translator/testData/box/jsCode/invocation.kt
index bba6bd4..c71f581 100644
--- a/js/js.translator/testData/box/jsCode/invocation.kt
+++ b/js/js.translator/testData/box/jsCode/invocation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun <A, B, C> run(a: A, b: B, func: (A, B) -> C): C = js("func(a, b)")
diff --git a/js/js.translator/testData/box/jsCode/label.kt b/js/js.translator/testData/box/jsCode/label.kt
index 350c56d..5ade3b0 100644
--- a/js/js.translator/testData/box/jsCode/label.kt
+++ b/js/js.translator/testData/box/jsCode/label.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun testLabelledBlock() {
diff --git a/js/js.translator/testData/box/jsCode/labelNestedClash.kt b/js/js.translator/testData/box/jsCode/labelNestedClash.kt
index 10859792..143422b 100644
--- a/js/js.translator/testData/box/jsCode/labelNestedClash.kt
+++ b/js/js.translator/testData/box/jsCode/labelNestedClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// CHECK_LABELS_COUNT: function=box name=block count=1
diff --git a/js/js.translator/testData/box/jsCode/labelNestedClashWithKotlin.kt b/js/js.translator/testData/box/jsCode/labelNestedClashWithKotlin.kt
index bca987b5..e4e0f77 100644
--- a/js/js.translator/testData/box/jsCode/labelNestedClashWithKotlin.kt
+++ b/js/js.translator/testData/box/jsCode/labelNestedClashWithKotlin.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/jsCode/labelSiblingClash.kt b/js/js.translator/testData/box/jsCode/labelSiblingClash.kt
index 7c6f871..e9cdc20 100644
--- a/js/js.translator/testData/box/jsCode/labelSiblingClash.kt
+++ b/js/js.translator/testData/box/jsCode/labelSiblingClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// CHECK_LABELS_COUNT: function=box name=block count=2
diff --git a/js/js.translator/testData/box/jsCode/literal.kt b/js/js.translator/testData/box/jsCode/literal.kt
index b3d19ec..35c711c 100644
--- a/js/js.translator/testData/box/jsCode/literal.kt
+++ b/js/js.translator/testData/box/jsCode/literal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
external interface HasName {
diff --git a/js/js.translator/testData/box/jsCode/numberLiteralOverflow.kt b/js/js.translator/testData/box/jsCode/numberLiteralOverflow.kt
index f56c773..17576f43 100644
--- a/js/js.translator/testData/box/jsCode/numberLiteralOverflow.kt
+++ b/js/js.translator/testData/box/jsCode/numberLiteralOverflow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
fun box(): String {
val a = js("0xff000000")
if (a != 4278190080.0) return "fail1: $a"
diff --git a/js/js.translator/testData/box/jsCode/object.kt b/js/js.translator/testData/box/jsCode/object.kt
index c621abc..d248429 100644
--- a/js/js.translator/testData/box/jsCode/object.kt
+++ b/js/js.translator/testData/box/jsCode/object.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
external interface Summizer {
diff --git a/js/js.translator/testData/box/jsCode/objectScopes.kt b/js/js.translator/testData/box/jsCode/objectScopes.kt
index dc21c51..3701ebb 100644
--- a/js/js.translator/testData/box/jsCode/objectScopes.kt
+++ b/js/js.translator/testData/box/jsCode/objectScopes.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
external interface Summizer {
diff --git a/js/js.translator/testData/box/jsCode/operators.kt b/js/js.translator/testData/box/jsCode/operators.kt
index f5cef6b..783271a 100644
--- a/js/js.translator/testData/box/jsCode/operators.kt
+++ b/js/js.translator/testData/box/jsCode/operators.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
data class A(val value: Int)
diff --git a/js/js.translator/testData/box/jsCode/quotes.kt b/js/js.translator/testData/box/jsCode/quotes.kt
index e45409f..1174126 100644
--- a/js/js.translator/testData/box/jsCode/quotes.kt
+++ b/js/js.translator/testData/box/jsCode/quotes.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun singleQuoted(i: Int): Int = js("return i")
diff --git a/js/js.translator/testData/box/jsCode/referenceToKotlin.kt b/js/js.translator/testData/box/jsCode/referenceToKotlin.kt
index 9125774..a66a857 100644
--- a/js/js.translator/testData/box/jsCode/referenceToKotlin.kt
+++ b/js/js.translator/testData/box/jsCode/referenceToKotlin.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 901
+// EXPECTED_REACHABLE_NODES: 1389
external fun p(m: String): String
var log = ""
diff --git a/js/js.translator/testData/box/jsCode/switch.kt b/js/js.translator/testData/box/jsCode/switch.kt
index d0017e8..a9ae882 100644
--- a/js/js.translator/testData/box/jsCode/switch.kt
+++ b/js/js.translator/testData/box/jsCode/switch.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun testSwitch(number: Int): String = js("""
diff --git a/js/js.translator/testData/box/jsCode/tryCatchFinally.kt b/js/js.translator/testData/box/jsCode/tryCatchFinally.kt
index 54c83c8..57c1cd1 100644
--- a/js/js.translator/testData/box/jsCode/tryCatchFinally.kt
+++ b/js/js.translator/testData/box/jsCode/tryCatchFinally.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1385
package foo
class Counter {
diff --git a/js/js.translator/testData/box/jsCode/while.kt b/js/js.translator/testData/box/jsCode/while.kt
index bd318dd..6c998e1 100644
--- a/js/js.translator/testData/box/jsCode/while.kt
+++ b/js/js.translator/testData/box/jsCode/while.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
fun factorial(n: Int): Int = js("""
diff --git a/js/js.translator/testData/box/jsModule/externalClass.kt b/js/js.translator/testData/box/jsModule/externalClass.kt
index 3093df9..1cbd4c7 100644
--- a/js/js.translator/testData/box/jsModule/externalClass.kt
+++ b/js/js.translator/testData/box/jsModule/externalClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE_KIND: AMD
package foo
diff --git a/js/js.translator/testData/box/jsModule/externalFunction.kt b/js/js.translator/testData/box/jsModule/externalFunction.kt
index 5fed320..706914f 100644
--- a/js/js.translator/testData/box/jsModule/externalFunction.kt
+++ b/js/js.translator/testData/box/jsModule/externalFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE_KIND: AMD
package foo
diff --git a/js/js.translator/testData/box/jsModule/externalFunctionPlain.kt b/js/js.translator/testData/box/jsModule/externalFunctionPlain.kt
index b5c5971a..ec2ed03 100644
--- a/js/js.translator/testData/box/jsModule/externalFunctionPlain.kt
+++ b/js/js.translator/testData/box/jsModule/externalFunctionPlain.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
@JsModule("lib")
diff --git a/js/js.translator/testData/box/jsModule/externalFunctionUmd.kt b/js/js.translator/testData/box/jsModule/externalFunctionUmd.kt
index 39c060a..7c8b7e8 100644
--- a/js/js.translator/testData/box/jsModule/externalFunctionUmd.kt
+++ b/js/js.translator/testData/box/jsModule/externalFunctionUmd.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// MODULE_KIND: UMD
package foo
diff --git a/js/js.translator/testData/box/jsModule/externalFunctionUmdFallback.kt b/js/js.translator/testData/box/jsModule/externalFunctionUmdFallback.kt
index 1efdc71..b3abdf8 100644
--- a/js/js.translator/testData/box/jsModule/externalFunctionUmdFallback.kt
+++ b/js/js.translator/testData/box/jsModule/externalFunctionUmdFallback.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// MODULE_KIND: UMD
// NO_JS_MODULE_SYSTEM
package foo
diff --git a/js/js.translator/testData/box/jsModule/externalObject.kt b/js/js.translator/testData/box/jsModule/externalObject.kt
index 3b9142e..3f9251b 100644
--- a/js/js.translator/testData/box/jsModule/externalObject.kt
+++ b/js/js.translator/testData/box/jsModule/externalObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE_KIND: AMD
package foo
diff --git a/js/js.translator/testData/box/jsModule/externalPackage.kt b/js/js.translator/testData/box/jsModule/externalPackage.kt
index 2e9d939..6bbbb34 100644
--- a/js/js.translator/testData/box/jsModule/externalPackage.kt
+++ b/js/js.translator/testData/box/jsModule/externalPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// FILE: a.kt
// MODULE_KIND: AMD
@file:JsModule("lib")
diff --git a/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt b/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt
index c32811e..d0f283e 100644
--- a/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt
+++ b/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// MODULE_KIND: AMD
// FILE: lib.kt
@file:JsModule("lib")
diff --git a/js/js.translator/testData/box/jsModule/externalPackagePlain.kt b/js/js.translator/testData/box/jsModule/externalPackagePlain.kt
index 5fc3945..d30cc97 100644
--- a/js/js.translator/testData/box/jsModule/externalPackagePlain.kt
+++ b/js/js.translator/testData/box/jsModule/externalPackagePlain.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
// FILE: a.kt
@file:JsModule("lib")
@file:JsNonModule
diff --git a/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt b/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt
index c36f7ac..758e4e3 100644
--- a/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt
+++ b/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// FILE: a.kt
// MODULE_KIND: UMD
// NO_JS_MODULE_SYSTEM
diff --git a/js/js.translator/testData/box/jsModule/externalProperty.kt b/js/js.translator/testData/box/jsModule/externalProperty.kt
index b135e42..9efc54c 100644
--- a/js/js.translator/testData/box/jsModule/externalProperty.kt
+++ b/js/js.translator/testData/box/jsModule/externalProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE_KIND: AMD
package foo
diff --git a/js/js.translator/testData/box/jsModule/importCountCommonJS.kt b/js/js.translator/testData/box/jsModule/importCountCommonJS.kt
index 346a915..c99b28f 100644
--- a/js/js.translator/testData/box/jsModule/importCountCommonJS.kt
+++ b/js/js.translator/testData/box/jsModule/importCountCommonJS.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
// MODULE_KIND: COMMON_JS
// FUNCTION_CALLED_TIMES: require count=2
diff --git a/js/js.translator/testData/box/jsModule/importCountUmd.kt b/js/js.translator/testData/box/jsModule/importCountUmd.kt
index 5af7b95..5c3764b 100644
--- a/js/js.translator/testData/box/jsModule/importCountUmd.kt
+++ b/js/js.translator/testData/box/jsModule/importCountUmd.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
// MODULE_KIND: UMD
// NO_JS_MODULE_SYSTEM
// FUNCTION_CALLED_TIMES: require count=3
diff --git a/js/js.translator/testData/box/jsModule/topLevelVarargFun.kt b/js/js.translator/testData/box/jsModule/topLevelVarargFun.kt
index 79d8875..4e64b36 100644
--- a/js/js.translator/testData/box/jsModule/topLevelVarargFun.kt
+++ b/js/js.translator/testData/box/jsModule/topLevelVarargFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
// MODULE_KIND: AMD
@JsModule("bar")
external fun foo(vararg arg: String): String
diff --git a/js/js.translator/testData/box/jsName/avoidNameClash.kt b/js/js.translator/testData/box/jsName/avoidNameClash.kt
index da10b5e..d4843b9 100644
--- a/js/js.translator/testData/box/jsName/avoidNameClash.kt
+++ b/js/js.translator/testData/box/jsName/avoidNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1388
package foo
object A {
diff --git a/js/js.translator/testData/box/jsName/classes.kt b/js/js.translator/testData/box/jsName/classes.kt
index 1410ad0..a9883d5 100644
--- a/js/js.translator/testData/box/jsName/classes.kt
+++ b/js/js.translator/testData/box/jsName/classes.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
@JsName("AA") object A {
diff --git a/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClass.kt b/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClass.kt
index 1c0d292..fe4e879 100644
--- a/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClass.kt
+++ b/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// FILE: main.kt
package foo
diff --git a/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClassMultimodule.kt b/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClassMultimodule.kt
index 94d09bb..d1d6578 100644
--- a/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClassMultimodule.kt
+++ b/js/js.translator/testData/box/jsName/inheritFromRenamedNativeClassMultimodule.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// MODULE: module1
// FILE: module1.kt
diff --git a/js/js.translator/testData/box/jsName/jsName.kt b/js/js.translator/testData/box/jsName/jsName.kt
index 1b00f69..e97dcf4 100644
--- a/js/js.translator/testData/box/jsName/jsName.kt
+++ b/js/js.translator/testData/box/jsName/jsName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
@JsName("bar")
diff --git a/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt b/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt
index 9ff3ede..2ab6c93 100644
--- a/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt
+++ b/js/js.translator/testData/box/jsName/jsNamePropertyAccessors.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
external class A {
diff --git a/js/js.translator/testData/box/jsName/overriddenMethod.kt b/js/js.translator/testData/box/jsName/overriddenMethod.kt
index 45e31fb..d407b95 100644
--- a/js/js.translator/testData/box/jsName/overriddenMethod.kt
+++ b/js/js.translator/testData/box/jsName/overriddenMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1393
package foo
open class A {
diff --git a/js/js.translator/testData/box/jsName/overridenFromInterface.kt b/js/js.translator/testData/box/jsName/overridenFromInterface.kt
index 5125b73..b5a0fd0 100644
--- a/js/js.translator/testData/box/jsName/overridenFromInterface.kt
+++ b/js/js.translator/testData/box/jsName/overridenFromInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1388
package foo
interface A {
diff --git a/js/js.translator/testData/box/jsName/peculiarIdentifiers.kt b/js/js.translator/testData/box/jsName/peculiarIdentifiers.kt
index b943203..8e42371 100644
--- a/js/js.translator/testData/box/jsName/peculiarIdentifiers.kt
+++ b/js/js.translator/testData/box/jsName/peculiarIdentifiers.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1389
private fun `+`(a: Int, b: Int) = a + b
@JsName("minus")
diff --git a/js/js.translator/testData/box/jsName/privateMethod.kt b/js/js.translator/testData/box/jsName/privateMethod.kt
index 6edd785..aaad66a 100644
--- a/js/js.translator/testData/box/jsName/privateMethod.kt
+++ b/js/js.translator/testData/box/jsName/privateMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1388
package foo
object A {
diff --git a/js/js.translator/testData/box/jsName/secondaryConstructor.kt b/js/js.translator/testData/box/jsName/secondaryConstructor.kt
index b543b66..0be49cc 100644
--- a/js/js.translator/testData/box/jsName/secondaryConstructor.kt
+++ b/js/js.translator/testData/box/jsName/secondaryConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1386
package foo
class A(val x: String) {
diff --git a/js/js.translator/testData/box/jsName/simpleJsName.kt b/js/js.translator/testData/box/jsName/simpleJsName.kt
index 782e158..1b9fe5f 100644
--- a/js/js.translator/testData/box/jsName/simpleJsName.kt
+++ b/js/js.translator/testData/box/jsName/simpleJsName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1389
package foo
object A {
diff --git a/js/js.translator/testData/box/jsQualifier/classes.kt b/js/js.translator/testData/box/jsQualifier/classes.kt
index bbbc221..b60308c 100644
--- a/js/js.translator/testData/box/jsQualifier/classes.kt
+++ b/js/js.translator/testData/box/jsQualifier/classes.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: lib
// FILE: lib.kt
@file:JsQualifier("pkg")
diff --git a/js/js.translator/testData/box/jsQualifier/simple.kt b/js/js.translator/testData/box/jsQualifier/simple.kt
index 6348da2..50cbec6 100644
--- a/js/js.translator/testData/box/jsQualifier/simple.kt
+++ b/js/js.translator/testData/box/jsQualifier/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: lib
// FILE: lib.kt
@file:JsQualifier("a.b")
diff --git a/js/js.translator/testData/box/jsQualifier/umdFallback.kt b/js/js.translator/testData/box/jsQualifier/umdFallback.kt
index 8e35fcd..1cc97d5 100644
--- a/js/js.translator/testData/box/jsQualifier/umdFallback.kt
+++ b/js/js.translator/testData/box/jsQualifier/umdFallback.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// MODULE: lib
// FILE: lib.kt
// MODULE_KIND: UMD
diff --git a/js/js.translator/testData/box/jsQualifier/withModule.kt b/js/js.translator/testData/box/jsQualifier/withModule.kt
index 08b6b56..d59c009 100644
--- a/js/js.translator/testData/box/jsQualifier/withModule.kt
+++ b/js/js.translator/testData/box/jsQualifier/withModule.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// MODULE: lib
// FILE: lib.kt
// MODULE_KIND: AMD
diff --git a/js/js.translator/testData/box/labels/labelOnExpression.kt b/js/js.translator/testData/box/labels/labelOnExpression.kt
index 42a9084..6cad46f 100644
--- a/js/js.translator/testData/box/labels/labelOnExpression.kt
+++ b/js/js.translator/testData/box/labels/labelOnExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
// CHECK_LABELS_COUNT: function=test0 count=0
// CHECK_LABELS_COUNT: function=test1 count=0
// CHECK_LABELS_COUNT: function=test2 count=0
diff --git a/js/js.translator/testData/box/labels/labelWithVariableClashing.kt b/js/js.translator/testData/box/labels/labelWithVariableClashing.kt
index 29bee2a..c5fb1cf 100644
--- a/js/js.translator/testData/box/labels/labelWithVariableClashing.kt
+++ b/js/js.translator/testData/box/labels/labelWithVariableClashing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_LABELS_COUNT: function=test1 name=loop count=1
diff --git a/js/js.translator/testData/box/labels/nestedInlineLabels.kt b/js/js.translator/testData/box/labels/nestedInlineLabels.kt
index a57cc8f..b95cd70 100644
--- a/js/js.translator/testData/box/labels/nestedInlineLabels.kt
+++ b/js/js.translator/testData/box/labels/nestedInlineLabels.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1383
package foo
var state = false
diff --git a/js/js.translator/testData/box/labels/nestedLabels.kt b/js/js.translator/testData/box/labels/nestedLabels.kt
index 01490cc..19c6c16 100644
--- a/js/js.translator/testData/box/labels/nestedLabels.kt
+++ b/js/js.translator/testData/box/labels/nestedLabels.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_LABELS_COUNT: function=test name=loop count=1
diff --git a/js/js.translator/testData/box/labels/nestedLabelsInlinedClashing.kt b/js/js.translator/testData/box/labels/nestedLabelsInlinedClashing.kt
index 47ce99c..1fed6b7 100644
--- a/js/js.translator/testData/box/labels/nestedLabelsInlinedClashing.kt
+++ b/js/js.translator/testData/box/labels/nestedLabelsInlinedClashing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 527
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_CONTAINS_NO_CALLS: test
diff --git a/js/js.translator/testData/box/labels/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt b/js/js.translator/testData/box/labels/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt
index 5d1ee18..dd6e5c3 100644
--- a/js/js.translator/testData/box/labels/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt
+++ b/js/js.translator/testData/box/labels/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 527
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_LABELS_COUNT: function=test name=loop count=1
diff --git a/js/js.translator/testData/box/labels/peculiarNames.kt b/js/js.translator/testData/box/labels/peculiarNames.kt
index 98f6375..93ca0ce 100644
--- a/js/js.translator/testData/box/labels/peculiarNames.kt
+++ b/js/js.translator/testData/box/labels/peculiarNames.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
fun box(): String {
var log = ""
diff --git a/js/js.translator/testData/box/labels/siblingLabels.kt b/js/js.translator/testData/box/labels/siblingLabels.kt
index 0010493..24e1f40 100644
--- a/js/js.translator/testData/box/labels/siblingLabels.kt
+++ b/js/js.translator/testData/box/labels/siblingLabels.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_LABELS_COUNT: function=test name=loop count=2
diff --git a/js/js.translator/testData/box/labels/siblingLabelsInlined.kt b/js/js.translator/testData/box/labels/siblingLabelsInlined.kt
index adc68b9..e6dffe1 100644
--- a/js/js.translator/testData/box/labels/siblingLabelsInlined.kt
+++ b/js/js.translator/testData/box/labels/siblingLabelsInlined.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_NOT_CALLED: testInline
diff --git a/js/js.translator/testData/box/labels/siblingLabelsInlinedClashing.kt b/js/js.translator/testData/box/labels/siblingLabelsInlinedClashing.kt
index 298abfc..72c1edb 100644
--- a/js/js.translator/testData/box/labels/siblingLabelsInlinedClashing.kt
+++ b/js/js.translator/testData/box/labels/siblingLabelsInlinedClashing.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
// CHECK_NOT_CALLED: testLabelInline
diff --git a/js/js.translator/testData/box/labels/simpleLabel.kt b/js/js.translator/testData/box/labels/simpleLabel.kt
index 197b9b1..1829a52 100644
--- a/js/js.translator/testData/box/labels/simpleLabel.kt
+++ b/js/js.translator/testData/box/labels/simpleLabel.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_LABELS_COUNT: function=testBreak name=loop count=1
diff --git a/js/js.translator/testData/box/labels/simpleLabelInlined.kt b/js/js.translator/testData/box/labels/simpleLabelInlined.kt
index 493c699..6f1443d 100644
--- a/js/js.translator/testData/box/labels/simpleLabelInlined.kt
+++ b/js/js.translator/testData/box/labels/simpleLabelInlined.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
// CHECK_NOT_CALLED: testBreak
diff --git a/js/js.translator/testData/box/multiFile/classOfTheSameNameInAnotherPackage.kt b/js/js.translator/testData/box/multiFile/classOfTheSameNameInAnotherPackage.kt
index 6abd9a7..aba7ba2 100644
--- a/js/js.translator/testData/box/multiFile/classOfTheSameNameInAnotherPackage.kt
+++ b/js/js.translator/testData/box/multiFile/classOfTheSameNameInAnotherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// FILE: A.kt
package foo
diff --git a/js/js.translator/testData/box/multiFile/classesInheritedFromOtherFile.kt b/js/js.translator/testData/box/multiFile/classesInheritedFromOtherFile.kt
index a6a04a2..a6b3ce5 100644
--- a/js/js.translator/testData/box/multiFile/classesInheritedFromOtherFile.kt
+++ b/js/js.translator/testData/box/multiFile/classesInheritedFromOtherFile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
// FILE: a.kt
package foo
diff --git a/js/js.translator/testData/box/multiFile/functionsVisibleFromOtherFile.kt b/js/js.translator/testData/box/multiFile/functionsVisibleFromOtherFile.kt
index c51a791..5ef94f0 100644
--- a/js/js.translator/testData/box/multiFile/functionsVisibleFromOtherFile.kt
+++ b/js/js.translator/testData/box/multiFile/functionsVisibleFromOtherFile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: a.kt
package foo
diff --git a/js/js.translator/testData/box/multiFile/importedDeclarationMangling.kt b/js/js.translator/testData/box/multiFile/importedDeclarationMangling.kt
index 1f0e9ff..e8de752 100644
--- a/js/js.translator/testData/box/multiFile/importedDeclarationMangling.kt
+++ b/js/js.translator/testData/box/multiFile/importedDeclarationMangling.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// FILE: a.kt
package foo
diff --git a/js/js.translator/testData/box/multiFile/packageAndMangledMethodDoNotClash.kt b/js/js.translator/testData/box/multiFile/packageAndMangledMethodDoNotClash.kt
index 88cf917..4a8448a 100644
--- a/js/js.translator/testData/box/multiFile/packageAndMangledMethodDoNotClash.kt
+++ b/js/js.translator/testData/box/multiFile/packageAndMangledMethodDoNotClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// FILE: foo.kt
package foo
diff --git a/js/js.translator/testData/box/multiFile/packageAndPrivateDeclarationDoNotClash.kt b/js/js.translator/testData/box/multiFile/packageAndPrivateDeclarationDoNotClash.kt
index 624ca09..3000c37 100644
--- a/js/js.translator/testData/box/multiFile/packageAndPrivateDeclarationDoNotClash.kt
+++ b/js/js.translator/testData/box/multiFile/packageAndPrivateDeclarationDoNotClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// FILE: foo.kt
package foo
diff --git a/js/js.translator/testData/box/multiModule/interfaceMethodWithDefaultParameter.kt b/js/js.translator/testData/box/multiModule/interfaceMethodWithDefaultParameter.kt
index c5bfb0d..3d9d6fa 100644
--- a/js/js.translator/testData/box/multiModule/interfaceMethodWithDefaultParameter.kt
+++ b/js/js.translator/testData/box/multiModule/interfaceMethodWithDefaultParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
public interface I {
diff --git a/js/js.translator/testData/box/multiModule/localClassMetadata.kt b/js/js.translator/testData/box/multiModule/localClassMetadata.kt
index d28ed44..af06ce4 100644
--- a/js/js.translator/testData/box/multiModule/localClassMetadata.kt
+++ b/js/js.translator/testData/box/multiModule/localClassMetadata.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 526
+// EXPECTED_REACHABLE_NODES: 1413
// MODULE: lib
// FILE: lib.kt
diff --git a/js/js.translator/testData/box/multiModule/moduleAndVariableNameClash.kt b/js/js.translator/testData/box/multiModule/moduleAndVariableNameClash.kt
index 68a463e..d89993d 100644
--- a/js/js.translator/testData/box/multiModule/moduleAndVariableNameClash.kt
+++ b/js/js.translator/testData/box/multiModule/moduleAndVariableNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: main(module1)
// FILE: main.kt
diff --git a/js/js.translator/testData/box/multiModule/privateInterfaceNameClash.kt b/js/js.translator/testData/box/multiModule/privateInterfaceNameClash.kt
index fc1a69b..419e71b 100644
--- a/js/js.translator/testData/box/multiModule/privateInterfaceNameClash.kt
+++ b/js/js.translator/testData/box/multiModule/privateInterfaceNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1465
+// EXPECTED_REACHABLE_NODES: 1653
// MODULE: lib1
// FILE: lib1.kt
package lib1
diff --git a/js/js.translator/testData/box/multiModule/privateNameClash.kt b/js/js.translator/testData/box/multiModule/privateNameClash.kt
index 7c3ceea..16abffb 100644
--- a/js/js.translator/testData/box/multiModule/privateNameClash.kt
+++ b/js/js.translator/testData/box/multiModule/privateNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1450
+// EXPECTED_REACHABLE_NODES: 1638
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/multiModule/publishedApiMangling.kt b/js/js.translator/testData/box/multiModule/publishedApiMangling.kt
index d55fe5f..8e2f389 100644
--- a/js/js.translator/testData/box/multiModule/publishedApiMangling.kt
+++ b/js/js.translator/testData/box/multiModule/publishedApiMangling.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1480
+// EXPECTED_REACHABLE_NODES: 1695
// MODULE: lib
// FILE: lib.kt
class A {
diff --git a/js/js.translator/testData/box/multiModule/samePackageNames.kt b/js/js.translator/testData/box/multiModule/samePackageNames.kt
index 6ea7e96..33c835a 100644
--- a/js/js.translator/testData/box/multiModule/samePackageNames.kt
+++ b/js/js.translator/testData/box/multiModule/samePackageNames.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1398
// MODULE: lib1
// FILE: lib1.kt
package pkg
diff --git a/js/js.translator/testData/box/multiModule/useElementsFromDefaultPackageInAnotherModule.kt b/js/js.translator/testData/box/multiModule/useElementsFromDefaultPackageInAnotherModule.kt
index 7773031..9de2214 100644
--- a/js/js.translator/testData/box/multiModule/useElementsFromDefaultPackageInAnotherModule.kt
+++ b/js/js.translator/testData/box/multiModule/useElementsFromDefaultPackageInAnotherModule.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: main(module1)
// FILE: main.kt
diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt
index defb42c..fca86b2 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// MODULE: lib
// FILE: lib.kt
// MODULE_KIND: AMD
diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt
index 12e88e8..2b2d922 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// MODULE: module-1
// FILE: bar.kt
// MODULE_KIND: AMD
diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt
index 1a1fee8..67fc1dc 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// MODULE: module1
// FILE: bar.kt
// MODULE_KIND: AMD
diff --git a/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt
index ba554a8..933304a 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
// MODULE: #my-libr@ry
// FILE: bar.kt
// MODULE_KIND: COMMON_JS
diff --git a/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt
index ee9a34c..351e9a1 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: module-1
// FILE: bar.kt
// MODULE_KIND: COMMON_JS
diff --git a/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt
index faff31c..611a88e 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: module1
// FILE: bar.kt
// MODULE_KIND: COMMON_JS
diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt
index fe45056..9497dc8 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// MODULE: #my-libr@ry
// FILE: bar.kt
// MODULE_KIND: PLAIN
diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt
index de7f5a2..44db927 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: module-1
// FILE: bar.kt
// MODULE_KIND: PLAIN
diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt
index 70e3148..ef96d47 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: module1
// FILE: bar.kt
// MODULE_KIND: PLAIN
diff --git a/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt
index 2a84eb9..8168cd5 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// MODULE: module-1
// FILE: bar.kt
// MODULE_KIND: UMD
diff --git a/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt
index 80bc3fc..f5c8b8a 100644
--- a/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt
+++ b/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// MODULE: module1
// FILE: bar.kt
// MODULE_KIND: UMD
diff --git a/js/js.translator/testData/box/multiPackage/classesInheritedFromOtherPackage.kt b/js/js.translator/testData/box/multiPackage/classesInheritedFromOtherPackage.kt
index ca0a911..e6c4313 100644
--- a/js/js.translator/testData/box/multiPackage/classesInheritedFromOtherPackage.kt
+++ b/js/js.translator/testData/box/multiPackage/classesInheritedFromOtherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
// FILE: a.kt
package foo
diff --git a/js/js.translator/testData/box/multiPackage/createClassFromOtherPackage.kt b/js/js.translator/testData/box/multiPackage/createClassFromOtherPackage.kt
index d79ff67..1566e83 100644
--- a/js/js.translator/testData/box/multiPackage/createClassFromOtherPackage.kt
+++ b/js/js.translator/testData/box/multiPackage/createClassFromOtherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// FILE: a.kt
package a.foo
diff --git a/js/js.translator/testData/box/multiPackage/createClassFromOtherPackageUsingImport.kt b/js/js.translator/testData/box/multiPackage/createClassFromOtherPackageUsingImport.kt
index 573cbf9..de0739c 100644
--- a/js/js.translator/testData/box/multiPackage/createClassFromOtherPackageUsingImport.kt
+++ b/js/js.translator/testData/box/multiPackage/createClassFromOtherPackageUsingImport.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// FILE: a.kt
package a.foo
diff --git a/js/js.translator/testData/box/multiPackage/functionsVisibleFromOtherPackage.kt b/js/js.translator/testData/box/multiPackage/functionsVisibleFromOtherPackage.kt
index 130586b..0526445 100644
--- a/js/js.translator/testData/box/multiPackage/functionsVisibleFromOtherPackage.kt
+++ b/js/js.translator/testData/box/multiPackage/functionsVisibleFromOtherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: a.kt
package bar
diff --git a/js/js.translator/testData/box/multiPackage/nestedPackageFunctionCalledFromOtherPackage.kt b/js/js.translator/testData/box/multiPackage/nestedPackageFunctionCalledFromOtherPackage.kt
index 4bbf043..62b9724 100644
--- a/js/js.translator/testData/box/multiPackage/nestedPackageFunctionCalledFromOtherPackage.kt
+++ b/js/js.translator/testData/box/multiPackage/nestedPackageFunctionCalledFromOtherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: a.kt
package a.foo
diff --git a/js/js.translator/testData/box/multiPackage/packageVariableVisibleFromOtherPackage.kt b/js/js.translator/testData/box/multiPackage/packageVariableVisibleFromOtherPackage.kt
index 01358b3..c700a0f 100644
--- a/js/js.translator/testData/box/multiPackage/packageVariableVisibleFromOtherPackage.kt
+++ b/js/js.translator/testData/box/multiPackage/packageVariableVisibleFromOtherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// FILE: a.kt
package foo
diff --git a/js/js.translator/testData/box/multiPackage/reflectionFromOtherPackage.kt b/js/js.translator/testData/box/multiPackage/reflectionFromOtherPackage.kt
index 9fa235d..840ae0e 100644
--- a/js/js.translator/testData/box/multiPackage/reflectionFromOtherPackage.kt
+++ b/js/js.translator/testData/box/multiPackage/reflectionFromOtherPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 507
+// EXPECTED_REACHABLE_NODES: 1393
// FILE: a.kt
package bar
diff --git a/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNames.kt b/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNames.kt
index a4051fb..899e65d 100644
--- a/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNames.kt
+++ b/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNames.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: a.kt
package a.foo
diff --git a/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNamesUsingImport.kt b/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNamesUsingImport.kt
index c8a6600..3f1214e 100644
--- a/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNamesUsingImport.kt
+++ b/js/js.translator/testData/box/multiPackage/subpackagesWithClashingNamesUsingImport.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: a.kt
package a.foo
diff --git a/js/js.translator/testData/box/multideclaration/multiValForArray.kt b/js/js.translator/testData/box/multideclaration/multiValForArray.kt
index d0f4bb8..f6825fa 100644
--- a/js/js.translator/testData/box/multideclaration/multiValForArray.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValForArray.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A {
diff --git a/js/js.translator/testData/box/multideclaration/multiValForMap.kt b/js/js.translator/testData/box/multideclaration/multiValForMap.kt
index f21dd5a..0ff9edf 100644
--- a/js/js.translator/testData/box/multideclaration/multiValForMap.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValForMap.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 934
+// EXPECTED_REACHABLE_NODES: 1378
package foo
diff --git a/js/js.translator/testData/box/multideclaration/multiValForRange.kt b/js/js.translator/testData/box/multideclaration/multiValForRange.kt
index ac68772..22cc1c0 100644
--- a/js/js.translator/testData/box/multideclaration/multiValForRange.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValForRange.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 632
+// EXPECTED_REACHABLE_NODES: 1405
package foo
class C(val i: Int) : Comparable<C>, A() {
diff --git a/js/js.translator/testData/box/multideclaration/multiValInFor.kt b/js/js.translator/testData/box/multideclaration/multiValInFor.kt
index 15fe551..69510c9 100644
--- a/js/js.translator/testData/box/multideclaration/multiValInFor.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValInFor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 891
+// EXPECTED_REACHABLE_NODES: 1379
package foo
diff --git a/js/js.translator/testData/box/multideclaration/multiValInIntFor.kt b/js/js.translator/testData/box/multideclaration/multiValInIntFor.kt
index 7a7a21e..dd18b52 100644
--- a/js/js.translator/testData/box/multideclaration/multiValInIntFor.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValInIntFor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
operator fun Int.component1(): Int {
diff --git a/js/js.translator/testData/box/multideclaration/multiValInIntRangeFor.kt b/js/js.translator/testData/box/multideclaration/multiValInIntRangeFor.kt
index 0ecaa8d..ff1f6aa 100644
--- a/js/js.translator/testData/box/multideclaration/multiValInIntRangeFor.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValInIntRangeFor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
operator fun Int.component1(): Int {
diff --git a/js/js.translator/testData/box/multideclaration/multiValOrVar.kt b/js/js.translator/testData/box/multideclaration/multiValOrVar.kt
index a789e89..70158ad 100644
--- a/js/js.translator/testData/box/multideclaration/multiValOrVar.kt
+++ b/js/js.translator/testData/box/multideclaration/multiValOrVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
class A {
diff --git a/js/js.translator/testData/box/nameClashes/classAndCompanionObjectMembers.kt b/js/js.translator/testData/box/nameClashes/classAndCompanionObjectMembers.kt
index 61e93c0..3247897 100644
--- a/js/js.translator/testData/box/nameClashes/classAndCompanionObjectMembers.kt
+++ b/js/js.translator/testData/box/nameClashes/classAndCompanionObjectMembers.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
class A {
diff --git a/js/js.translator/testData/box/nameClashes/constructorLocalVar.kt b/js/js.translator/testData/box/nameClashes/constructorLocalVar.kt
index 0ad14c2..e93b5f2 100644
--- a/js/js.translator/testData/box/nameClashes/constructorLocalVar.kt
+++ b/js/js.translator/testData/box/nameClashes/constructorLocalVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
var log = ""
inline fun f(x: Int): Int {
diff --git a/js/js.translator/testData/box/nameClashes/differenceInCapitalization.kt b/js/js.translator/testData/box/nameClashes/differenceInCapitalization.kt
index bdf8a72..e368dc1 100644
--- a/js/js.translator/testData/box/nameClashes/differenceInCapitalization.kt
+++ b/js/js.translator/testData/box/nameClashes/differenceInCapitalization.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class Box<T>(t: T) {
diff --git a/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt b/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt
index 8f2b433..2a1461b 100644
--- a/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt
+++ b/js/js.translator/testData/box/nameClashes/extensionFunctionAndProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 896
+// EXPECTED_REACHABLE_NODES: 1384
package foo
public fun <T> List<T>.some(): T = this[0]
diff --git a/js/js.translator/testData/box/nameClashes/extensionPropertiesWithDifferentReceivers.kt b/js/js.translator/testData/box/nameClashes/extensionPropertiesWithDifferentReceivers.kt
index c8b942a..12e4867 100644
--- a/js/js.translator/testData/box/nameClashes/extensionPropertiesWithDifferentReceivers.kt
+++ b/js/js.translator/testData/box/nameClashes/extensionPropertiesWithDifferentReceivers.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class A
diff --git a/js/js.translator/testData/box/nameClashes/extensionPropertyAndMethod.kt b/js/js.translator/testData/box/nameClashes/extensionPropertyAndMethod.kt
index c95c399..1d68d60 100644
--- a/js/js.translator/testData/box/nameClashes/extensionPropertyAndMethod.kt
+++ b/js/js.translator/testData/box/nameClashes/extensionPropertyAndMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A
diff --git a/js/js.translator/testData/box/nameClashes/jsNameAndPrivate.kt b/js/js.translator/testData/box/nameClashes/jsNameAndPrivate.kt
index c9e5927..1f671d4 100644
--- a/js/js.translator/testData/box/nameClashes/jsNameAndPrivate.kt
+++ b/js/js.translator/testData/box/nameClashes/jsNameAndPrivate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
@JsName("bar") fun foo(x: Int) = x
diff --git a/js/js.translator/testData/box/nameClashes/localFunctionInLambda.kt b/js/js.translator/testData/box/nameClashes/localFunctionInLambda.kt
index f6c1f9e..49142a8 100644
--- a/js/js.translator/testData/box/nameClashes/localFunctionInLambda.kt
+++ b/js/js.translator/testData/box/nameClashes/localFunctionInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/nameClashes/localFunctions.kt b/js/js.translator/testData/box/nameClashes/localFunctions.kt
index f8022c9..b2f7b5d 100644
--- a/js/js.translator/testData/box/nameClashes/localFunctions.kt
+++ b/js/js.translator/testData/box/nameClashes/localFunctions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
var log = ""
fun foo() {
diff --git a/js/js.translator/testData/box/nameClashes/methodAndPrivateProperty.kt b/js/js.translator/testData/box/nameClashes/methodAndPrivateProperty.kt
index 6eaf062..33b1757 100644
--- a/js/js.translator/testData/box/nameClashes/methodAndPrivateProperty.kt
+++ b/js/js.translator/testData/box/nameClashes/methodAndPrivateProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun bar() = 23
diff --git a/js/js.translator/testData/box/nameClashes/methodOverload.kt b/js/js.translator/testData/box/nameClashes/methodOverload.kt
index 0439da9..e83ae24 100644
--- a/js/js.translator/testData/box/nameClashes/methodOverload.kt
+++ b/js/js.translator/testData/box/nameClashes/methodOverload.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
class A() {
diff --git a/js/js.translator/testData/box/nameClashes/methodOverloadInClassWithTwoUpperBounds.kt b/js/js.translator/testData/box/nameClashes/methodOverloadInClassWithTwoUpperBounds.kt
index 01b5d6b..9130444 100644
--- a/js/js.translator/testData/box/nameClashes/methodOverloadInClassWithTwoUpperBounds.kt
+++ b/js/js.translator/testData/box/nameClashes/methodOverloadInClassWithTwoUpperBounds.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 512
+// EXPECTED_REACHABLE_NODES: 1399
package foo
interface TraitA
diff --git a/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt b/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt
index 9264b859..ede05b8 100644
--- a/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt
+++ b/js/js.translator/testData/box/nameClashes/nativeAndTopLevelFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package test
external fun foo(ignore: dynamic): String
diff --git a/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt b/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt
index abd59e1..6ff08e8 100644
--- a/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt
+++ b/js/js.translator/testData/box/nameClashes/nativeDeclarationAndLocalVar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package test
external fun foo(): dynamic
diff --git a/js/js.translator/testData/box/nameClashes/overloadExtension.kt b/js/js.translator/testData/box/nameClashes/overloadExtension.kt
index c950c94..afbdd35 100644
--- a/js/js.translator/testData/box/nameClashes/overloadExtension.kt
+++ b/js/js.translator/testData/box/nameClashes/overloadExtension.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun Int.foo() {
diff --git a/js/js.translator/testData/box/nameClashes/propertyAndNativeMethod.kt b/js/js.translator/testData/box/nameClashes/propertyAndNativeMethod.kt
index 74a792f..d914863 100644
--- a/js/js.translator/testData/box/nameClashes/propertyAndNativeMethod.kt
+++ b/js/js.translator/testData/box/nameClashes/propertyAndNativeMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
// MODULE: lib
// FILE: lib.kt
package lib
diff --git a/js/js.translator/testData/box/nameClashes/topLevelFunctionAndParameter.kt b/js/js.translator/testData/box/nameClashes/topLevelFunctionAndParameter.kt
index d57b8a5..43d11bf 100644
--- a/js/js.translator/testData/box/nameClashes/topLevelFunctionAndParameter.kt
+++ b/js/js.translator/testData/box/nameClashes/topLevelFunctionAndParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1379
fun f(x: Int) = x * 2
fun test(f: (Long) -> Long) = Pair(f(23 as Int), f(42L))
diff --git a/js/js.translator/testData/box/native/accessToCompanionObjectFromInlineFun.kt b/js/js.translator/testData/box/native/accessToCompanionObjectFromInlineFun.kt
index e999244..2470953 100644
--- a/js/js.translator/testData/box/native/accessToCompanionObjectFromInlineFun.kt
+++ b/js/js.translator/testData/box/native/accessToCompanionObjectFromInlineFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
// FILE: main.kt
package foo
diff --git a/js/js.translator/testData/box/native/callbackOptionalParameter.kt b/js/js.translator/testData/box/native/callbackOptionalParameter.kt
index 33e81bb..496bdbd 100644
--- a/js/js.translator/testData/box/native/callbackOptionalParameter.kt
+++ b/js/js.translator/testData/box/native/callbackOptionalParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
var global = ""
diff --git a/js/js.translator/testData/box/native/castToNativeClassChecked.kt b/js/js.translator/testData/box/native/castToNativeClassChecked.kt
index d1a0783..4fdfdb6 100644
--- a/js/js.translator/testData/box/native/castToNativeClassChecked.kt
+++ b/js/js.translator/testData/box/native/castToNativeClassChecked.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// FILE: castToNativeClassChecked.kt
external abstract class S() {
abstract fun foo(): String
diff --git a/js/js.translator/testData/box/native/castToNativeInterface.kt b/js/js.translator/testData/box/native/castToNativeInterface.kt
index 4e2e630..787e1c3 100644
--- a/js/js.translator/testData/box/native/castToNativeInterface.kt
+++ b/js/js.translator/testData/box/native/castToNativeInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
// FILE: castToNativeInterface.kt
external interface I {
fun foo(): String
diff --git a/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt b/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt
index 7ad3d95..91d4ef6 100644
--- a/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt
+++ b/js/js.translator/testData/box/native/castToNativeInterfaceChecked.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
external interface I {
fun foo(): String
}
diff --git a/js/js.translator/testData/box/native/castToNullableNativeInterface.kt b/js/js.translator/testData/box/native/castToNullableNativeInterface.kt
index 6dc849f..c40633b0 100644
--- a/js/js.translator/testData/box/native/castToNullableNativeInterface.kt
+++ b/js/js.translator/testData/box/native/castToNullableNativeInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
external interface I {
fun foo(): String
}
diff --git a/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt b/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt
index c878926..8555020 100644
--- a/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt
+++ b/js/js.translator/testData/box/native/castToTypeParamBoundedByNativeInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
// FILE: castToTypeParamBoundedByNativeInterface.kt
external interface I {
fun foo(): String
diff --git a/js/js.translator/testData/box/native/class.kt b/js/js.translator/testData/box/native/class.kt
index f86867b..97ba49a 100644
--- a/js/js.translator/testData/box/native/class.kt
+++ b/js/js.translator/testData/box/native/class.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
external class A(b: Int) {
diff --git a/js/js.translator/testData/box/native/classObject.kt b/js/js.translator/testData/box/native/classObject.kt
index 6a2ea93..8f13e0f 100644
--- a/js/js.translator/testData/box/native/classObject.kt
+++ b/js/js.translator/testData/box/native/classObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
external class A(c: Int) {
diff --git a/js/js.translator/testData/box/native/equalsMangling.kt b/js/js.translator/testData/box/native/equalsMangling.kt
index 9cdaa6b..94620e8 100644
--- a/js/js.translator/testData/box/native/equalsMangling.kt
+++ b/js/js.translator/testData/box/native/equalsMangling.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
data class A(val number: Int)
external fun foo(first: A, second: A): Boolean
diff --git a/js/js.translator/testData/box/native/exception.kt b/js/js.translator/testData/box/native/exception.kt
index 4257753..77cf15b 100644
--- a/js/js.translator/testData/box/native/exception.kt
+++ b/js/js.translator/testData/box/native/exception.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
external class TypeError(message: String?, fileName: String? = definedExternally, lineNumber: Int? = definedExternally) : Throwable
fun box(): String {
diff --git a/js/js.translator/testData/box/native/inheritanceFromNativeClass.kt b/js/js.translator/testData/box/native/inheritanceFromNativeClass.kt
index 66d7747..f7298a9 100644
--- a/js/js.translator/testData/box/native/inheritanceFromNativeClass.kt
+++ b/js/js.translator/testData/box/native/inheritanceFromNativeClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
internal external open class A(a: Int) {
diff --git a/js/js.translator/testData/box/native/inheritanceFromNativeTrait.kt b/js/js.translator/testData/box/native/inheritanceFromNativeTrait.kt
index 6d47b85..927a13d 100644
--- a/js/js.translator/testData/box/native/inheritanceFromNativeTrait.kt
+++ b/js/js.translator/testData/box/native/inheritanceFromNativeTrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1395
package foo
external interface NativeTrait {
diff --git a/js/js.translator/testData/box/native/kt2209.kt b/js/js.translator/testData/box/native/kt2209.kt
index eddc511..495a1ad 100644
--- a/js/js.translator/testData/box/native/kt2209.kt
+++ b/js/js.translator/testData/box/native/kt2209.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
external interface Chrome {
diff --git a/js/js.translator/testData/box/native/library.kt b/js/js.translator/testData/box/native/library.kt
index ee6e6d9..bb5403f 100644
--- a/js/js.translator/testData/box/native/library.kt
+++ b/js/js.translator/testData/box/native/library.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
package foo
diff --git a/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt b/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt
index 8f38a8c..983336c 100644
--- a/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt
+++ b/js/js.translator/testData/box/native/nativeClassAsReifiedTypeArgument.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
//FILE: nativeClassAsReifiedTypeArgument.kt
var global = ""
diff --git a/js/js.translator/testData/box/native/nativeGetterAndNativeSetter.kt b/js/js.translator/testData/box/native/nativeGetterAndNativeSetter.kt
index 3b361fa..812c3fe 100644
--- a/js/js.translator/testData/box/native/nativeGetterAndNativeSetter.kt
+++ b/js/js.translator/testData/box/native/nativeGetterAndNativeSetter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1389
package foo
@JsName("Object")
diff --git a/js/js.translator/testData/box/native/nativeInvoke.kt b/js/js.translator/testData/box/native/nativeInvoke.kt
index e194d10..56a438e 100644
--- a/js/js.translator/testData/box/native/nativeInvoke.kt
+++ b/js/js.translator/testData/box/native/nativeInvoke.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
external class Function(vararg argsAndCode: String) {
diff --git a/js/js.translator/testData/box/native/nestedElements.kt b/js/js.translator/testData/box/native/nestedElements.kt
index ac97731..f550a4a 100644
--- a/js/js.translator/testData/box/native/nestedElements.kt
+++ b/js/js.translator/testData/box/native/nestedElements.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 519
+// EXPECTED_REACHABLE_NODES: 1406
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/native/overrideNativeOverloadedFunction.kt b/js/js.translator/testData/box/native/overrideNativeOverloadedFunction.kt
index 380d148..c67e2f5 100644
--- a/js/js.translator/testData/box/native/overrideNativeOverloadedFunction.kt
+++ b/js/js.translator/testData/box/native/overrideNativeOverloadedFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1398
external open class A {
open fun f(x: Int): String = definedExternally
diff --git a/js/js.translator/testData/box/native/passExtLambdaFromNative.kt b/js/js.translator/testData/box/native/passExtLambdaFromNative.kt
index b62518d..ebc011a 100644
--- a/js/js.translator/testData/box/native/passExtLambdaFromNative.kt
+++ b/js/js.translator/testData/box/native/passExtLambdaFromNative.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
internal external class A(v: String) {
diff --git a/js/js.translator/testData/box/native/passMemberOrExtFromNative.kt b/js/js.translator/testData/box/native/passMemberOrExtFromNative.kt
index d24f48e..bc1d33b 100644
--- a/js/js.translator/testData/box/native/passMemberOrExtFromNative.kt
+++ b/js/js.translator/testData/box/native/passMemberOrExtFromNative.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1381
package foo
external class A(v: String) {
diff --git a/js/js.translator/testData/box/native/passTopLevelFunctionFromNative.kt b/js/js.translator/testData/box/native/passTopLevelFunctionFromNative.kt
index 3094349..e17d5c1 100644
--- a/js/js.translator/testData/box/native/passTopLevelFunctionFromNative.kt
+++ b/js/js.translator/testData/box/native/passTopLevelFunctionFromNative.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1376
package foo
external fun nativeFun(i:Int, s:String): String = definedExternally
diff --git a/js/js.translator/testData/box/native/passTopLevelOrLocalFunctionToNative.kt b/js/js.translator/testData/box/native/passTopLevelOrLocalFunctionToNative.kt
index 4bd9f9b..7002507 100644
--- a/js/js.translator/testData/box/native/passTopLevelOrLocalFunctionToNative.kt
+++ b/js/js.translator/testData/box/native/passTopLevelOrLocalFunctionToNative.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
package foo
external fun run(i:Int, s:String, funRef: (Int, String) -> String): String = definedExternally
diff --git a/js/js.translator/testData/box/native/privateExternal.kt b/js/js.translator/testData/box/native/privateExternal.kt
index e3bc370..c4ada09 100644
--- a/js/js.translator/testData/box/native/privateExternal.kt
+++ b/js/js.translator/testData/box/native/privateExternal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
private external fun foo(): String
fun box() = foo()
\ No newline at end of file
diff --git a/js/js.translator/testData/box/native/safeCastToNativeInterface.kt b/js/js.translator/testData/box/native/safeCastToNativeInterface.kt
index 8683818..ea57108 100644
--- a/js/js.translator/testData/box/native/safeCastToNativeInterface.kt
+++ b/js/js.translator/testData/box/native/safeCastToNativeInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
external interface I {
fun foo(): String
}
diff --git a/js/js.translator/testData/box/native/secondaryConstructor.kt b/js/js.translator/testData/box/native/secondaryConstructor.kt
index 1ff831b..651c8d0 100644
--- a/js/js.translator/testData/box/native/secondaryConstructor.kt
+++ b/js/js.translator/testData/box/native/secondaryConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1384
package foo
external class A {
diff --git a/js/js.translator/testData/box/native/simple.kt b/js/js.translator/testData/box/native/simple.kt
index 0ab0215..7fe9eae 100644
--- a/js/js.translator/testData/box/native/simple.kt
+++ b/js/js.translator/testData/box/native/simple.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
external fun returnFalse(): Boolean = definedExternally
diff --git a/js/js.translator/testData/box/native/simpleUndefined.kt b/js/js.translator/testData/box/native/simpleUndefined.kt
index a1f971c5..236364d 100644
--- a/js/js.translator/testData/box/native/simpleUndefined.kt
+++ b/js/js.translator/testData/box/native/simpleUndefined.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
external val c: Any? = definedExternally
diff --git a/js/js.translator/testData/box/native/typeof.kt b/js/js.translator/testData/box/native/typeof.kt
index 439ed92..f01f693 100644
--- a/js/js.translator/testData/box/native/typeof.kt
+++ b/js/js.translator/testData/box/native/typeof.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A
diff --git a/js/js.translator/testData/box/native/undefined.kt b/js/js.translator/testData/box/native/undefined.kt
index 13ae58e..786d0d2 100644
--- a/js/js.translator/testData/box/native/undefined.kt
+++ b/js/js.translator/testData/box/native/undefined.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/native/useClassFromInlineFun.kt b/js/js.translator/testData/box/native/useClassFromInlineFun.kt
index 2ad3db5..0161aac 100644
--- a/js/js.translator/testData/box/native/useClassFromInlineFun.kt
+++ b/js/js.translator/testData/box/native/useClassFromInlineFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
// FILE: main.kt
package foo
diff --git a/js/js.translator/testData/box/native/vararg.kt b/js/js.translator/testData/box/native/vararg.kt
index 3ddc736..83f4e57 100644
--- a/js/js.translator/testData/box/native/vararg.kt
+++ b/js/js.translator/testData/box/native/vararg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 530
+// EXPECTED_REACHABLE_NODES: 1412
package foo
external fun paramCount(vararg a: Int): Int = definedExternally
diff --git a/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLambda.kt b/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLambda.kt
index f9fbf65..29feb26 100644
--- a/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLambda.kt
+++ b/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
// See KT-11823
package foo
diff --git a/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLocalClass.kt b/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLocalClass.kt
index 9287c09..b122e42 100644
--- a/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLocalClass.kt
+++ b/js/js.translator/testData/box/nestedTypes/implicitOuterThisFromLocalClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
// See KT-11823
package foo
diff --git a/js/js.translator/testData/box/nestedTypes/inheritanceFromNestedBuiltIn.kt b/js/js.translator/testData/box/nestedTypes/inheritanceFromNestedBuiltIn.kt
index b89a0d8..1c82eb8 100644
--- a/js/js.translator/testData/box/nestedTypes/inheritanceFromNestedBuiltIn.kt
+++ b/js/js.translator/testData/box/nestedTypes/inheritanceFromNestedBuiltIn.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class EntryImplementor() : Map.Entry<String, String> {
diff --git a/js/js.translator/testData/box/nestedTypes/inner.kt b/js/js.translator/testData/box/nestedTypes/inner.kt
index 57b7757..d38b6ea 100644
--- a/js/js.translator/testData/box/nestedTypes/inner.kt
+++ b/js/js.translator/testData/box/nestedTypes/inner.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
open class A(val x: Int, val y: Int) {
diff --git a/js/js.translator/testData/box/nestedTypes/innerObjectRefFromConstructor.kt b/js/js.translator/testData/box/nestedTypes/innerObjectRefFromConstructor.kt
index 087e4b2..fd604d9 100644
--- a/js/js.translator/testData/box/nestedTypes/innerObjectRefFromConstructor.kt
+++ b/js/js.translator/testData/box/nestedTypes/innerObjectRefFromConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class X {
diff --git a/js/js.translator/testData/box/nestedTypes/innerReferenceFromChild.kt b/js/js.translator/testData/box/nestedTypes/innerReferenceFromChild.kt
index 5d5873f..f79fabf 100644
--- a/js/js.translator/testData/box/nestedTypes/innerReferenceFromChild.kt
+++ b/js/js.translator/testData/box/nestedTypes/innerReferenceFromChild.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
var i = 0
diff --git a/js/js.translator/testData/box/nestedTypes/nested.kt b/js/js.translator/testData/box/nestedTypes/nested.kt
index f9e5433..f72651d 100644
--- a/js/js.translator/testData/box/nestedTypes/nested.kt
+++ b/js/js.translator/testData/box/nestedTypes/nested.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
open class A(val x: Int) {
diff --git a/js/js.translator/testData/box/nestedTypes/nestedInInterface.kt b/js/js.translator/testData/box/nestedTypes/nestedInInterface.kt
index 2729e06..6403ea1 100644
--- a/js/js.translator/testData/box/nestedTypes/nestedInInterface.kt
+++ b/js/js.translator/testData/box/nestedTypes/nestedInInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
interface A {
diff --git a/js/js.translator/testData/box/nestedTypes/nestedObjectLazyInitialized.kt b/js/js.translator/testData/box/nestedTypes/nestedObjectLazyInitialized.kt
index 0d5f39b..6e6f998 100644
--- a/js/js.translator/testData/box/nestedTypes/nestedObjectLazyInitialized.kt
+++ b/js/js.translator/testData/box/nestedTypes/nestedObjectLazyInitialized.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
// See KT-6201
package foo
diff --git a/js/js.translator/testData/box/nestedTypes/outerClassReferenceFromSecondaryConstructor.kt b/js/js.translator/testData/box/nestedTypes/outerClassReferenceFromSecondaryConstructor.kt
index ebfa467..55ff875 100644
--- a/js/js.translator/testData/box/nestedTypes/outerClassReferenceFromSecondaryConstructor.kt
+++ b/js/js.translator/testData/box/nestedTypes/outerClassReferenceFromSecondaryConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class A(val x: Int) {
diff --git a/js/js.translator/testData/box/nestedTypes/outerCompanion.kt b/js/js.translator/testData/box/nestedTypes/outerCompanion.kt
index 6fa3f50..6a2aece 100644
--- a/js/js.translator/testData/box/nestedTypes/outerCompanion.kt
+++ b/js/js.translator/testData/box/nestedTypes/outerCompanion.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
class A {
diff --git a/js/js.translator/testData/box/nestedTypes/outerNative.kt b/js/js.translator/testData/box/nestedTypes/outerNative.kt
index cac7d7d..b213c26 100644
--- a/js/js.translator/testData/box/nestedTypes/outerNative.kt
+++ b/js/js.translator/testData/box/nestedTypes/outerNative.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
external class A(x: Int) {
diff --git a/js/js.translator/testData/box/nestedTypes/outerObject.kt b/js/js.translator/testData/box/nestedTypes/outerObject.kt
index 6434c6da..fe33e98 100644
--- a/js/js.translator/testData/box/nestedTypes/outerObject.kt
+++ b/js/js.translator/testData/box/nestedTypes/outerObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
val q = "baz"
diff --git a/js/js.translator/testData/box/nestedTypes/outerThis.kt b/js/js.translator/testData/box/nestedTypes/outerThis.kt
index f3c1419..5f45d1d 100644
--- a/js/js.translator/testData/box/nestedTypes/outerThis.kt
+++ b/js/js.translator/testData/box/nestedTypes/outerThis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Outer() {
diff --git a/js/js.translator/testData/box/nestedTypes/privateFieldNotOverridenInNestedSubclass.kt b/js/js.translator/testData/box/nestedTypes/privateFieldNotOverridenInNestedSubclass.kt
index 4b75051..dea7f5c 100644
--- a/js/js.translator/testData/box/nestedTypes/privateFieldNotOverridenInNestedSubclass.kt
+++ b/js/js.translator/testData/box/nestedTypes/privateFieldNotOverridenInNestedSubclass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
open class A(private val bar: String = "1") {
diff --git a/js/js.translator/testData/box/nestedTypes/receivers.kt b/js/js.translator/testData/box/nestedTypes/receivers.kt
index f0b2b5f..31338f1 100644
--- a/js/js.translator/testData/box/nestedTypes/receivers.kt
+++ b/js/js.translator/testData/box/nestedTypes/receivers.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 522
+// EXPECTED_REACHABLE_NODES: 1409
package foo
open class D {
diff --git a/js/js.translator/testData/box/number/assignmentIntOverflow.kt b/js/js.translator/testData/box/number/assignmentIntOverflow.kt
index 372d5d5..46589a4 100644
--- a/js/js.translator/testData/box/number/assignmentIntOverflow.kt
+++ b/js/js.translator/testData/box/number/assignmentIntOverflow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun bigValue() = 0x7FFFFFFC
diff --git a/js/js.translator/testData/box/number/byteAndShortConversions.kt b/js/js.translator/testData/box/number/byteAndShortConversions.kt
index 1c33afc..44fbfd8 100644
--- a/js/js.translator/testData/box/number/byteAndShortConversions.kt
+++ b/js/js.translator/testData/box/number/byteAndShortConversions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun testShortConversions(c: Short): Boolean {
diff --git a/js/js.translator/testData/box/number/conversionsWithTruncation.kt b/js/js.translator/testData/box/number/conversionsWithTruncation.kt
index 22f9403..ee46832 100644
--- a/js/js.translator/testData/box/number/conversionsWithTruncation.kt
+++ b/js/js.translator/testData/box/number/conversionsWithTruncation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/conversionsWithoutTruncation.kt b/js/js.translator/testData/box/number/conversionsWithoutTruncation.kt
index d0763f7..a1a9329 100644
--- a/js/js.translator/testData/box/number/conversionsWithoutTruncation.kt
+++ b/js/js.translator/testData/box/number/conversionsWithoutTruncation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
fun testForNumber(numberX: Number) {
diff --git a/js/js.translator/testData/box/number/division.kt b/js/js.translator/testData/box/number/division.kt
index 1920533..c3936d2 100644
--- a/js/js.translator/testData/box/number/division.kt
+++ b/js/js.translator/testData/box/number/division.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/doubleConversions.kt b/js/js.translator/testData/box/number/doubleConversions.kt
index 804cfa9..3c6224b 100644
--- a/js/js.translator/testData/box/number/doubleConversions.kt
+++ b/js/js.translator/testData/box/number/doubleConversions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/hashCode.kt b/js/js.translator/testData/box/number/hashCode.kt
index 447d4e0..7efc05c 100644
--- a/js/js.translator/testData/box/number/hashCode.kt
+++ b/js/js.translator/testData/box/number/hashCode.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
fun box(): String {
diff --git a/js/js.translator/testData/box/number/hexadecimalConstant.kt b/js/js.translator/testData/box/number/hexadecimalConstant.kt
index 48d3e1f..85b77f2 100644
--- a/js/js.translator/testData/box/number/hexadecimalConstant.kt
+++ b/js/js.translator/testData/box/number/hexadecimalConstant.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/intConversions.kt b/js/js.translator/testData/box/number/intConversions.kt
index d583ffc..c2126bc 100644
--- a/js/js.translator/testData/box/number/intConversions.kt
+++ b/js/js.translator/testData/box/number/intConversions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/intDivFloat.kt b/js/js.translator/testData/box/number/intDivFloat.kt
index d987643..9dc4b19 100644
--- a/js/js.translator/testData/box/number/intDivFloat.kt
+++ b/js/js.translator/testData/box/number/intDivFloat.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// http://youtrack.jetbrains.com/issue/KT-5345
// KT-5345 (Javascript) Type mismatch on Int / Float division
// If any of Number operands is floating-point, the result should be float too.
diff --git a/js/js.translator/testData/box/number/intIncDecOverflow.kt b/js/js.translator/testData/box/number/intIncDecOverflow.kt
index c7b0980..875ac97 100644
--- a/js/js.translator/testData/box/number/intIncDecOverflow.kt
+++ b/js/js.translator/testData/box/number/intIncDecOverflow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
diff --git a/js/js.translator/testData/box/number/intOverflow.kt b/js/js.translator/testData/box/number/intOverflow.kt
index b7e793c..e88b456 100644
--- a/js/js.translator/testData/box/number/intOverflow.kt
+++ b/js/js.translator/testData/box/number/intOverflow.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun bigValue() = 0x7FFFFFFC
diff --git a/js/js.translator/testData/box/number/kt2342.kt b/js/js.translator/testData/box/number/kt2342.kt
index b359580..c952afd 100644
--- a/js/js.translator/testData/box/number/kt2342.kt
+++ b/js/js.translator/testData/box/number/kt2342.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun test(a: Int, b: Int, expected: Int): String {
diff --git a/js/js.translator/testData/box/number/longArray.kt b/js/js.translator/testData/box/number/longArray.kt
index 36c3d28..f4e43e1 100644
--- a/js/js.translator/testData/box/number/longArray.kt
+++ b/js/js.translator/testData/box/number/longArray.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/longBinaryOperations.kt b/js/js.translator/testData/box/number/longBinaryOperations.kt
index 7d0d83d..d1b85a2 100644
--- a/js/js.translator/testData/box/number/longBinaryOperations.kt
+++ b/js/js.translator/testData/box/number/longBinaryOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun fact(n: Int): Long = if (n == 1) 1L else n * fact(n - 1)
diff --git a/js/js.translator/testData/box/number/longBitOperations.kt b/js/js.translator/testData/box/number/longBitOperations.kt
index df8ab0a..cc603e1 100644
--- a/js/js.translator/testData/box/number/longBitOperations.kt
+++ b/js/js.translator/testData/box/number/longBitOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/longCompareToIntrinsic.kt b/js/js.translator/testData/box/number/longCompareToIntrinsic.kt
index c24f0f4..daaf65d 100644
--- a/js/js.translator/testData/box/number/longCompareToIntrinsic.kt
+++ b/js/js.translator/testData/box/number/longCompareToIntrinsic.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/longEqualsIntrinsic.kt b/js/js.translator/testData/box/number/longEqualsIntrinsic.kt
index d51a70b..176d175 100644
--- a/js/js.translator/testData/box/number/longEqualsIntrinsic.kt
+++ b/js/js.translator/testData/box/number/longEqualsIntrinsic.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/longHashCode.kt b/js/js.translator/testData/box/number/longHashCode.kt
index 4b5b915..89a8754 100644
--- a/js/js.translator/testData/box/number/longHashCode.kt
+++ b/js/js.translator/testData/box/number/longHashCode.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/longUnaryOperations.kt b/js/js.translator/testData/box/number/longUnaryOperations.kt
index 9d9e7f0..b39ac3e 100644
--- a/js/js.translator/testData/box/number/longUnaryOperations.kt
+++ b/js/js.translator/testData/box/number/longUnaryOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/mulInt32.kt b/js/js.translator/testData/box/number/mulInt32.kt
index 414ca91..528f125 100644
--- a/js/js.translator/testData/box/number/mulInt32.kt
+++ b/js/js.translator/testData/box/number/mulInt32.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 894
+// EXPECTED_REACHABLE_NODES: 1384
fun imul32(a: Int, b: Int): Int = js("Kotlin").imulEmulated(a, b)
fun imul64(a: Int, b: Int): Int = (a.toLong() * b.toLong()).toInt()
diff --git a/js/js.translator/testData/box/number/numberCompareTo.kt b/js/js.translator/testData/box/number/numberCompareTo.kt
index 7bb32c7..8ed17de 100644
--- a/js/js.translator/testData/box/number/numberCompareTo.kt
+++ b/js/js.translator/testData/box/number/numberCompareTo.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
var global: String = ""
diff --git a/js/js.translator/testData/box/number/numberConversions.kt b/js/js.translator/testData/box/number/numberConversions.kt
index d837c15..bfbf6dc 100644
--- a/js/js.translator/testData/box/number/numberConversions.kt
+++ b/js/js.translator/testData/box/number/numberConversions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
fun testIntegerConversions(c: Number): Boolean {
diff --git a/js/js.translator/testData/box/number/numberIncDec.kt b/js/js.translator/testData/box/number/numberIncDec.kt
index 315d9e5..d8ebe7c 100644
--- a/js/js.translator/testData/box/number/numberIncDec.kt
+++ b/js/js.translator/testData/box/number/numberIncDec.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/number/numberIsCheck.kt b/js/js.translator/testData/box/number/numberIsCheck.kt
index 35d2a8c..ca21617 100644
--- a/js/js.translator/testData/box/number/numberIsCheck.kt
+++ b/js/js.translator/testData/box/number/numberIsCheck.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// For now, check is Byte(is Short, is Int is Float, is Double) translates to typeof ... == "number"
diff --git a/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt b/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt
index c4628b9..1aa5ffb 100644
--- a/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt
+++ b/js/js.translator/testData/box/objectDeclaration/dontPolluteObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 917
+// EXPECTED_REACHABLE_NODES: 1404
package foo
object EmptyObject {}
diff --git a/js/js.translator/testData/box/objectDeclaration/kt3684.kt b/js/js.translator/testData/box/objectDeclaration/kt3684.kt
index 6018287..e3c4e48 100644
--- a/js/js.translator/testData/box/objectDeclaration/kt3684.kt
+++ b/js/js.translator/testData/box/objectDeclaration/kt3684.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
// copied from JVM backend tests
package foo
diff --git a/js/js.translator/testData/box/objectDeclaration/lambdaInObjectInsideObject.kt b/js/js.translator/testData/box/objectDeclaration/lambdaInObjectInsideObject.kt
index 6765a50d..64dadae 100644
--- a/js/js.translator/testData/box/objectDeclaration/lambdaInObjectInsideObject.kt
+++ b/js/js.translator/testData/box/objectDeclaration/lambdaInObjectInsideObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
object A {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectDeclaration.kt b/js/js.translator/testData/box/objectDeclaration/objectDeclaration.kt
index e5e1a37..e90b69d 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectDeclaration.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectDeclaration.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1385
package foo
class A {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectDeclarationWithVars.kt b/js/js.translator/testData/box/objectDeclaration/objectDeclarationWithVars.kt
index 660c6eb..334b5b4 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectDeclarationWithVars.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectDeclarationWithVars.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 524
+// EXPECTED_REACHABLE_NODES: 1376
package foo
object State {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectInMethod.kt b/js/js.translator/testData/box/objectDeclaration/objectInMethod.kt
index ba5e07e..1874545 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectInMethod.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectInMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A() {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectInObject.kt b/js/js.translator/testData/box/objectDeclaration/objectInObject.kt
index eba355a..a737c91 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectInObject.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectInObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
object A {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectInObjectWithClosure.kt b/js/js.translator/testData/box/objectDeclaration/objectInObjectWithClosure.kt
index 88177a1..b707741 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectInObjectWithClosure.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectInObjectWithClosure.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class Foo {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectInheritingFromATrait.kt b/js/js.translator/testData/box/objectDeclaration/objectInheritingFromATrait.kt
index 876f7da..7deb795 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectInheritingFromATrait.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectInheritingFromATrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
interface Foo {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectInheritingFromClass.kt b/js/js.translator/testData/box/objectDeclaration/objectInheritingFromClass.kt
index 4e5f17a..1615348 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectInheritingFromClass.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectInheritingFromClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
abstract class A(val s: String) {
diff --git a/js/js.translator/testData/box/objectDeclaration/objectWithMethods.kt b/js/js.translator/testData/box/objectDeclaration/objectWithMethods.kt
index eaa78c7..347016b 100644
--- a/js/js.translator/testData/box/objectDeclaration/objectWithMethods.kt
+++ b/js/js.translator/testData/box/objectDeclaration/objectWithMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
class Test {
diff --git a/js/js.translator/testData/box/operatorOverloading/augmentedAssignmentLhs.kt b/js/js.translator/testData/box/operatorOverloading/augmentedAssignmentLhs.kt
index f147490..f32f7ba 100644
--- a/js/js.translator/testData/box/operatorOverloading/augmentedAssignmentLhs.kt
+++ b/js/js.translator/testData/box/operatorOverloading/augmentedAssignmentLhs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
object Host {
diff --git a/js/js.translator/testData/box/operatorOverloading/binaryDivOverload.kt b/js/js.translator/testData/box/operatorOverloading/binaryDivOverload.kt
index 08d7c4e..5e81e41 100644
--- a/js/js.translator/testData/box/operatorOverloading/binaryDivOverload.kt
+++ b/js/js.translator/testData/box/operatorOverloading/binaryDivOverload.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/operatorOverloading/compareTo.kt b/js/js.translator/testData/box/operatorOverloading/compareTo.kt
index 8da69b5..5a3e170 100644
--- a/js/js.translator/testData/box/operatorOverloading/compareTo.kt
+++ b/js/js.translator/testData/box/operatorOverloading/compareTo.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
diff --git a/js/js.translator/testData/box/operatorOverloading/compareToByName.kt b/js/js.translator/testData/box/operatorOverloading/compareToByName.kt
index 28702e7..541a316 100644
--- a/js/js.translator/testData/box/operatorOverloading/compareToByName.kt
+++ b/js/js.translator/testData/box/operatorOverloading/compareToByName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
diff --git a/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt b/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt
index 74d1a32..3ad9699 100644
--- a/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt
+++ b/js/js.translator/testData/box/operatorOverloading/lambdaRhs.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 896
+// EXPECTED_REACHABLE_NODES: 1384
package foo
var global = ""
diff --git a/js/js.translator/testData/box/operatorOverloading/notOverload.kt b/js/js.translator/testData/box/operatorOverloading/notOverload.kt
index 7d1fb36..b84892a 100644
--- a/js/js.translator/testData/box/operatorOverloading/notOverload.kt
+++ b/js/js.translator/testData/box/operatorOverloading/notOverload.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/operatorOverloading/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt b/js/js.translator/testData/box/operatorOverloading/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt
index 77c64d9..3bfc036 100644
--- a/js/js.translator/testData/box/operatorOverloading/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt
+++ b/js/js.translator/testData/box/operatorOverloading/operatorOverloadOnPropertyCallGetterAndSetterOnlyOnce.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class MyInt(i: Int) {
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt
index 650ae6b..8fd31b6 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignArrayList.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 892
+// EXPECTED_REACHABLE_NODES: 1380
package foo
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt
index 8e9cafe..40ebb72 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 891
+// EXPECTED_REACHABLE_NODES: 1379
package foo
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaPlusExtensionFunction.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaPlusExtensionFunction.kt
index aa3a05f..7429f83 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaPlusExtensionFunction.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusAssignViaPlusExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
open class Foo<out T>(open val value: T)
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt b/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt
index e8a8b20..8cb7e5f 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadPlusViaExtensionFunction.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 887
+// EXPECTED_REACHABLE_NODES: 1375
package foo
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadUnaryOperationsViaExtensionFunctions.kt b/js/js.translator/testData/box/operatorOverloading/overloadUnaryOperationsViaExtensionFunctions.kt
index e15951c..b90f45b 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadUnaryOperationsViaExtensionFunctions.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadUnaryOperationsViaExtensionFunctions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A(val c: Int) {
diff --git a/js/js.translator/testData/box/operatorOverloading/overloadedCallOnProperty.kt b/js/js.translator/testData/box/operatorOverloading/overloadedCallOnProperty.kt
index dae54d5..caad069 100644
--- a/js/js.translator/testData/box/operatorOverloading/overloadedCallOnProperty.kt
+++ b/js/js.translator/testData/box/operatorOverloading/overloadedCallOnProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
var a = MyInt()
diff --git a/js/js.translator/testData/box/operatorOverloading/plusAndMinusAsAnExpression.kt b/js/js.translator/testData/box/operatorOverloading/plusAndMinusAsAnExpression.kt
index 29d6187..f389ac6 100644
--- a/js/js.translator/testData/box/operatorOverloading/plusAndMinusAsAnExpression.kt
+++ b/js/js.translator/testData/box/operatorOverloading/plusAndMinusAsAnExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1379
package foo
class A() {
diff --git a/js/js.translator/testData/box/operatorOverloading/plusAssignNoReassign.kt b/js/js.translator/testData/box/operatorOverloading/plusAssignNoReassign.kt
index d3321d8..a90508f 100644
--- a/js/js.translator/testData/box/operatorOverloading/plusAssignNoReassign.kt
+++ b/js/js.translator/testData/box/operatorOverloading/plusAssignNoReassign.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/operatorOverloading/plusOverload.kt b/js/js.translator/testData/box/operatorOverloading/plusOverload.kt
index 6164616..fd8595e 100644
--- a/js/js.translator/testData/box/operatorOverloading/plusOverload.kt
+++ b/js/js.translator/testData/box/operatorOverloading/plusOverload.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class myInt(a: Int) {
diff --git a/js/js.translator/testData/box/operatorOverloading/postfixInc.kt b/js/js.translator/testData/box/operatorOverloading/postfixInc.kt
index 024186f..52d472a 100644
--- a/js/js.translator/testData/box/operatorOverloading/postfixInc.kt
+++ b/js/js.translator/testData/box/operatorOverloading/postfixInc.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class MyInt() {
diff --git a/js/js.translator/testData/box/operatorOverloading/postfixOnProperty.kt b/js/js.translator/testData/box/operatorOverloading/postfixOnProperty.kt
index b5a2344..a4482c3 100644
--- a/js/js.translator/testData/box/operatorOverloading/postfixOnProperty.kt
+++ b/js/js.translator/testData/box/operatorOverloading/postfixOnProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
var a = MyInt()
diff --git a/js/js.translator/testData/box/operatorOverloading/prefixDecOverload.kt b/js/js.translator/testData/box/operatorOverloading/prefixDecOverload.kt
index 810798f..0e19bac 100644
--- a/js/js.translator/testData/box/operatorOverloading/prefixDecOverload.kt
+++ b/js/js.translator/testData/box/operatorOverloading/prefixDecOverload.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class MyInt() {
diff --git a/js/js.translator/testData/box/operatorOverloading/prefixIncReturnsCorrectValue.kt b/js/js.translator/testData/box/operatorOverloading/prefixIncReturnsCorrectValue.kt
index a0c6341..8bdbaef 100644
--- a/js/js.translator/testData/box/operatorOverloading/prefixIncReturnsCorrectValue.kt
+++ b/js/js.translator/testData/box/operatorOverloading/prefixIncReturnsCorrectValue.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class MyInt() {
diff --git a/js/js.translator/testData/box/operatorOverloading/unaryOnIntProperty.kt b/js/js.translator/testData/box/operatorOverloading/unaryOnIntProperty.kt
index 8cab91b..0a03a61 100644
--- a/js/js.translator/testData/box/operatorOverloading/unaryOnIntProperty.kt
+++ b/js/js.translator/testData/box/operatorOverloading/unaryOnIntProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class MyInt(i: Int) {
diff --git a/js/js.translator/testData/box/operatorOverloading/unaryOnIntPropertyAsStatement.kt b/js/js.translator/testData/box/operatorOverloading/unaryOnIntPropertyAsStatement.kt
index 7ad8125..2908a43 100644
--- a/js/js.translator/testData/box/operatorOverloading/unaryOnIntPropertyAsStatement.kt
+++ b/js/js.translator/testData/box/operatorOverloading/unaryOnIntPropertyAsStatement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class MyInt(i: Int) {
diff --git a/js/js.translator/testData/box/operatorOverloading/usingModInCaseModAssignNotAvailable.kt b/js/js.translator/testData/box/operatorOverloading/usingModInCaseModAssignNotAvailable.kt
index c385db1..1e87109 100644
--- a/js/js.translator/testData/box/operatorOverloading/usingModInCaseModAssignNotAvailable.kt
+++ b/js/js.translator/testData/box/operatorOverloading/usingModInCaseModAssignNotAvailable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/package/classCreatedInDeeplyNestedPackage.kt b/js/js.translator/testData/box/package/classCreatedInDeeplyNestedPackage.kt
index 677021f..b94cecf 100644
--- a/js/js.translator/testData/box/package/classCreatedInDeeplyNestedPackage.kt
+++ b/js/js.translator/testData/box/package/classCreatedInDeeplyNestedPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo1.foo2.foo3.foo5.foo6.foo7.foo8
fun box() = A().doBox()
diff --git a/js/js.translator/testData/box/package/deeplyNestedPackage.kt b/js/js.translator/testData/box/package/deeplyNestedPackage.kt
index cd1788a..da0845f 100644
--- a/js/js.translator/testData/box/package/deeplyNestedPackage.kt
+++ b/js/js.translator/testData/box/package/deeplyNestedPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo1.foo2.foo3.foo5.foo6.foo7.foo8
fun box() = "OK"
\ No newline at end of file
diff --git a/js/js.translator/testData/box/package/deeplyNestedPackageFunctionCalled.kt b/js/js.translator/testData/box/package/deeplyNestedPackageFunctionCalled.kt
index bfe8104..2c04313 100644
--- a/js/js.translator/testData/box/package/deeplyNestedPackageFunctionCalled.kt
+++ b/js/js.translator/testData/box/package/deeplyNestedPackageFunctionCalled.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo1.foo2.foo3.foo5.foo6.foo7.foo8
fun box() = f()
diff --git a/js/js.translator/testData/box/package/initializersOfNestedPackagesExecute.kt b/js/js.translator/testData/box/package/initializersOfNestedPackagesExecute.kt
index b16e7c5..5d5461a 100644
--- a/js/js.translator/testData/box/package/initializersOfNestedPackagesExecute.kt
+++ b/js/js.translator/testData/box/package/initializersOfNestedPackagesExecute.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo1.foo2.foo3.foo5.foo6.foo7.foo8
val f = "OK"
diff --git a/js/js.translator/testData/box/package/nestedPackage.kt b/js/js.translator/testData/box/package/nestedPackage.kt
index f2f694e..b2dfde1 100644
--- a/js/js.translator/testData/box/package/nestedPackage.kt
+++ b/js/js.translator/testData/box/package/nestedPackage.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo.bar
fun box() = "OK"
\ No newline at end of file
diff --git a/js/js.translator/testData/box/propertyAccess/accessToInstanceProperty.kt b/js/js.translator/testData/box/propertyAccess/accessToInstanceProperty.kt
index f506cf2..9b2d926f 100644
--- a/js/js.translator/testData/box/propertyAccess/accessToInstanceProperty.kt
+++ b/js/js.translator/testData/box/propertyAccess/accessToInstanceProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test() {
diff --git a/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt b/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt
index b71d997..359bc2e 100644
--- a/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt
+++ b/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
class A {
diff --git a/js/js.translator/testData/box/propertyAccess/classUsesPackageProperties.kt b/js/js.translator/testData/box/propertyAccess/classUsesPackageProperties.kt
index d1ebc42..6378618 100644
--- a/js/js.translator/testData/box/propertyAccess/classUsesPackageProperties.kt
+++ b/js/js.translator/testData/box/propertyAccess/classUsesPackageProperties.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
var a = 0
diff --git a/js/js.translator/testData/box/propertyAccess/customGetter.kt b/js/js.translator/testData/box/propertyAccess/customGetter.kt
index 6c3eabb..c9ef72b 100644
--- a/js/js.translator/testData/box/propertyAccess/customGetter.kt
+++ b/js/js.translator/testData/box/propertyAccess/customGetter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class Test() {
diff --git a/js/js.translator/testData/box/propertyAccess/customSetter.kt b/js/js.translator/testData/box/propertyAccess/customSetter.kt
index e5d8c92..f3bf2d5 100644
--- a/js/js.translator/testData/box/propertyAccess/customSetter.kt
+++ b/js/js.translator/testData/box/propertyAccess/customSetter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class Test() {
diff --git a/js/js.translator/testData/box/propertyAccess/defaultAccessorsWithJsName.kt b/js/js.translator/testData/box/propertyAccess/defaultAccessorsWithJsName.kt
index 26acded..5b5e54eaa 100644
--- a/js/js.translator/testData/box/propertyAccess/defaultAccessorsWithJsName.kt
+++ b/js/js.translator/testData/box/propertyAccess/defaultAccessorsWithJsName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class A {
diff --git a/js/js.translator/testData/box/propertyAccess/enumerable.kt b/js/js.translator/testData/box/propertyAccess/enumerable.kt
index a1cebc8..9f153ec 100644
--- a/js/js.translator/testData/box/propertyAccess/enumerable.kt
+++ b/js/js.translator/testData/box/propertyAccess/enumerable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 936
+// EXPECTED_REACHABLE_NODES: 1417
package foo
class P {
diff --git a/js/js.translator/testData/box/propertyAccess/extensionLiteralSafeCall.kt b/js/js.translator/testData/box/propertyAccess/extensionLiteralSafeCall.kt
index 89e43cf..2aad0cb 100644
--- a/js/js.translator/testData/box/propertyAccess/extensionLiteralSafeCall.kt
+++ b/js/js.translator/testData/box/propertyAccess/extensionLiteralSafeCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun f(a: Int?, b: Int.(Int) -> Int) = a?.b(2)
diff --git a/js/js.translator/testData/box/propertyAccess/field.kt b/js/js.translator/testData/box/propertyAccess/field.kt
index 2264f41..3f9ac86 100644
--- a/js/js.translator/testData/box/propertyAccess/field.kt
+++ b/js/js.translator/testData/box/propertyAccess/field.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A {
diff --git a/js/js.translator/testData/box/propertyAccess/initInstanceProperties.kt b/js/js.translator/testData/box/propertyAccess/initInstanceProperties.kt
index 49f3e3b..85cadce 100644
--- a/js/js.translator/testData/box/propertyAccess/initInstanceProperties.kt
+++ b/js/js.translator/testData/box/propertyAccess/initInstanceProperties.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test() {
diff --git a/js/js.translator/testData/box/propertyAccess/initValInConstructor.kt b/js/js.translator/testData/box/propertyAccess/initValInConstructor.kt
index 8f5e7b7..25a96bc 100644
--- a/js/js.translator/testData/box/propertyAccess/initValInConstructor.kt
+++ b/js/js.translator/testData/box/propertyAccess/initValInConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A {
diff --git a/js/js.translator/testData/box/propertyAccess/overloadedOverriddenFunctionPropertyName.kt b/js/js.translator/testData/box/propertyAccess/overloadedOverriddenFunctionPropertyName.kt
index 9bf5a1b..6fc25b0 100644
--- a/js/js.translator/testData/box/propertyAccess/overloadedOverriddenFunctionPropertyName.kt
+++ b/js/js.translator/testData/box/propertyAccess/overloadedOverriddenFunctionPropertyName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
interface I {
diff --git a/js/js.translator/testData/box/propertyAccess/packageCustomAccessors.kt b/js/js.translator/testData/box/propertyAccess/packageCustomAccessors.kt
index 62c5ff7..45b2660 100644
--- a/js/js.translator/testData/box/propertyAccess/packageCustomAccessors.kt
+++ b/js/js.translator/testData/box/propertyAccess/packageCustomAccessors.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
var a: Int
diff --git a/js/js.translator/testData/box/propertyAccess/packagePropertyInitializer.kt b/js/js.translator/testData/box/propertyAccess/packagePropertyInitializer.kt
index 8969696..857209b 100644
--- a/js/js.translator/testData/box/propertyAccess/packagePropertyInitializer.kt
+++ b/js/js.translator/testData/box/propertyAccess/packagePropertyInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
val b = 3
diff --git a/js/js.translator/testData/box/propertyAccess/packagePropertySet.kt b/js/js.translator/testData/box/propertyAccess/packagePropertySet.kt
index 757d702..a059820 100644
--- a/js/js.translator/testData/box/propertyAccess/packagePropertySet.kt
+++ b/js/js.translator/testData/box/propertyAccess/packagePropertySet.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
var b = 3
diff --git a/js/js.translator/testData/box/propertyAccess/privatePropertyAccessFromMethod.kt b/js/js.translator/testData/box/propertyAccess/privatePropertyAccessFromMethod.kt
index e280763..b5f7bc4 100644
--- a/js/js.translator/testData/box/propertyAccess/privatePropertyAccessFromMethod.kt
+++ b/js/js.translator/testData/box/propertyAccess/privatePropertyAccessFromMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// ONLY_THIS_QUALIFIED_REFERENCES: foo_0
package foo
diff --git a/js/js.translator/testData/box/propertyAccess/propertyAssignment.kt b/js/js.translator/testData/box/propertyAccess/propertyAssignment.kt
index 7308ff7..8434307 100644
--- a/js/js.translator/testData/box/propertyAccess/propertyAssignment.kt
+++ b/js/js.translator/testData/box/propertyAccess/propertyAssignment.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// See https://youtrack.jetbrains.com/issue/KT-10785
package foo
diff --git a/js/js.translator/testData/box/propertyAccess/setter.kt b/js/js.translator/testData/box/propertyAccess/setter.kt
index e4bbe0c..febc8ee 100644
--- a/js/js.translator/testData/box/propertyAccess/setter.kt
+++ b/js/js.translator/testData/box/propertyAccess/setter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class Test() {
diff --git a/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt b/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt
index 863da3e..5063913 100644
--- a/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt
+++ b/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
val x: Int
diff --git a/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt b/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt
index c6934d8..b6cc12b 100644
--- a/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt
+++ b/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 512
+// EXPECTED_REACHABLE_NODES: 1399
package foo
open class A {
diff --git a/js/js.translator/testData/box/propertyAccess/twoClassesWithProperties.kt b/js/js.translator/testData/box/propertyAccess/twoClassesWithProperties.kt
index bf5ac2b..1c47bd5 100644
--- a/js/js.translator/testData/box/propertyAccess/twoClassesWithProperties.kt
+++ b/js/js.translator/testData/box/propertyAccess/twoClassesWithProperties.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class A() {
diff --git a/js/js.translator/testData/box/propertyOverride/checkSupertypeOrder.kt b/js/js.translator/testData/box/propertyOverride/checkSupertypeOrder.kt
index ecd58c7..c4deadd 100644
--- a/js/js.translator/testData/box/propertyOverride/checkSupertypeOrder.kt
+++ b/js/js.translator/testData/box/propertyOverride/checkSupertypeOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 515
+// EXPECTED_REACHABLE_NODES: 1402
package foo
interface A {
diff --git a/js/js.translator/testData/box/propertyOverride/initOverrideInConstructor.kt b/js/js.translator/testData/box/propertyOverride/initOverrideInConstructor.kt
index 5baec80..7d943fa 100644
--- a/js/js.translator/testData/box/propertyOverride/initOverrideInConstructor.kt
+++ b/js/js.translator/testData/box/propertyOverride/initOverrideInConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// Test for KT-5673
package foo
diff --git a/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorComplex.kt b/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorComplex.kt
index 2873fc9..8bf4ccb 100644
--- a/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorComplex.kt
+++ b/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorComplex.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
// Test for KT-5673
package foo
diff --git a/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorExplicitThis.kt b/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorExplicitThis.kt
index 43ee55a..a74baa9 100644
--- a/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorExplicitThis.kt
+++ b/js/js.translator/testData/box/propertyOverride/initOverrideInConstructorExplicitThis.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// Test for KT-5673
package foo
diff --git a/js/js.translator/testData/box/propertyOverride/initOverrideVarInConstructor.kt b/js/js.translator/testData/box/propertyOverride/initOverrideVarInConstructor.kt
index 9480be2..c5308c6 100644
--- a/js/js.translator/testData/box/propertyOverride/initOverrideVarInConstructor.kt
+++ b/js/js.translator/testData/box/propertyOverride/initOverrideVarInConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
// Test for KT-5673
package foo
diff --git a/js/js.translator/testData/box/propertyOverride/overloadPrivateVal.kt b/js/js.translator/testData/box/propertyOverride/overloadPrivateVal.kt
index 5add0b8..d142dee 100644
--- a/js/js.translator/testData/box/propertyOverride/overloadPrivateVal.kt
+++ b/js/js.translator/testData/box/propertyOverride/overloadPrivateVal.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
open class A {
diff --git a/js/js.translator/testData/box/propertyOverride/overrideExtensionProperty.kt b/js/js.translator/testData/box/propertyOverride/overrideExtensionProperty.kt
index 5b97ea7..54eb109 100644
--- a/js/js.translator/testData/box/propertyOverride/overrideExtensionProperty.kt
+++ b/js/js.translator/testData/box/propertyOverride/overrideExtensionProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 501
+// EXPECTED_REACHABLE_NODES: 1388
package foo
class T
diff --git a/js/js.translator/testData/box/propertyOverride/overrideNotDirectlySuper.kt b/js/js.translator/testData/box/propertyOverride/overrideNotDirectlySuper.kt
index 2cc28c5..c12b7d2 100644
--- a/js/js.translator/testData/box/propertyOverride/overrideNotDirectlySuper.kt
+++ b/js/js.translator/testData/box/propertyOverride/overrideNotDirectlySuper.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 514
+// EXPECTED_REACHABLE_NODES: 1401
package foo
open class A {
diff --git a/js/js.translator/testData/box/propertyOverride/overrideValFromTraits.kt b/js/js.translator/testData/box/propertyOverride/overrideValFromTraits.kt
index 2096d92..163f270 100644
--- a/js/js.translator/testData/box/propertyOverride/overrideValFromTraits.kt
+++ b/js/js.translator/testData/box/propertyOverride/overrideValFromTraits.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 512
+// EXPECTED_REACHABLE_NODES: 1399
package foo
interface A {
diff --git a/js/js.translator/testData/box/propertyOverride/overrideValWithBackendFiled.kt b/js/js.translator/testData/box/propertyOverride/overrideValWithBackendFiled.kt
index 7a2fc8d..63c8290 100644
--- a/js/js.translator/testData/box/propertyOverride/overrideValWithBackendFiled.kt
+++ b/js/js.translator/testData/box/propertyOverride/overrideValWithBackendFiled.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
open class A {
diff --git a/js/js.translator/testData/box/propertyOverride/simpleOverride.kt b/js/js.translator/testData/box/propertyOverride/simpleOverride.kt
index 10975f1..7e0c27f 100644
--- a/js/js.translator/testData/box/propertyOverride/simpleOverride.kt
+++ b/js/js.translator/testData/box/propertyOverride/simpleOverride.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
open class A {
diff --git a/js/js.translator/testData/box/range/creatingProgressions.kt b/js/js.translator/testData/box/range/creatingProgressions.kt
index e7783ea..8742c63 100644
--- a/js/js.translator/testData/box/range/creatingProgressions.kt
+++ b/js/js.translator/testData/box/range/creatingProgressions.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 522
+// EXPECTED_REACHABLE_NODES: 1401
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/range/explicitRange.kt b/js/js.translator/testData/box/range/explicitRange.kt
index cf24ece..ed8321e 100644
--- a/js/js.translator/testData/box/range/explicitRange.kt
+++ b/js/js.translator/testData/box/range/explicitRange.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/range/intDownTo.kt b/js/js.translator/testData/box/range/intDownTo.kt
index a38ac43..11a6eed 100644
--- a/js/js.translator/testData/box/range/intDownTo.kt
+++ b/js/js.translator/testData/box/range/intDownTo.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 894
+// EXPECTED_REACHABLE_NODES: 1382
package foo
diff --git a/js/js.translator/testData/box/range/intInRange.kt b/js/js.translator/testData/box/range/intInRange.kt
index 72091ba..9f7e58d 100644
--- a/js/js.translator/testData/box/range/intInRange.kt
+++ b/js/js.translator/testData/box/range/intInRange.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/range/intUpTo.kt b/js/js.translator/testData/box/range/intUpTo.kt
index 7743b10..8088f90 100644
--- a/js/js.translator/testData/box/range/intUpTo.kt
+++ b/js/js.translator/testData/box/range/intUpTo.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 886
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/range/iteratingOverRanges.kt b/js/js.translator/testData/box/range/iteratingOverRanges.kt
index 55903a2..de5c532 100644
--- a/js/js.translator/testData/box/range/iteratingOverRanges.kt
+++ b/js/js.translator/testData/box/range/iteratingOverRanges.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/range/rangeEquals.kt b/js/js.translator/testData/box/range/rangeEquals.kt
index 5e69029..1e5da50 100644
--- a/js/js.translator/testData/box/range/rangeEquals.kt
+++ b/js/js.translator/testData/box/range/rangeEquals.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 539
+// EXPECTED_REACHABLE_NODES: 1418
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/range/rangeSugarSyntax.kt b/js/js.translator/testData/box/range/rangeSugarSyntax.kt
index a9c21f1..414b0f4 100644
--- a/js/js.translator/testData/box/range/rangeSugarSyntax.kt
+++ b/js/js.translator/testData/box/range/rangeSugarSyntax.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt b/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt
index 78b3f105e..c246ca3 100644
--- a/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt
+++ b/js/js.translator/testData/box/range/rangeToDoesNotIterate.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/range/reverse.kt b/js/js.translator/testData/box/range/reverse.kt
index 5823413..dd242ed 100644
--- a/js/js.translator/testData/box/range/reverse.kt
+++ b/js/js.translator/testData/box/range/reverse.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 893
+// EXPECTED_REACHABLE_NODES: 1381
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/reflection/external.kt b/js/js.translator/testData/box/reflection/external.kt
index 2e3164f..6797a4a 100644
--- a/js/js.translator/testData/box/reflection/external.kt
+++ b/js/js.translator/testData/box/reflection/external.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
external class A
external object O
diff --git a/js/js.translator/testData/box/reflection/jsClass.kt b/js/js.translator/testData/box/reflection/jsClass.kt
index c32fab7..ae98e62 100644
--- a/js/js.translator/testData/box/reflection/jsClass.kt
+++ b/js/js.translator/testData/box/reflection/jsClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 551
+// EXPECTED_REACHABLE_NODES: 1418
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/reflection/jsClassName.kt b/js/js.translator/testData/box/reflection/jsClassName.kt
index 29d9700..1463053 100644
--- a/js/js.translator/testData/box/reflection/jsClassName.kt
+++ b/js/js.translator/testData/box/reflection/jsClassName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 556
+// EXPECTED_REACHABLE_NODES: 1423
package foo
fun testWithInstance() {
diff --git a/js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt b/js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt
index 709427c..083d2f2 100644
--- a/js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt
+++ b/js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 548
+// EXPECTED_REACHABLE_NODES: 1415
package foo
inline fun <reified T : Any> foo(): JsClass<T> {
diff --git a/js/js.translator/testData/box/reflection/jsClassOnReifiedTypeInLambda.kt b/js/js.translator/testData/box/reflection/jsClassOnReifiedTypeInLambda.kt
index 50e982b..b6fe0aa 100644
--- a/js/js.translator/testData/box/reflection/jsClassOnReifiedTypeInLambda.kt
+++ b/js/js.translator/testData/box/reflection/jsClassOnReifiedTypeInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 550
+// EXPECTED_REACHABLE_NODES: 1417
package foo
inline fun <reified T : Any> foo(): () -> JsClass<T> {
diff --git a/js/js.translator/testData/box/reflection/jsClassSimpleName.kt b/js/js.translator/testData/box/reflection/jsClassSimpleName.kt
index 1171a2b..ad6eebc 100644
--- a/js/js.translator/testData/box/reflection/jsClassSimpleName.kt
+++ b/js/js.translator/testData/box/reflection/jsClassSimpleName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 559
+// EXPECTED_REACHABLE_NODES: 1426
package foo
class undefined
diff --git a/js/js.translator/testData/box/reflection/kClass.kt b/js/js.translator/testData/box/reflection/kClass.kt
index 03b7b3d..15f2180 100644
--- a/js/js.translator/testData/box/reflection/kClass.kt
+++ b/js/js.translator/testData/box/reflection/kClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 552
+// EXPECTED_REACHABLE_NODES: 1419
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/reflection/kClassIsInstance.kt b/js/js.translator/testData/box/reflection/kClassIsInstance.kt
index 0a5aaa3..42226cd 100644
--- a/js/js.translator/testData/box/reflection/kClassIsInstance.kt
+++ b/js/js.translator/testData/box/reflection/kClassIsInstance.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 561
+// EXPECTED_REACHABLE_NODES: 1428
package foo
import kotlin.reflect.KClass
diff --git a/js/js.translator/testData/box/reflection/kClassOnReifiedType.kt b/js/js.translator/testData/box/reflection/kClassOnReifiedType.kt
index eecd35c..29bd586 100644
--- a/js/js.translator/testData/box/reflection/kClassOnReifiedType.kt
+++ b/js/js.translator/testData/box/reflection/kClassOnReifiedType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 549
+// EXPECTED_REACHABLE_NODES: 1416
package foo
import kotlin.reflect.KClass
diff --git a/js/js.translator/testData/box/reflection/kClassOnReifiedTypeInLambda.kt b/js/js.translator/testData/box/reflection/kClassOnReifiedTypeInLambda.kt
index 5bad73f..257c9bb2 100644
--- a/js/js.translator/testData/box/reflection/kClassOnReifiedTypeInLambda.kt
+++ b/js/js.translator/testData/box/reflection/kClassOnReifiedTypeInLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 551
+// EXPECTED_REACHABLE_NODES: 1418
package foo
import kotlin.reflect.KClass
diff --git a/js/js.translator/testData/box/reflection/kClassSimpleName.kt b/js/js.translator/testData/box/reflection/kClassSimpleName.kt
index 5f187b4..2a4b91d 100644
--- a/js/js.translator/testData/box/reflection/kClassSimpleName.kt
+++ b/js/js.translator/testData/box/reflection/kClassSimpleName.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 561
+// EXPECTED_REACHABLE_NODES: 1428
package foo
class undefined
diff --git a/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt b/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt
index 11323b2..cc4a4b0 100644
--- a/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt
+++ b/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 559
+// EXPECTED_REACHABLE_NODES: 1426
package foo
import kotlin.reflect.KClass
diff --git a/js/js.translator/testData/box/reflection/primitives.kt b/js/js.translator/testData/box/reflection/primitives.kt
index 7acd204..4eab3ef 100644
--- a/js/js.translator/testData/box/reflection/primitives.kt
+++ b/js/js.translator/testData/box/reflection/primitives.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
import kotlin.reflect.KClass
fun box(): String {
diff --git a/js/js.translator/testData/box/regression/kt2470.kt b/js/js.translator/testData/box/regression/kt2470.kt
index ef9d6d0..fc168c2 100644
--- a/js/js.translator/testData/box/regression/kt2470.kt
+++ b/js/js.translator/testData/box/regression/kt2470.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1375
// KT-2470 another name mangling bug: kotlin.test.failsWith() gets generated to invalid JS
package foo
diff --git a/js/js.translator/testData/box/regression/tmpInsidePrimaryConstructor.kt b/js/js.translator/testData/box/regression/tmpInsidePrimaryConstructor.kt
index 3fd4851..4a8620e 100644
--- a/js/js.translator/testData/box/regression/tmpInsidePrimaryConstructor.kt
+++ b/js/js.translator/testData/box/regression/tmpInsidePrimaryConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 542
+// EXPECTED_REACHABLE_NODES: 1409
package foo
val x: Int?
diff --git a/js/js.translator/testData/box/reified/callChain.kt b/js/js.translator/testData/box/reified/callChain.kt
index 95b0767..07181a1 100644
--- a/js/js.translator/testData/box/reified/callChain.kt
+++ b/js/js.translator/testData/box/reified/callChain.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_NOT_CALLED: test
diff --git a/js/js.translator/testData/box/reified/extensionFun.kt b/js/js.translator/testData/box/reified/extensionFun.kt
index 7cfaa5d..2e251f4 100644
--- a/js/js.translator/testData/box/reified/extensionFun.kt
+++ b/js/js.translator/testData/box/reified/extensionFun.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1389
package foo
// CHECK_NOT_CALLED: canBeCastedTo
diff --git a/js/js.translator/testData/box/reified/extensionLambda.kt b/js/js.translator/testData/box/reified/extensionLambda.kt
index cf7c5bf..7bb1169 100644
--- a/js/js.translator/testData/box/reified/extensionLambda.kt
+++ b/js/js.translator/testData/box/reified/extensionLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
class A
diff --git a/js/js.translator/testData/box/reified/extensionMethod.kt b/js/js.translator/testData/box/reified/extensionMethod.kt
index 620b3fe..a129742 100644
--- a/js/js.translator/testData/box/reified/extensionMethod.kt
+++ b/js/js.translator/testData/box/reified/extensionMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
// CHECK_NOT_CALLED: test
diff --git a/js/js.translator/testData/box/reified/innerObject.kt b/js/js.translator/testData/box/reified/innerObject.kt
index 40b5597..14b544e 100644
--- a/js/js.translator/testData/box/reified/innerObject.kt
+++ b/js/js.translator/testData/box/reified/innerObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
package foo
// CHECK_NOT_CALLED: typePredicate
diff --git a/js/js.translator/testData/box/reified/isBool.kt b/js/js.translator/testData/box/reified/isBool.kt
index 96e4b99..2687c75 100644
--- a/js/js.translator/testData/box/reified/isBool.kt
+++ b/js/js.translator/testData/box/reified/isBool.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// CHECK_NOT_CALLED: isInstance
diff --git a/js/js.translator/testData/box/reified/isChar.kt b/js/js.translator/testData/box/reified/isChar.kt
index 0512f49..fcf85c1 100644
--- a/js/js.translator/testData/box/reified/isChar.kt
+++ b/js/js.translator/testData/box/reified/isChar.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// CHECK_NOT_CALLED: isInstance
diff --git a/js/js.translator/testData/box/reified/isClass.kt b/js/js.translator/testData/box/reified/isClass.kt
index a609570..36678fd 100644
--- a/js/js.translator/testData/box/reified/isClass.kt
+++ b/js/js.translator/testData/box/reified/isClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1391
package foo
// CHECK_NOT_CALLED: isInstance
diff --git a/js/js.translator/testData/box/reified/isNumber.kt b/js/js.translator/testData/box/reified/isNumber.kt
index 5700704..d16dac0 100644
--- a/js/js.translator/testData/box/reified/isNumber.kt
+++ b/js/js.translator/testData/box/reified/isNumber.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
// CHECK_NOT_CALLED: isInstance
diff --git a/js/js.translator/testData/box/reified/isString.kt b/js/js.translator/testData/box/reified/isString.kt
index f46689b..bfca775 100644
--- a/js/js.translator/testData/box/reified/isString.kt
+++ b/js/js.translator/testData/box/reified/isString.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
// CHECK_NOT_CALLED: isInstance
diff --git a/js/js.translator/testData/box/reified/isTNullable.kt b/js/js.translator/testData/box/reified/isTNullable.kt
index 023fc15..0315223 100644
--- a/js/js.translator/testData/box/reified/isTNullable.kt
+++ b/js/js.translator/testData/box/reified/isTNullable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
// CHECK_NOT_CALLED: isTypeOfOrNull
diff --git a/js/js.translator/testData/box/reified/lambda.kt b/js/js.translator/testData/box/reified/lambda.kt
index 2c8fc8f..8c1e456 100644
--- a/js/js.translator/testData/box/reified/lambda.kt
+++ b/js/js.translator/testData/box/reified/lambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 913
+// EXPECTED_REACHABLE_NODES: 1401
package foo
// CHECK_CALLED: doFilter
diff --git a/js/js.translator/testData/box/reified/lambdaNameClash.kt b/js/js.translator/testData/box/reified/lambdaNameClash.kt
index 26a0c95..8603895 100644
--- a/js/js.translator/testData/box/reified/lambdaNameClash.kt
+++ b/js/js.translator/testData/box/reified/lambdaNameClash.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 499
+// EXPECTED_REACHABLE_NODES: 1386
package foo
// CHECK_CALLED: doRun
diff --git a/js/js.translator/testData/box/reified/method.kt b/js/js.translator/testData/box/reified/method.kt
index 8a948a9..c43e180 100644
--- a/js/js.translator/testData/box/reified/method.kt
+++ b/js/js.translator/testData/box/reified/method.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
// CHECK_NOT_CALLED: test
diff --git a/js/js.translator/testData/box/reified/multipleTypeParameters.kt b/js/js.translator/testData/box/reified/multipleTypeParameters.kt
index 85b7892..01ed879 100644
--- a/js/js.translator/testData/box/reified/multipleTypeParameters.kt
+++ b/js/js.translator/testData/box/reified/multipleTypeParameters.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class X
diff --git a/js/js.translator/testData/box/reified/noValueParameters.kt b/js/js.translator/testData/box/reified/noValueParameters.kt
index c58d038..942fba7 100644
--- a/js/js.translator/testData/box/reified/noValueParameters.kt
+++ b/js/js.translator/testData/box/reified/noValueParameters.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
// CHECK_NOT_CALLED: test
diff --git a/js/js.translator/testData/box/reified/parameterSwap.kt b/js/js.translator/testData/box/reified/parameterSwap.kt
index 4ade7e4..dea2b35 100644
--- a/js/js.translator/testData/box/reified/parameterSwap.kt
+++ b/js/js.translator/testData/box/reified/parameterSwap.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class A
diff --git a/js/js.translator/testData/box/reified/vararg.kt b/js/js.translator/testData/box/reified/vararg.kt
index c65a236..7fef87b 100644
--- a/js/js.translator/testData/box/reified/vararg.kt
+++ b/js/js.translator/testData/box/reified/vararg.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 896
+// EXPECTED_REACHABLE_NODES: 1384
package foo
// CHECK_NOT_CALLED: test
diff --git a/js/js.translator/testData/box/reified/withInlineTurnedOff.kt b/js/js.translator/testData/box/reified/withInlineTurnedOff.kt
index 7c72813..90164d1 100644
--- a/js/js.translator/testData/box/reified/withInlineTurnedOff.kt
+++ b/js/js.translator/testData/box/reified/withInlineTurnedOff.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 498
+// EXPECTED_REACHABLE_NODES: 1385
package foo
// NO_INLINE
diff --git a/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt b/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt
index 82bcbc2..86b9c94 100644
--- a/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt
+++ b/js/js.translator/testData/box/rtti/collectionClassesIsCheck.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1214
+// EXPECTED_REACHABLE_NODES: 1415
// KT-2468 ArrayList<String> is List<String> or HashSet<String> is Set<String> fails in generated JS code
package foo
diff --git a/js/js.translator/testData/box/rtti/exceptionIsInterface.kt b/js/js.translator/testData/box/rtti/exceptionIsInterface.kt
index 18ab241..c369ef2 100644
--- a/js/js.translator/testData/box/rtti/exceptionIsInterface.kt
+++ b/js/js.translator/testData/box/rtti/exceptionIsInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
interface I
class MyException: Exception(), I
diff --git a/js/js.translator/testData/box/rtti/isComparable.kt b/js/js.translator/testData/box/rtti/isComparable.kt
index 62e6b68..28982c6 100644
--- a/js/js.translator/testData/box/rtti/isComparable.kt
+++ b/js/js.translator/testData/box/rtti/isComparable.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1391
package foo
class A : Comparable<A> {
diff --git a/js/js.translator/testData/box/rtti/isJsPrimitiveType.kt b/js/js.translator/testData/box/rtti/isJsPrimitiveType.kt
index 2a6506b..fddaa0f 100644
--- a/js/js.translator/testData/box/rtti/isJsPrimitiveType.kt
+++ b/js/js.translator/testData/box/rtti/isJsPrimitiveType.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 530
+// EXPECTED_REACHABLE_NODES: 1399
package foo
enum class Type {
diff --git a/js/js.translator/testData/box/rtti/isObject.kt b/js/js.translator/testData/box/rtti/isObject.kt
index fe56c69..7fa4ea7 100644
--- a/js/js.translator/testData/box/rtti/isObject.kt
+++ b/js/js.translator/testData/box/rtti/isObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
object Obj
diff --git a/js/js.translator/testData/box/rtti/isReifiedObject.kt b/js/js.translator/testData/box/rtti/isReifiedObject.kt
index 872641ec..fbaea95 100644
--- a/js/js.translator/testData/box/rtti/isReifiedObject.kt
+++ b/js/js.translator/testData/box/rtti/isReifiedObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
// NO_INLINE
package foo
diff --git a/js/js.translator/testData/box/rtti/isSameClass.kt b/js/js.translator/testData/box/rtti/isSameClass.kt
index 7129461..2a5eb8f 100644
--- a/js/js.translator/testData/box/rtti/isSameClass.kt
+++ b/js/js.translator/testData/box/rtti/isSameClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class A() {
diff --git a/js/js.translator/testData/box/rtti/notIsOtherClass.kt b/js/js.translator/testData/box/rtti/notIsOtherClass.kt
index edbbc3a..376f636 100644
--- a/js/js.translator/testData/box/rtti/notIsOtherClass.kt
+++ b/js/js.translator/testData/box/rtti/notIsOtherClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
open class A() {
diff --git a/js/js.translator/testData/box/rtti/objectExpression.kt b/js/js.translator/testData/box/rtti/objectExpression.kt
index 779ddb2..71d0334 100644
--- a/js/js.translator/testData/box/rtti/objectExpression.kt
+++ b/js/js.translator/testData/box/rtti/objectExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 555
+// EXPECTED_REACHABLE_NODES: 1442
package foo
interface A
diff --git a/js/js.translator/testData/box/rtti/onNativeObject.kt b/js/js.translator/testData/box/rtti/onNativeObject.kt
index eafd054..bb44a9dfe 100644
--- a/js/js.translator/testData/box/rtti/onNativeObject.kt
+++ b/js/js.translator/testData/box/rtti/onNativeObject.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1378
package foo
class C
diff --git a/js/js.translator/testData/box/rtti/rttiForClass.kt b/js/js.translator/testData/box/rtti/rttiForClass.kt
index 5f3c8c3..1208da8 100644
--- a/js/js.translator/testData/box/rtti/rttiForClass.kt
+++ b/js/js.translator/testData/box/rtti/rttiForClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1390
package foo
class D
diff --git a/js/js.translator/testData/box/rtti/rttiForTrait.kt b/js/js.translator/testData/box/rtti/rttiForTrait.kt
index 87960da..21b4098 100644
--- a/js/js.translator/testData/box/rtti/rttiForTrait.kt
+++ b/js/js.translator/testData/box/rtti/rttiForTrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1387
package foo
diff --git a/js/js.translator/testData/box/rtti/rttiForTrait2.kt b/js/js.translator/testData/box/rtti/rttiForTrait2.kt
index 6b866c2..6544b17 100644
--- a/js/js.translator/testData/box/rtti/rttiForTrait2.kt
+++ b/js/js.translator/testData/box/rtti/rttiForTrait2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 511
+// EXPECTED_REACHABLE_NODES: 1398
package foo
interface A
diff --git a/js/js.translator/testData/box/rtti/sideEffectMethod.kt b/js/js.translator/testData/box/rtti/sideEffectMethod.kt
index d16d988..5d95115 100644
--- a/js/js.translator/testData/box/rtti/sideEffectMethod.kt
+++ b/js/js.translator/testData/box/rtti/sideEffectMethod.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
var counter = 0
diff --git a/js/js.translator/testData/box/rtti/sideEffectProperty.kt b/js/js.translator/testData/box/rtti/sideEffectProperty.kt
index 43a3e97..41f61d7 100644
--- a/js/js.translator/testData/box/rtti/sideEffectProperty.kt
+++ b/js/js.translator/testData/box/rtti/sideEffectProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 496
+// EXPECTED_REACHABLE_NODES: 1383
package foo
var counter = 0
diff --git a/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt b/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt
index 4cb98b8..e1d7037 100644
--- a/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt
+++ b/js/js.translator/testData/box/rtti/stdlibEmptyListClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 906
+// EXPECTED_REACHABLE_NODES: 1394
// KT-5192 JS compiler fails to generate correct code for List implementation
package foo
diff --git a/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt b/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt
index dd20699..fd126e7 100644
--- a/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt
+++ b/js/js.translator/testData/box/rtti/subclassOfNativeIsInterface.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
external open class A
interface I
diff --git a/js/js.translator/testData/box/safeCall/redundantSafeAccess.kt b/js/js.translator/testData/box/safeCall/redundantSafeAccess.kt
index 246f4a4..981257c 100644
--- a/js/js.translator/testData/box/safeCall/redundantSafeAccess.kt
+++ b/js/js.translator/testData/box/safeCall/redundantSafeAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 500
+// EXPECTED_REACHABLE_NODES: 1382
package foo
class A(val x: String) {
diff --git a/js/js.translator/testData/box/safeCall/safeAccess.kt b/js/js.translator/testData/box/safeCall/safeAccess.kt
index 8716439..6e46bb3 100644
--- a/js/js.translator/testData/box/safeCall/safeAccess.kt
+++ b/js/js.translator/testData/box/safeCall/safeAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A() {
diff --git a/js/js.translator/testData/box/safeCall/safeCall.kt b/js/js.translator/testData/box/safeCall/safeCall.kt
index 516eb5b..cdf19f0 100644
--- a/js/js.translator/testData/box/safeCall/safeCall.kt
+++ b/js/js.translator/testData/box/safeCall/safeCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
class A() {
diff --git a/js/js.translator/testData/box/safeCall/safeCallAndIntrinsic.kt b/js/js.translator/testData/box/safeCall/safeCallAndIntrinsic.kt
index 3849351..6dfc9f1 100644
--- a/js/js.translator/testData/box/safeCall/safeCallAndIntrinsic.kt
+++ b/js/js.translator/testData/box/safeCall/safeCallAndIntrinsic.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
var c1 = 0;
diff --git a/js/js.translator/testData/box/safeCall/safeCallAndSideEffect.kt b/js/js.translator/testData/box/safeCall/safeCallAndSideEffect.kt
index 7ed5145..43b4d4e 100644
--- a/js/js.translator/testData/box/safeCall/safeCallAndSideEffect.kt
+++ b/js/js.translator/testData/box/safeCall/safeCallAndSideEffect.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 506
+// EXPECTED_REACHABLE_NODES: 1393
package foo
var c1 = 0
diff --git a/js/js.translator/testData/box/safeCall/safeCallReturnsNullIfFails.kt b/js/js.translator/testData/box/safeCall/safeCallReturnsNullIfFails.kt
index 8568164..20b2e8d 100644
--- a/js/js.translator/testData/box/safeCall/safeCallReturnsNullIfFails.kt
+++ b/js/js.translator/testData/box/safeCall/safeCallReturnsNullIfFails.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
class A() {
diff --git a/js/js.translator/testData/box/safeCall/safeExtensionFunctionCall.kt b/js/js.translator/testData/box/safeCall/safeExtensionFunctionCall.kt
index 4f5da4a..7433075 100644
--- a/js/js.translator/testData/box/safeCall/safeExtensionFunctionCall.kt
+++ b/js/js.translator/testData/box/safeCall/safeExtensionFunctionCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
class A() {
diff --git a/js/js.translator/testData/box/simple/assign.kt b/js/js.translator/testData/box/simple/assign.kt
index bc860af..40aef23 100644
--- a/js/js.translator/testData/box/simple/assign.kt
+++ b/js/js.translator/testData/box/simple/assign.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun f(): Int {
diff --git a/js/js.translator/testData/box/simple/breakDoWhile.kt b/js/js.translator/testData/box/simple/breakDoWhile.kt
index 359cee4..7ebaba9 100644
--- a/js/js.translator/testData/box/simple/breakDoWhile.kt
+++ b/js/js.translator/testData/box/simple/breakDoWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/breakWhile.kt b/js/js.translator/testData/box/simple/breakWhile.kt
index 86e9e06..3e9f27c 100644
--- a/js/js.translator/testData/box/simple/breakWhile.kt
+++ b/js/js.translator/testData/box/simple/breakWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/classInstantiation.kt b/js/js.translator/testData/box/simple/classInstantiation.kt
index 538a27a..4a468a0 100644
--- a/js/js.translator/testData/box/simple/classInstantiation.kt
+++ b/js/js.translator/testData/box/simple/classInstantiation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test() {
diff --git a/js/js.translator/testData/box/simple/comparison.kt b/js/js.translator/testData/box/simple/comparison.kt
index 0ac93b8..ca3ab00 100644
--- a/js/js.translator/testData/box/simple/comparison.kt
+++ b/js/js.translator/testData/box/simple/comparison.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/complexExpressionAsConstructorParameter.kt b/js/js.translator/testData/box/simple/complexExpressionAsConstructorParameter.kt
index b1fc847..9aaa4a0 100644
--- a/js/js.translator/testData/box/simple/complexExpressionAsConstructorParameter.kt
+++ b/js/js.translator/testData/box/simple/complexExpressionAsConstructorParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test(a: Int, b: Int) {
diff --git a/js/js.translator/testData/box/simple/constructorWithParameter.kt b/js/js.translator/testData/box/simple/constructorWithParameter.kt
index 556229f..9aa18f4 100644
--- a/js/js.translator/testData/box/simple/constructorWithParameter.kt
+++ b/js/js.translator/testData/box/simple/constructorWithParameter.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test(a: Int) {
diff --git a/js/js.translator/testData/box/simple/constructorWithPropertiesAsParameters.kt b/js/js.translator/testData/box/simple/constructorWithPropertiesAsParameters.kt
index 5649e62..ff8a4aa 100644
--- a/js/js.translator/testData/box/simple/constructorWithPropertiesAsParameters.kt
+++ b/js/js.translator/testData/box/simple/constructorWithPropertiesAsParameters.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A(var b: Int, var a: String) {
diff --git a/js/js.translator/testData/box/simple/continueDoWhile.kt b/js/js.translator/testData/box/simple/continueDoWhile.kt
index 25614be..5f6108e 100644
--- a/js/js.translator/testData/box/simple/continueDoWhile.kt
+++ b/js/js.translator/testData/box/simple/continueDoWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/continueWhile.kt b/js/js.translator/testData/box/simple/continueWhile.kt
index ba6dac0..2dd4c68 100644
--- a/js/js.translator/testData/box/simple/continueWhile.kt
+++ b/js/js.translator/testData/box/simple/continueWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/doWhile.kt b/js/js.translator/testData/box/simple/doWhile.kt
index e4757b1..e66f07b 100644
--- a/js/js.translator/testData/box/simple/doWhile.kt
+++ b/js/js.translator/testData/box/simple/doWhile.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/doWhile2.kt b/js/js.translator/testData/box/simple/doWhile2.kt
index 965a82f..06d5413 100644
--- a/js/js.translator/testData/box/simple/doWhile2.kt
+++ b/js/js.translator/testData/box/simple/doWhile2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/elseif.kt b/js/js.translator/testData/box/simple/elseif.kt
index 7518e53..da35a2e0 100644
--- a/js/js.translator/testData/box/simple/elseif.kt
+++ b/js/js.translator/testData/box/simple/elseif.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun bor(): Int {
diff --git a/js/js.translator/testData/box/simple/if.kt b/js/js.translator/testData/box/simple/if.kt
index 38b6064..195d509 100644
--- a/js/js.translator/testData/box/simple/if.kt
+++ b/js/js.translator/testData/box/simple/if.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun bol(): Int {
diff --git a/js/js.translator/testData/box/simple/ifElseAsExpression.kt b/js/js.translator/testData/box/simple/ifElseAsExpression.kt
index b0cd25f..59646ed 100644
--- a/js/js.translator/testData/box/simple/ifElseAsExpression.kt
+++ b/js/js.translator/testData/box/simple/ifElseAsExpression.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/methodDeclarationAndCall.kt b/js/js.translator/testData/box/simple/methodDeclarationAndCall.kt
index ce07322..3e10563 100644
--- a/js/js.translator/testData/box/simple/methodDeclarationAndCall.kt
+++ b/js/js.translator/testData/box/simple/methodDeclarationAndCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 497
+// EXPECTED_REACHABLE_NODES: 1384
package foo
class Test() {
diff --git a/js/js.translator/testData/box/simple/minusAssignOnProperty.kt b/js/js.translator/testData/box/simple/minusAssignOnProperty.kt
index 62ef501c..5d8fcc8 100644
--- a/js/js.translator/testData/box/simple/minusAssignOnProperty.kt
+++ b/js/js.translator/testData/box/simple/minusAssignOnProperty.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 488
+// EXPECTED_REACHABLE_NODES: 1375
package foo
var a = 3
diff --git a/js/js.translator/testData/box/simple/notBoolean.kt b/js/js.translator/testData/box/simple/notBoolean.kt
index 3bd18ab..088cb84 100644
--- a/js/js.translator/testData/box/simple/notBoolean.kt
+++ b/js/js.translator/testData/box/simple/notBoolean.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/plusAssign.kt b/js/js.translator/testData/box/simple/plusAssign.kt
index 38ad05d..15d7071 100644
--- a/js/js.translator/testData/box/simple/plusAssign.kt
+++ b/js/js.translator/testData/box/simple/plusAssign.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
diff --git a/js/js.translator/testData/box/simple/positiveAndNegativeNumbers.kt b/js/js.translator/testData/box/simple/positiveAndNegativeNumbers.kt
index 1df549a..e1c7307 100644
--- a/js/js.translator/testData/box/simple/positiveAndNegativeNumbers.kt
+++ b/js/js.translator/testData/box/simple/positiveAndNegativeNumbers.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/postfixIntOperations.kt b/js/js.translator/testData/box/simple/postfixIntOperations.kt
index 83f3c2e..4cecc4c 100644
--- a/js/js.translator/testData/box/simple/postfixIntOperations.kt
+++ b/js/js.translator/testData/box/simple/postfixIntOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/prefixIntOperations.kt b/js/js.translator/testData/box/simple/prefixIntOperations.kt
index b1f5b86..ed87fa9 100644
--- a/js/js.translator/testData/box/simple/prefixIntOperations.kt
+++ b/js/js.translator/testData/box/simple/prefixIntOperations.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/propertiesAsParametersInitialized.kt b/js/js.translator/testData/box/simple/propertiesAsParametersInitialized.kt
index 4d18f77..7de637b 100644
--- a/js/js.translator/testData/box/simple/propertiesAsParametersInitialized.kt
+++ b/js/js.translator/testData/box/simple/propertiesAsParametersInitialized.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1376
package foo
class A(var b: Int, var a: String) {
diff --git a/js/js.translator/testData/box/simple/propertyAccess.kt b/js/js.translator/testData/box/simple/propertyAccess.kt
index cdbcbbd..2deb37c 100644
--- a/js/js.translator/testData/box/simple/propertyAccess.kt
+++ b/js/js.translator/testData/box/simple/propertyAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test() {
diff --git a/js/js.translator/testData/box/simple/simpleInitializer.kt b/js/js.translator/testData/box/simple/simpleInitializer.kt
index a484ae9..548fff6 100644
--- a/js/js.translator/testData/box/simple/simpleInitializer.kt
+++ b/js/js.translator/testData/box/simple/simpleInitializer.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1380
package foo
class Test() {
diff --git a/js/js.translator/testData/box/simple/while.kt b/js/js.translator/testData/box/simple/while.kt
index 4aeb543..33651c4 100644
--- a/js/js.translator/testData/box/simple/while.kt
+++ b/js/js.translator/testData/box/simple/while.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/simple/while2.kt b/js/js.translator/testData/box/simple/while2.kt
index 08662f3..36d232c 100644
--- a/js/js.translator/testData/box/simple/while2.kt
+++ b/js/js.translator/testData/box/simple/while2.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 487
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/standardClasses/any.kt b/js/js.translator/testData/box/standardClasses/any.kt
index cd228f0..4714908 100644
--- a/js/js.translator/testData/box/standardClasses/any.kt
+++ b/js/js.translator/testData/box/standardClasses/any.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 493
+// EXPECTED_REACHABLE_NODES: 1379
// CHECK_CALLED_IN_SCOPE: function=isType scope=box
package foo
diff --git a/js/js.translator/testData/box/standardClasses/array.kt b/js/js.translator/testData/box/standardClasses/array.kt
index e3fa035..2735e18 100644
--- a/js/js.translator/testData/box/standardClasses/array.kt
+++ b/js/js.translator/testData/box/standardClasses/array.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/standardClasses/arrayAccess.kt b/js/js.translator/testData/box/standardClasses/arrayAccess.kt
index 5e75ed3..b4d2919 100644
--- a/js/js.translator/testData/box/standardClasses/arrayAccess.kt
+++ b/js/js.translator/testData/box/standardClasses/arrayAccess.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 490
+// EXPECTED_REACHABLE_NODES: 1377
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/standardClasses/arrayConstructorsWithLambda.kt b/js/js.translator/testData/box/standardClasses/arrayConstructorsWithLambda.kt
index e4cefdd..7b85721 100644
--- a/js/js.translator/testData/box/standardClasses/arrayConstructorsWithLambda.kt
+++ b/js/js.translator/testData/box/standardClasses/arrayConstructorsWithLambda.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1375
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/standardClasses/arrayFactoryMethods.kt b/js/js.translator/testData/box/standardClasses/arrayFactoryMethods.kt
index 36a1dea..2fbaf17 100644
--- a/js/js.translator/testData/box/standardClasses/arrayFactoryMethods.kt
+++ b/js/js.translator/testData/box/standardClasses/arrayFactoryMethods.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 502
+// EXPECTED_REACHABLE_NODES: 1386
package foo
diff --git a/js/js.translator/testData/box/standardClasses/arrayFunctionConstructor.kt b/js/js.translator/testData/box/standardClasses/arrayFunctionConstructor.kt
index af9b3fdb..e3c123a 100644
--- a/js/js.translator/testData/box/standardClasses/arrayFunctionConstructor.kt
+++ b/js/js.translator/testData/box/standardClasses/arrayFunctionConstructor.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 492
+// EXPECTED_REACHABLE_NODES: 1380
package foo
val f = { i: Int -> i + 1 }
diff --git a/js/js.translator/testData/box/standardClasses/arrayIsFilledWithNulls.kt b/js/js.translator/testData/box/standardClasses/arrayIsFilledWithNulls.kt
index 5c4ade2..5325de0 100644
--- a/js/js.translator/testData/box/standardClasses/arrayIsFilledWithNulls.kt
+++ b/js/js.translator/testData/box/standardClasses/arrayIsFilledWithNulls.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 491
+// EXPECTED_REACHABLE_NODES: 1378
package foo
val a = arrayOfNulls<Int>(3)
diff --git a/js/js.translator/testData/box/standardClasses/arraySize.kt b/js/js.translator/testData/box/standardClasses/arraySize.kt
index c6077e6..fb65cb8 100644
--- a/js/js.translator/testData/box/standardClasses/arraySize.kt
+++ b/js/js.translator/testData/box/standardClasses/arraySize.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 494
+// EXPECTED_REACHABLE_NODES: 1381
package foo
class A() {
diff --git a/js/js.translator/testData/box/standardClasses/arraysIterator.kt b/js/js.translator/testData/box/standardClasses/arraysIterator.kt
index 7680f14..086cafb 100644
--- a/js/js.translator/testData/box/standardClasses/arraysIterator.kt
+++ b/js/js.translator/testData/box/standardClasses/arraysIterator.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 606
+// EXPECTED_REACHABLE_NODES: 1379
package foo
val a1 = Array<Int>(3, { i: Int -> i })
diff --git a/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt b/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt
index 893dc30..42421df 100644
--- a/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt
+++ b/js/js.translator/testData/box/standardClasses/hashMapTypeOfElement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 826
+// EXPECTED_REACHABLE_NODES: 1380
package foo
diff --git a/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt b/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt
index d9538ec..e6a8a82 100644
--- a/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt
+++ b/js/js.translator/testData/box/standardClasses/hashSetTypeOfElement.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 841
+// EXPECTED_REACHABLE_NODES: 1395
package foo
diff --git a/js/js.translator/testData/box/standardClasses/mutableMapRemoveWithCollision.kt b/js/js.translator/testData/box/standardClasses/mutableMapRemoveWithCollision.kt
index db235e5..66be372 100644
--- a/js/js.translator/testData/box/standardClasses/mutableMapRemoveWithCollision.kt
+++ b/js/js.translator/testData/box/standardClasses/mutableMapRemoveWithCollision.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 872
+// EXPECTED_REACHABLE_NODES: 1383
package foo
class A {
diff --git a/js/js.translator/testData/box/standardClasses/stringBuilder.kt b/js/js.translator/testData/box/standardClasses/stringBuilder.kt
index 89142ce..396d232 100644
--- a/js/js.translator/testData/box/standardClasses/stringBuilder.kt
+++ b/js/js.translator/testData/box/standardClasses/stringBuilder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 503
+// EXPECTED_REACHABLE_NODES: 1374
package foo
fun box(): String {
diff --git a/js/js.translator/testData/box/standardClasses/stringPlus.kt b/js/js.translator/testData/box/standardClasses/stringPlus.kt
index e54ec6a..a6fb0fa 100644
--- a/js/js.translator/testData/box/standardClasses/stringPlus.kt
+++ b/js/js.translator/testData/box/standardClasses/stringPlus.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 489
+// EXPECTED_REACHABLE_NODES: 1377
fun box(): String {
var x: String? = foo()
diff --git a/js/js.translator/testData/box/superCall/classSuperCall.kt b/js/js.translator/testData/box/superCall/classSuperCall.kt
index a0c9f65..3896e3a 100644
--- a/js/js.translator/testData/box/superCall/classSuperCall.kt
+++ b/js/js.translator/testData/box/superCall/classSuperCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 509
+// EXPECTED_REACHABLE_NODES: 1396
package foo
open class A(val barVal: Int) {
diff --git a/js/js.translator/testData/box/superCall/nativeSuperClass.kt b/js/js.translator/testData/box/superCall/nativeSuperClass.kt
index e3da965..83b570d 100644
--- a/js/js.translator/testData/box/superCall/nativeSuperClass.kt
+++ b/js/js.translator/testData/box/superCall/nativeSuperClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 895
+// EXPECTED_REACHABLE_NODES: 1383
package foo
diff --git a/js/js.translator/testData/box/superCall/traitSuperCall.kt b/js/js.translator/testData/box/superCall/traitSuperCall.kt
index 43e2d63..825a12f 100644
--- a/js/js.translator/testData/box/superCall/traitSuperCall.kt
+++ b/js/js.translator/testData/box/superCall/traitSuperCall.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
interface A {
diff --git a/js/js.translator/testData/box/trait/checkImplementationCharacteristics.kt b/js/js.translator/testData/box/trait/checkImplementationCharacteristics.kt
index 8b2b1d6..b3b4950 100644
--- a/js/js.translator/testData/box/trait/checkImplementationCharacteristics.kt
+++ b/js/js.translator/testData/box/trait/checkImplementationCharacteristics.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
package foo
public interface A {
diff --git a/js/js.translator/testData/box/trait/classDerivesFromClassAndTrait.kt b/js/js.translator/testData/box/trait/classDerivesFromClassAndTrait.kt
index 291825b..8713fb5 100644
--- a/js/js.translator/testData/box/trait/classDerivesFromClassAndTrait.kt
+++ b/js/js.translator/testData/box/trait/classDerivesFromClassAndTrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
diff --git a/js/js.translator/testData/box/trait/classDerivesFromTraitAndClass.kt b/js/js.translator/testData/box/trait/classDerivesFromTraitAndClass.kt
index 05c262e..5e8ac72 100644
--- a/js/js.translator/testData/box/trait/classDerivesFromTraitAndClass.kt
+++ b/js/js.translator/testData/box/trait/classDerivesFromTraitAndClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 510
+// EXPECTED_REACHABLE_NODES: 1397
package foo
diff --git a/js/js.translator/testData/box/trait/definitionOrder.kt b/js/js.translator/testData/box/trait/definitionOrder.kt
index 18c96ba..0199821 100644
--- a/js/js.translator/testData/box/trait/definitionOrder.kt
+++ b/js/js.translator/testData/box/trait/definitionOrder.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 520
+// EXPECTED_REACHABLE_NODES: 1407
package foo
class C() : B() {
diff --git a/js/js.translator/testData/box/trait/example.kt b/js/js.translator/testData/box/trait/example.kt
index 70e4c33..931d4b1 100644
--- a/js/js.translator/testData/box/trait/example.kt
+++ b/js/js.translator/testData/box/trait/example.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 495
+// EXPECTED_REACHABLE_NODES: 1382
package foo
interface AL {
diff --git a/js/js.translator/testData/box/trait/funDelegation.kt b/js/js.translator/testData/box/trait/funDelegation.kt
index 91011a2..bf87438 100644
--- a/js/js.translator/testData/box/trait/funDelegation.kt
+++ b/js/js.translator/testData/box/trait/funDelegation.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 504
+// EXPECTED_REACHABLE_NODES: 1393
package foo
open class Base() {
diff --git a/js/js.translator/testData/box/trait/traitAddsFunctionsToClass.kt b/js/js.translator/testData/box/trait/traitAddsFunctionsToClass.kt
index d5beab6..372a2d0 100644
--- a/js/js.translator/testData/box/trait/traitAddsFunctionsToClass.kt
+++ b/js/js.translator/testData/box/trait/traitAddsFunctionsToClass.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 505
+// EXPECTED_REACHABLE_NODES: 1392
package foo
interface Test {
diff --git a/js/js.translator/testData/box/trait/traitExtendsTrait.kt b/js/js.translator/testData/box/trait/traitExtendsTrait.kt
index 6b1c922..947e862 100644
--- a/js/js.translator/testData/box/trait/traitExtendsTrait.kt
+++ b/js/js.translator/testData/box/trait/traitExtendsTrait.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 508
+// EXPECTED_REACHABLE_NODES: 1395
package foo
interface Test {
diff --git a/js/js.translator/testData/box/trait/traitExtendsTwoTraits.kt b/js/js.translator/testData/box/trait/traitExtendsTwoTraits.kt
index 0988ba6..4f39609 100644
--- a/js/js.translator/testData/box/trait/traitExtendsTwoTraits.kt
+++ b/js/js.translator/testData/box/trait/traitExtendsTwoTraits.kt
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 514
+// EXPECTED_REACHABLE_NODES: 1401
package foo
interface A {
