Migrate boxInline tests to new multi-file framework

compiler/testData/codegen/boxInline/reified/capturedLambda.1.kt

@@ -1,8 +0,0 @@
-//NO_CHECK_LAMBDA_INLINING
-import test.*
-
-val x: () -> String = foo<String>()
-
-fun box(): String {
-    return x()
-}

compiler/testData/codegen/boxInline/reified/capturedLambda.2.kt

@@ -1,9 +0,0 @@
-package test
-
-inline fun <reified R> foo() = bar<R>() {"OK"}
-inline fun <reified E> bar(crossinline y: () -> String) = {
-    null is E
-    run(y)
-}
-
-public inline fun <T> call(f: () -> T): T = f()

compiler/testData/codegen/boxInline/reified/capturedLambda.kt

@@ -0,0 +1,22 @@
+// FILE: 1.kt
+
+package test
+
+inline fun <reified R> foo() = bar<R>() {"OK"}
+inline fun <reified E> bar(crossinline y: () -> String) = {
+    null is E
+    run(y)
+}
+
+public inline fun <T> call(f: () -> T): T = f()
+
+// FILE: 2.kt
+
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+val x: () -> String = foo<String>()
+
+fun box(): String {
+    return x()
+}

compiler/testData/codegen/boxInline/reified/capturedLambda2.1.kt

@@ -1,8 +0,0 @@
-//NO_CHECK_LAMBDA_INLINING
-import test.*
-
-inline fun <reified R> foo() = bar<R, String>() {"OK"}
-
-fun box(): String {
-    return foo<String>()()
-}

compiler/testData/codegen/boxInline/reified/capturedLambda2.2.kt

@@ -1,9 +0,0 @@
-package test
-
-inline fun <reified R, T> bar(crossinline tasksFactory: () -> T) = {
-    null is R
-    run(tasksFactory)
-}
-
-public inline fun <T> call(f: () -> T): T = f()
-

compiler/testData/codegen/boxInline/reified/capturedLambda2.kt

@@ -0,0 +1,21 @@
+// FILE: 1.kt
+
+package test
+
+inline fun <reified R, T> bar(crossinline tasksFactory: () -> T) = {
+    null is R
+    run(tasksFactory)
+}
+
+public inline fun <T> call(f: () -> T): T = f()
+
+// FILE: 2.kt
+
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+inline fun <reified R> foo() = bar<R, String>() {"OK"}
+
+fun box(): String {
+    return foo<String>()()
+}

compiler/testData/codegen/boxInline/reified/checkCast/chain.2.kt

@@ -1,10 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo(): T = this as T
-
-inline fun <reified Y> Any?.foo2(): Y? = foo<Y?>()
-
-inline fun <reified Z> Any?.foo3(): Z? = foo2<Z>()

compiler/testData/codegen/boxInline/reified/checkCast/chain.kt

@@ -1,3 +1,18 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo(): T = this as T
+
+inline fun <reified Y> Any?.foo2(): Y? = foo<Y?>()
+
+inline fun <reified Z> Any?.foo3(): Z? = foo2<Z>()
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -33,4 +48,4 @@ inline fun failClassCast(s: () -> Unit) {
     catch (e: ClassCastException) {
 
     }
-}
+}

compiler/testData/codegen/boxInline/reified/checkCast/kt8043.2.kt

@@ -1,3 +0,0 @@
-package test
-
-inline fun <reified T, reified R>T.castTo(): R = this as R

compiler/testData/codegen/boxInline/reified/checkCast/kt8043.kt

@@ -1,3 +1,11 @@
+// FILE: 1.kt
+
+package test
+
+inline fun <reified T, reified R>T.castTo(): R = this as R
+
+// FILE: 2.kt
+
 import test.*
 
 fun case1(): Int =
@@ -15,4 +23,4 @@ inline fun failTypeCast(s: () -> Unit) {
     catch (e: TypeCastException) {
 
     }
-}
+}

