review fixes + DCE data update + test (un)muting

2018-08-17 15:58:13 +03:00
parent 2663d9751a
commit a83baee67b
52 changed files with 264 additions and 200 deletions
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1109
+// EXPECTED_REACHABLE_NODES: 1221
 package foo

 import kotlin.reflect.KFunction
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1126
+// EXPECTED_REACHABLE_NODES: 1240
 // This test was adapted from compiler/testData/codegen/box/callableReference/property/.
 package foo

@@ -20,4 +20,4 @@ fun box(): String {

 fun bar(x: Char) = x.equals('Q')

-fun baz(x: Any) = x.equals('Q')
+fun baz(x: Any) = x.equals('Q')
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1121
+// EXPECTED_REACHABLE_NODES: 1234
 // MODULE: lib
 // FILE: lib.kt
 package lib
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1147
+// EXPECTED_REACHABLE_NODES: 1270
 // FILE: classes.kt
 class C : J

@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1119
+// EXPECTED_REACHABLE_NODES: 1237
 package foo

 fun box(): String {
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1117
+// EXPECTED_REACHABLE_NODES: 1231
 package foo

 fun box(): String {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1094
+// EXPECTED_REACHABLE_NODES: 1217
 package foo

 import kotlin.reflect.*
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1113
+// EXPECTED_REACHABLE_NODES: 1226
 package foo

 fun box(): String {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1124
+// EXPECTED_REACHABLE_NODES: 1237
 package foo

 var c: String = "fail3"
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1113
+// EXPECTED_REACHABLE_NODES: 1231
 package foo

 val a1 = arrayOfNulls<Int>(10)
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1115
+// EXPECTED_REACHABLE_NODES: 1230
 package foo

 var global: String = ""
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1113
+// EXPECTED_REACHABLE_NODES: 1226
 package foo

 class Ex1(val s: String) : Exception()
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1232
+// EXPECTED_REACHABLE_NODES: 1356
 package foo


@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1096
+// EXPECTED_REACHABLE_NODES: 1211

 package foo

@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1106
+// EXPECTED_REACHABLE_NODES: 1219
 package foo

 class SimpleEnumerator {
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1110
+// EXPECTED_REACHABLE_NODES: 1230
 // GENERATE_SOURCE_MAPS
 // FILE: Enum.kt

@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1120
+// EXPECTED_REACHABLE_NODES: 1235
 interface I {
    fun foo() = "OK"
 }
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1117
+// EXPECTED_REACHABLE_NODES: 1232
 package foo

 class C: B()
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1112
+// EXPECTED_REACHABLE_NODES: 1224
 package foo

 fun f() {}
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1634
+// EXPECTED_REACHABLE_NODES: 1806
 // See KT-11711
 package foo

@@ -288,4 +288,4 @@ fun htmlNoInline(init: HTML.() -> Unit): HTML {
    val html = HTML()
    html.init()
    return html
-}
+}
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1520
+// EXPECTED_REACHABLE_NODES: 1681
 /*
 * Copy of JVM-backend test
 * Found at: compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1132
+// EXPECTED_REACHABLE_NODES: 1249
 // LANGUAGE_VERSION: 1.2
 // MODULE: lib
 // FILE: lib.kt
@@ -14,4 +14,4 @@ fun box(): String {
    assertEquals(listOf(1, -2, 3, -4), test(listOf(-2, 1, -4, 3)))

    return "OK"
-}
+}
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1178
+// EXPECTED_REACHABLE_NODES: 1297
 import kotlin.test.Test
 import kotlin.test.BeforeTest
 import kotlin.test.AfterTest
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1653
+// EXPECTED_REACHABLE_NODES: 1819
 // MODULE: lib1
 // FILE: lib1.kt
 package lib1
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1638
+// EXPECTED_REACHABLE_NODES: 1805
 // MODULE: lib
 // FILE: lib.kt
 package lib
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1098
+// EXPECTED_REACHABLE_NODES: 1211
 package foo


@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1123
+// EXPECTED_REACHABLE_NODES: 1236
 package foo

 class C(val i: Int) : Comparable<C>, A() {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1227
 package foo

 fun box(): String {
@@ -1,5 +1,5 @@
 // IGNORE_BACKEND: JS_IR
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1230
 package foo

 fun fact(n: Int): Long = if (n == 1) 1L else n * fact(n - 1)
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1112
+// EXPECTED_REACHABLE_NODES: 1228
 package foo

 fun box(): String {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1226
 package foo

 fun box(): String {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1112
+// EXPECTED_REACHABLE_NODES: 1225
 package foo

 fun box(): String {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1099
+// EXPECTED_REACHABLE_NODES: 1221
 external class A

 external object O
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1228
 package foo

 open class Base(val bb: String) {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1230
 package foo

 open class Base {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1230
 package foo

 open class Base(val bs: String) {
@@ -1,4 +1,4 @@
-// EXPECTED_REACHABLE_NODES: 1114
+// EXPECTED_REACHABLE_NODES: 1231
 package foo

 open class Base {