From 0ebfba7a1a02a135708020729e5f9e7fd7590ec3 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 15 Jul 2016 21:44:47 +0300 Subject: [PATCH] Test data: do not use exceptions from java.lang, as they are not available in JS --- .../tryFinally/chained/intReturn.kt | 2 +- .../tryFinally/chained/intReturnComplex.kt | 2 +- .../tryFinally/chained/intReturnComplex2.kt | 2 +- .../tryFinally/chained/intReturnComplex3.kt | 2 +- .../tryFinally/chained/intReturnComplex4.kt | 2 +- .../tryFinally/declSite/intReturn.kt | 6 +++--- .../tryFinally/declSite/intReturnComplex.kt | 6 +++--- .../tryFinally/declSite/longReturn.kt | 6 +++--- .../exceptionTable/innerAndExternal.kt | 12 +++++------ .../exceptionTable/innerAndExternalNested.kt | 4 ++-- .../exceptionTable/innerAndExternalSimple.kt | 4 ++-- .../tryFinally/exceptionTable/nested.kt | 4 ++-- .../exceptionTable/nestedWithReturns.kt | 4 ++-- .../exceptionTable/nestedWithReturnsSimple.kt | 4 ++-- .../tryFinally/exceptionTable/noFinally.kt | 8 ++++---- .../exceptionTable/severalCatchClause.kt | 14 ++++++------- .../tryFinally/exceptionTable/simpleThrow.kt | 14 ++++++------- .../exceptionTable/throwInFinally.kt | 20 +++++++++---------- .../exceptionTable/tryCatchInFinally.kt | 4 ++-- 19 files changed, 60 insertions(+), 60 deletions(-) diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.kt index da5a3862593..a57aa8087e6 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.kt @@ -43,7 +43,7 @@ fun test0(h: Holder, throwException: Boolean): Int { { h.value += "OK_NONLOCAL" if (throwException) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.kt index b5a951b4d7e..7baefdcce3b 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.kt @@ -47,7 +47,7 @@ fun test0(h: Holder, throwException: Boolean): Int { { h.value += "OK_NONLOCAL" if (throwException) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.kt index a096b325ae6..5f930d23e92 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.kt @@ -55,7 +55,7 @@ fun test0(h: Holder, throwException: Boolean): Int { { h.value += "OK_NONLOCAL" if (throwException) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.kt index 06fd93766a4..90cfc9e8785 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.kt @@ -55,7 +55,7 @@ fun test0(h: Holder, throwException: Boolean): Int { { h.value += "OK_NONLOCAL" if (throwException) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.kt index 1cc102a0016..3b507b537bd 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.kt @@ -59,7 +59,7 @@ fun test0(h: Holder, throwException: Boolean): Int { { h.value += "OK_NONLOCAL" if (throwException) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.kt index a5c435e10ed..08e00e74ef2 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.kt @@ -37,7 +37,7 @@ fun test0(h: Holder): Int { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, @@ -94,7 +94,7 @@ fun test3(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return "OK_NONLOCAL" }, @@ -115,7 +115,7 @@ fun test4(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.kt index 51a90e3d0ed..4392856e92c 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.kt @@ -51,7 +51,7 @@ fun test0(h: Holder): Int { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1 }, @@ -108,7 +108,7 @@ fun test3(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return "OK_NONLOCAL" }, @@ -129,7 +129,7 @@ fun test4(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.kt index 7fbbf458fae..eabc5ffccfc 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.kt @@ -37,7 +37,7 @@ fun test0(h: Holder): Long { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return 1.toLong() }, @@ -94,7 +94,7 @@ fun test3(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return "OK_NONLOCAL" }, @@ -115,7 +115,7 @@ fun test4(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.kt index ad6cdb1c095..1458ab657d3 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.kt @@ -2,9 +2,9 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, exception: (e: Exception)-> Unit, exception2: (e: Exception)-> Unit, finallyBlock: ()-> String, res: String = "Fail") : String { try { @@ -27,7 +27,7 @@ public inline fun doCall2(block: ()-> R, exception: (e: Exception)-> Unit, f } finally { finallyBlock() } - throw java.lang.RuntimeException("fail") + throw RuntimeException("fail") } // FILE: 2.kt @@ -56,7 +56,7 @@ fun test0(h: Holder): String { { try { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" } finally { h.value += ", OK_FINALLY_INNER" @@ -95,7 +95,7 @@ fun test01(h: Holder): String { { try { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") } catch(e: RuntimeException) { h.value += ", OK_CATCHED" } finally { @@ -125,7 +125,7 @@ fun test02(h: Holder): String { { try { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") } catch(e: RuntimeException) { h.value += ", OK_CATCHED" } finally { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.kt index 68d05731888..e97c1169949 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.kt @@ -2,9 +2,9 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, exception1: (e: Exception)-> Unit, exception2: (e: Exception)-> Unit, finallyBlock: ()-> String, exception3: (e: Exception)-> Unit, exception4: (e: Exception)-> Unit, finallyBlock2: ()-> String, res: String = "Fail") : String { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.kt index c6648516fa1..61ba24ab136 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.kt @@ -2,7 +2,7 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, exception: (e: Exception)-> Unit, finallyBlock: ()-> String, res: String = "Fail") : String { try { @@ -37,7 +37,7 @@ fun test01(h: Holder): String { { try { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") } catch(e: RuntimeException) { h.value += ", OK_CATCHED" } diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.kt index e16dbe80d72..e6278519e69 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.kt @@ -2,9 +2,9 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, exception1: (e: Exception)-> Unit, exception2: (e: Exception)-> Unit, finallyBlock: ()-> String, exception3: (e: Exception)-> Unit, exception4: (e: Exception)-> Unit, finallyBlock2: ()-> String, res: String = "Fail") : String { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.kt index cf3bd8a595b..6539f8bc4bc 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.kt @@ -2,9 +2,9 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, exception1: (e: Exception)-> Unit, finallyBlock: ()-> String, exception3: (e: Exception)-> Unit, finallyBlock2: ()-> String, res: String = "Fail") : String { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.kt index dfc4e9a3475..91cf72d4f98 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.kt @@ -2,9 +2,9 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, finallyBlock: ()-> String, finallyBlock2: ()-> String, res: String = "Fail") : String { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.kt index 692038efb6c..81b70d478dd 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.kt @@ -38,7 +38,7 @@ fun test3(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return "OK_NONLOCAL" }, @@ -55,7 +55,7 @@ fun test4(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" @@ -74,7 +74,7 @@ fun test5(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" @@ -82,7 +82,7 @@ fun test5(h: Holder): String { { h.value += ", OK_EXCEPTION" if (true) { - throw java.lang.RuntimeException("EXCEPTION") + throw RuntimeException("EXCEPTION") } h.value += "fail" diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.kt index 6f62c9c06b9..ab9be4bd138 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.kt @@ -2,9 +2,9 @@ package test -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, exception: (e: Exception)-> Unit, exception2: (e: Exception)-> Unit, finallyBlock: ()-> String, res: String = "Fail") : String { try { @@ -27,7 +27,7 @@ public inline fun doCall2(block: ()-> R, exception: (e: Exception)-> Unit, f } finally { finallyBlock() } - throw java.lang.RuntimeException("fail") + throw RuntimeException("fail") } // FILE: 2.kt @@ -55,7 +55,7 @@ fun test0(h: Holder): String { }, { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" }) @@ -137,7 +137,7 @@ fun test1(h: Holder): String { }, { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" }, "Fail") } @@ -201,7 +201,7 @@ fun test3(h: Holder): String { }, { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" }, "Fail") } @@ -257,7 +257,7 @@ fun test5(h: Holder): String { }, { h.value += ", OK_EXCEPTION" - throw java.lang.RuntimeException("FAIL_EX") + throw RuntimeException("FAIL_EX") "OK_EXCEPTION" }, { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.kt index 3f5ff6a3b80..c0c910216b8 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.kt @@ -43,7 +43,7 @@ fun test1(h: Holder): String { val localResult = doCall ( { h.value += "OK_LOCAL" - throw java.lang.RuntimeException() + throw RuntimeException() "OK_LOCAL" }, { @@ -81,7 +81,7 @@ fun test3(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } return "OK_NONLOCAL" }, @@ -102,7 +102,7 @@ fun test4(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" @@ -124,7 +124,7 @@ fun test5(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" @@ -132,7 +132,7 @@ fun test5(h: Holder): String { { h.value += ", OK_EXCEPTION" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" @@ -153,7 +153,7 @@ fun test6(h: Holder): String { { h.value += "OK_NONLOCAL" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" return "OK_NONLOCAL" @@ -161,7 +161,7 @@ fun test6(h: Holder): String { { h.value += ", OK_EXCEPTION" if (true) { - throw java.lang.RuntimeException() + throw RuntimeException() } h.value += "fail" diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.kt index db3823b522c..5ec79bdf657 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.kt @@ -20,7 +20,7 @@ public inline fun doCall2(block: ()-> R, exception: (e: Exception)-> Unit, f } finally { finallyBlock() } - throw java.lang.RuntimeException("fail") + throw RuntimeException("fail") } // FILE: 2.kt @@ -44,7 +44,7 @@ fun test0(h: Holder): String { }, { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" }) @@ -65,7 +65,7 @@ fun test1(h: Holder): String { val localResult = doCall ( { h.value += "OK_LOCAL" - throw java.lang.RuntimeException("FAIL") + throw RuntimeException("FAIL") "OK_LOCAL" }, { @@ -74,7 +74,7 @@ fun test1(h: Holder): String { }, { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" }) } catch (e: RuntimeException) { @@ -93,7 +93,7 @@ fun test2(h: Holder): String { val localResult = doCall ( { h.value += "OK_LOCAL" - throw java.lang.RuntimeException() + throw RuntimeException() "OK_LOCAL" }, { @@ -113,17 +113,17 @@ fun test3(h: Holder): String { val localResult = doCall ( { h.value += "OK_LOCAL" - throw java.lang.RuntimeException("FAIL") + throw RuntimeException("FAIL") "OK_LOCAL" }, { h.value += ", OK_EXCEPTION" - throw java.lang.RuntimeException("FAIL_EX") + throw RuntimeException("FAIL_EX") "OK_EXCEPTION" }, { h.value += ", OK_FINALLY" - throw java.lang.RuntimeException("FINALLY") + throw RuntimeException("FINALLY") "OK_FINALLY" }) } catch (e: RuntimeException) { @@ -142,12 +142,12 @@ fun test4(h: Holder): String { val localResult = doCall2 ( { h.value += "OK_LOCAL" - throw java.lang.RuntimeException("FAIL") + throw RuntimeException("FAIL") "OK_LOCAL" }, { h.value += ", OK_EXCEPTION" - throw java.lang.RuntimeException("EXCEPTION") + throw RuntimeException("EXCEPTION") "OK_EXCEPTION" }, { diff --git a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.kt b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.kt index 3b1ed17c35f..f263407c3d2 100644 --- a/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.kt +++ b/compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.kt @@ -17,9 +17,9 @@ public class Holder(var value: String = "") { } -public class Exception1(message: String) : java.lang.RuntimeException(message) +public class Exception1(message: String) : RuntimeException(message) -public class Exception2(message: String) : java.lang.RuntimeException(message) +public class Exception2(message: String) : RuntimeException(message) public inline fun doCall(block: ()-> String, finallyBlock: ()-> String, tryBlock2: ()-> String, catchBlock2: ()-> String, res: String = "Fail") : String {