compiler/testData/codegen/boxInline/reified/checkCast/maxStack.1.kt

@@ -1,10 +0,0 @@
-import test.*
-
-
-
-fun box(): String {
-    val a = A()
-    if (a.foo<Any>() != a) return "failTypeCast 5"
-
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/checkCast/maxStack.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 class A
@@ -11,3 +13,15 @@ inline fun <reified T: Any> Any?.foo(): T {
     return this as T
 }
 
+// FILE: 2.kt
+
+import test.*
+
+
+
+fun box(): String {
+    val a = A()
+    if (a.foo<Any>() != a) return "failTypeCast 5"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/checkCast/nullable.2.kt

@@ -1,6 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo(): T? = this as T?

compiler/testData/codegen/boxInline/reified/checkCast/nullable.kt

@@ -1,3 +1,14 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo(): T? = this as T?
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -42,4 +53,4 @@ inline fun failClassCast(s: () -> Unit) {
     catch (e: ClassCastException) {
 
     }
-}
+}

compiler/testData/codegen/boxInline/reified/checkCast/simple.2.kt

@@ -1,6 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo(): T = this as T

compiler/testData/codegen/boxInline/reified/checkCast/simple.kt

@@ -1,3 +1,14 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo(): T = this as T
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -42,4 +53,4 @@ inline fun failClassCast(s: () -> Unit) {
     catch (e: ClassCastException) {
 
     }
-}
+}

compiler/testData/codegen/boxInline/reified/checkCast/simpleSafe.2.kt

@@ -1,6 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo(): T? = this as? T

compiler/testData/codegen/boxInline/reified/checkCast/simpleSafe.kt

@@ -1,3 +1,14 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo(): T? = this as? T
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -42,4 +53,4 @@ inline fun failClassCast(s: () -> Unit) {
     catch (e: ClassCastException) {
 
     }
-}
+}

compiler/testData/codegen/boxInline/reified/isCheck/chain.2.kt

@@ -1,10 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo() = this is T
-
-inline fun <reified Y> Any?.foo2() = foo<Y?>()
-
-inline fun <reified Z> Any?.foo3() = foo2<Z>()

compiler/testData/codegen/boxInline/reified/isCheck/chain.kt

@@ -1,3 +1,18 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo() = this is T
+
+inline fun <reified Y> Any?.foo2() = foo<Y?>()
+
+inline fun <reified Z> Any?.foo3() = foo2<Z>()
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -21,4 +36,4 @@ fun box(): String {
     if (b.foo3<A?>() != false) return "fail 10"
 
     return "OK"
-}
+}

compiler/testData/codegen/boxInline/reified/isCheck/nullable.2.kt

@@ -1,6 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo() = this is T?

compiler/testData/codegen/boxInline/reified/isCheck/nullable.kt

@@ -1,3 +1,14 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo() = this is T?
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -21,4 +32,4 @@ fun box(): String {
     if (b.foo<A?>() != false) return "fail 10"
 
     return "OK"
-}
+}

compiler/testData/codegen/boxInline/reified/isCheck/simple.2.kt

@@ -1,6 +0,0 @@
-package test
-
-class A
-class B
-
-inline fun <reified T> Any?.foo() = this is T

compiler/testData/codegen/boxInline/reified/isCheck/simple.kt

@@ -1,3 +1,14 @@
+// FILE: 1.kt
+
+package test
+
+class A
+class B
+
+inline fun <reified T> Any?.foo() = this is T
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {
@@ -21,4 +32,4 @@ fun box(): String {
     if (b.foo<A?>() != false) return "fail 10"
 
     return "OK"
-}
+}

compiler/testData/codegen/boxInline/reified/kt11081.2.kt

