Inline test data structure changed

compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt

@@ -0,0 +1,53 @@
+fun test1() : Int {
+    val inlineX = My(111)
+    var result = 0
+    val res = inlineX.perform<My, Int>{
+
+        try {
+            throw RuntimeException()
+        } catch (e: RuntimeException) {
+            result = -1
+        }
+        result
+    }
+
+    return result
+}
+
+fun test11() : Int {
+    val inlineX = My(111)
+    val res = inlineX.perform<My, Int>{
+        try {
+            throw RuntimeException()
+        } catch (e: RuntimeException) {
+            -1
+        }
+    }
+
+    return res
+}
+
+fun test2() : Int {
+    try {
+        val inlineX = My(111)
+        var result = 0
+        val res = inlineX.perform<My, Int>{
+            try {
+                throw RuntimeException("-1")
+            } catch (e: RuntimeException) {
+                throw RuntimeException("-2")
+            }
+        }
+        return result
+    } catch (e: RuntimeException) {
+        return e.getMessage()!!.toInt2()!!
+    }
+}
+
+fun box(): String {
+    if (test1() != -1) return "test1: ${test1()}"
+    if (test11() != -1) return "test11: ${test11()}"
+    if (test2() != -2) return "test2: ${test2()}"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.2.kt

@@ -0,0 +1,7 @@
+class My(val value: Int)
+
+inline fun <T, R> T.perform(job: (T)-> R) : R {
+    return job(this)
+}
+
+public inline fun String.toInt2() : Int = java.lang.Integer.parseInt(this)

compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt

@@ -0,0 +1,107 @@
+fun test1(): Int {
+    val res = My(111).performWithFail<My, Int>(
+            {
+                throw RuntimeException()
+            }, {
+                it.value
+            })
+    return res
+}
+
+fun test11(): Int {
+    val res = My(111).performWithFail2<My, Int>(
+            {
+                try {
+                    throw RuntimeException("1")
+                } catch (e: RuntimeException) {
+                    throw RuntimeException("2")
+                }
+            },
+            {(ex, thizz) ->
+                if (ex.getMessage() == "2") {
+                    thizz.value
+                } else {
+                    -11111
+                }
+            })
+    return res
+}
+
+fun test2(): Int {
+    val res = My(111).performWithFail<My, Int>(
+            {
+                it.value
+            },
+            {
+                it.value + 1
+            })
+    return res
+}
+
+fun test22(): Int {
+    val res = My(111).performWithFail2<My, Int>(
+            {
+                try {
+                    throw RuntimeException("1")
+                } catch (e: RuntimeException) {
+                    it.value
+                    111
+                }
+            },
+            {(ex, thizz) ->
+                -11111
+            })
+
+    return res
+}
+
+
+fun test3(): Int {
+    try {
+        val res = My(111).performWithFail<My, Int>(
+                {
+                    throw RuntimeException("-1")
+                }, {
+                    throw RuntimeException("-2")
+                })
+        return res
+    } catch (e: RuntimeException) {
+        return e.getMessage()?.toInt2()!!
+    }
+}
+
+fun test33(): Int {
+    try {
+        val res = My(111).performWithFail2<My, Int>(
+                {
+                    try {
+                        throw RuntimeException("-1")
+                    } catch (e: RuntimeException) {
+                        throw RuntimeException("-2")
+                    }
+                },
+                {(ex, thizz) ->
+                    if (ex.getMessage() == "-2") {
+                        throw RuntimeException("-3")
+                    } else {
+                        -11111
+                    }
+                })
+        return res
+    } catch (e: RuntimeException) {
+        return e.getMessage()!!.toInt2()!!
+    }
+}
+
+fun box(): String {
+    if (test1() != 111) return "test1: ${test1()}"
+    if (test11() != 111) return "test11: ${test11()}"
+
+    if (test2() != 111) return "test2: ${test2()}"
+    if (test22() != 111) return "test22: ${test22()}"
+
+    if (test3() != -2) return "test3: ${test3()}"
+    if (test33() != -3) return "test33: ${test33()}"
+
+    return "OK"
+}

compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.2.kt

@@ -0,0 +1,19 @@
+class My(val value: Int)
+
+inline fun <T, R> T.performWithFail(job: (T)-> R, failJob : (T) -> R) : R {
+    try {
+        return job(this)
+    } catch (e: RuntimeException) {
+        return failJob(this)
+    }
+}
+
+inline fun <T, R> T.performWithFail2(job: (T)-> R, failJob : (e: RuntimeException, T) -> R) : R {
+    try {
+        return job(this)
+    } catch (e: RuntimeException) {
+        return failJob(e, this)
+    }
+}
+
+public inline fun String.toInt2() : Int = java.lang.Integer.parseInt(this)