@@ -1,21 +0,0 @@
-package test
-
-open class TypeRef<T> {
-    val type = target()
-
-    private fun target(): String {
-        val thisClass = this.javaClass
-        val superClass = thisClass.genericSuperclass
-
-        return superClass.toString()
-    }
-}
-
-
-
-inline fun <reified T> typeWithMessage(message: String = "Hello"): String {
-    val type = object : TypeRef<T>() {}
-    val target = type.type
-
-    return message + " " + target
-}

compiler/testData/codegen/boxInline/reified/kt11081.kt

@@ -1,3 +1,29 @@
+// FILE: 1.kt
+
+package test
+
+open class TypeRef<T> {
+    val type = target()
+
+    private fun target(): String {
+        val thisClass = this.javaClass
+        val superClass = thisClass.genericSuperclass
+
+        return superClass.toString()
+    }
+}
+
+
+
+inline fun <reified T> typeWithMessage(message: String = "Hello"): String {
+    val type = object : TypeRef<T>() {}
+    val target = type.type
+
+    return message + " " + target
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun specifyOptionalArgument() = typeWithMessage<List<Int>>("Hello")
@@ -14,4 +40,4 @@ fun box(): String {
     if (type != " test.TypeRef<java.util.List<? extends java.lang.Integer>>") return "fail 2: $type"
 
     return "OK"
-}
+}

compiler/testData/codegen/boxInline/reified/kt6988.1.kt

@@ -1,10 +0,0 @@
-import test.*
-
-public class A()
-
-fun box(): String {
-    val s = "yo".inlineMeIfYouCan<A>()().call()
-    if (s !is A) return "fail"
-
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/kt6988.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 interface Call<T> {
@@ -8,4 +10,17 @@ public inline fun <reified T: Any> Any.inlineMeIfYouCan() : () -> Call<T> = {
     object : Call<T> {
         override fun call() = T::class.java.newInstance()
     }
-}
+}
+
+// FILE: 2.kt
+
+import test.*
+
+public class A()
+
+fun box(): String {
+    val s = "yo".inlineMeIfYouCan<A>()().call()
+    if (s !is A) return "fail"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/kt6988_2.1.kt

@@ -1,6 +0,0 @@
-import test.*
-
-fun box(): String {
-    "yo".inlineMeIfYouCan<StringBuilder>()().run()
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/kt6988_2.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 
@@ -7,4 +9,13 @@ public inline fun <reified T: Any> Any.inlineMeIfYouCan() : () -> Runnable = {
             T::class.java.newInstance()
         }
     }
-}
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    "yo".inlineMeIfYouCan<StringBuilder>()().run()
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/kt6990.1.kt

@@ -1,7 +0,0 @@
-import test.*
-
-class OK
-
-fun box(): String {
-    return inlineMeIfYouCan<OK>()!!
-}

compiler/testData/codegen/boxInline/reified/kt6990.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 public inline fun <reified T : Any> inlineMeIfYouCan(): String? =
@@ -7,4 +9,14 @@ public inline fun <reified T : Any> inlineMeIfYouCan(): String? =
             }
         }()
 
-inline fun f(x: () -> String) = x()
+inline fun f(x: () -> String) = x()
+
+// FILE: 2.kt
+
+import test.*
+
+class OK
+
+fun box(): String {
+    return inlineMeIfYouCan<OK>()!!
+}

compiler/testData/codegen/boxInline/reified/kt7017.1.kt

@@ -1,9 +0,0 @@
-import test.*
-
-fun box(): String {
-    if (!test<String>("OK")) return "fail 1"
-
-    if (test<Int>("OK")) return "fail 2"
-
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/kt7017.2.kt

@@ -1,9 +0,0 @@
-package test
-
-inline fun <reified T> test(x: Any): Boolean {
-    val x = object {
-        val y = x is T
-    }
-
-    return x.y
-}

compiler/testData/codegen/boxInline/reified/kt7017.kt

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+package test
+
+inline fun <reified T> test(x: Any): Boolean {
+    val x = object {
+        val y = x is T
+    }
+
+    return x.y
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    if (!test<String>("OK")) return "fail 1"
+
+    if (test<Int>("OK")) return "fail 2"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/kt8047.1.kt

@@ -1,6 +0,0 @@
-import test.*
-
-fun box(): String {
-    f<String>() {}
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/kt8047.2.kt

@@ -1,5 +0,0 @@
-package test
-
-inline fun <reified T> f(x : () -> Unit) {
-    object { init { arrayOf<T>() } }
-}

compiler/testData/codegen/boxInline/reified/kt8047.kt

@@ -0,0 +1,16 @@
+// FILE: 1.kt
+
+package test
+
+inline fun <reified T> f(x : () -> Unit) {
+    object { init { arrayOf<T>() } }
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    f<String>() {}
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/kt9637.1.kt

@@ -1,15 +0,0 @@
-//NO_CHECK_LAMBDA_INLINING
-import test.*
-
-class Boxer {
-    val box: () -> Box by injectFnc()
-}
-
-fun box(): String {
-    val box = Box()
-    registerFnc { box }
-    val prop = Boxer().box
-    if (prop() != box) return "fail 1"
-
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/kt9637.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 import java.util.*
@@ -13,4 +15,22 @@ inline fun <reified T : Any> registerFnc(noinline value: Function0<T>) {
     valuesInjectFnc[T::class] = value
 }
 
-public class Box
+public class Box
+
+// FILE: 2.kt
+
+//NO_CHECK_LAMBDA_INLINING
+import test.*
+
+class Boxer {
+    val box: () -> Box by injectFnc()
+}
+
+fun box(): String {
+    val box = Box()
+    registerFnc { box }
+    val prop = Boxer().box
+    if (prop() != box) return "fail 1"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/kt9637_2.1.kt

@@ -1,8 +0,0 @@
-import test.*
-
-fun box(): String {
-    val boxClass = injectFnc<Box>()
-    if (boxClass != Box::class) return "fail 1"
-
-    return "OK"
-}

compiler/testData/codegen/boxInline/reified/kt9637_2.2.kt

@@ -1,10 +0,0 @@
-package test
-
-import kotlin.reflect.KClass
-
-inline fun <reified T : Any> injectFnc(): KClass<T> = {
-    T::class
-} ()
-
-public class Box
-

compiler/testData/codegen/boxInline/reified/kt9637_2.kt

@@ -0,0 +1,22 @@
+// FILE: 1.kt
+
+package test
+
+import kotlin.reflect.KClass
+
+inline fun <reified T : Any> injectFnc(): KClass<T> = {
+    T::class
+} ()
+
+public class Box
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    val boxClass = injectFnc<Box>()
+    if (boxClass != Box::class) return "fail 1"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/reified/packages.2.kt

@@ -1,19 +0,0 @@
-package test
-
-public abstract class A<T>
-
-inline fun <reified T> foo1(): A<T> {
-    return object : A<T>() {
-
-    }
-}
-
-fun<T> bar(x: T, block: (T) -> Boolean): Boolean = block(x)
-
-inline fun <reified T> foo2(x: Any): Boolean {
-    return bar(x) { it is T }
-}
-
-inline fun <reified T> foo3(x: Any, y: Any): Boolean {
-    return bar(x) { it is T && y is T }
-}

compiler/testData/codegen/boxInline/reified/packages.kt

@@ -1,3 +1,27 @@
+// FILE: 1.kt
+
+package test
+
+public abstract class A<T>
+
+inline fun <reified T> foo1(): A<T> {
+    return object : A<T>() {
+
+    }
+}
+
+fun<T> bar(x: T, block: (T) -> Boolean): Boolean = block(x)
+
+inline fun <reified T> foo2(x: Any): Boolean {
+    return bar(x) { it is T }
+}
+
+inline fun <reified T> foo3(x: Any, y: Any): Boolean {
+    return bar(x) { it is T && y is T }
+}
+
+// FILE: 2.kt
+
 //NO_CHECK_LAMBDA_INLINING
 import test.*