Fix for KT-5910: Can't call Throwable() in Kotlin

#KT-5910 Fixed
This commit is contained in:
Michael Bogdanov
2015-12-14 15:38:07 +03:00
parent d40e9ffc13
commit ca9e8fc5a7
6 changed files with 98 additions and 2 deletions
+4 -1
View File
@@ -1279,7 +1279,10 @@ public final class String : kotlin.Comparable<kotlin.String>, kotlin.CharSequenc
}
public open class Throwable {
/*primary*/ public constructor Throwable(/*0*/ message: kotlin.String? = ..., /*1*/ cause: kotlin.Throwable? = ...)
public constructor Throwable()
public constructor Throwable(/*0*/ message: kotlin.String?)
/*primary*/ public constructor Throwable(/*0*/ message: kotlin.String?, /*1*/ cause: kotlin.Throwable?)
public constructor Throwable(/*0*/ cause: kotlin.Throwable?)
public final val cause: kotlin.Throwable?
public final fun <get-cause>(): kotlin.Throwable?
public final val message: kotlin.String?
+22
View File
@@ -0,0 +1,22 @@
fun box(): String {
val s: String? = "OK"
val t: Throwable? = Throwable("test", null)
val z = Throwable(s, t)
if (z.message !== s) return "fail 1: ${z.message}"
if (z.cause !== t) return "fail 2: ${z.cause}"
val z2 = Throwable(s)
if (z2.message !== s) return "fail 3: ${z2.message}"
if (z2.cause !== null) return "fail 4: ${z2.cause}"
val z3 = Throwable(t)
if (z3.message != "java.lang.Throwable: test") return "fail 5: ${z3.message}"
if (z3.cause !== t) return "fail 6: ${z2.cause}"
val z4 = Throwable()
if (z4.message !== null) return "fail 7: ${z4.message}"
if (z4.cause !== null) return "fail 8: ${z4.cause}"
return z.message!!
}
@@ -0,0 +1,30 @@
import kotlin.reflect.KFunction2
import kotlin.reflect.KFunction1
import kotlin.reflect.KFunction0
fun box(): String {
val s: String? = "OK"
val t: Throwable? = Throwable("test", null)
var thr1: KFunction2<String?, Throwable?, Throwable> = ::Throwable
val z = thr1(s, t)
if (z.message !== s) return "fail 1: ${z.message}"
if (z.cause !== t) return "fail 2: ${z.cause}"
var thr2: KFunction1<String?, Throwable> = ::Throwable
val z2 = thr2(s)
if (z2.message !== s) return "fail 3: ${z2.message}"
if (z2.cause !== null) return "fail 4: ${z2.cause}"
var thr3: KFunction1<Throwable?, Throwable> = ::Throwable
val z3 = thr3(t)
if (z3.message != "java.lang.Throwable: test") return "fail 5: ${z3.message}"
if (z3.cause !== t) return "fail 6: ${z2.cause}"
var thr4: KFunction0<Throwable> = ::Throwable
val z4 = thr4()
if (z4.message !== null) return "fail 7: ${z4.message}"
if (z4.cause !== null) return "fail 8: ${z4.cause}"
return z.message!!
}
@@ -0,0 +1,17 @@
var res = ""
fun getM(): String {
res += "M"
return "OK"
}
fun getT(): Throwable {
res += "T"
return Throwable("test", null)
}
fun box(): String {
val z = Throwable(cause = getT(), message = getM())
if (res != "TM") return "Wrong argument calculation order: $res"
return z.message!!
}
@@ -4765,6 +4765,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("throwable.kt")
public void testThrowable() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/throwable.kt");
doTest(fileName);
}
@TestMetadata("throwableCallableReference.kt")
public void testThrowableCallableReference() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/throwableCallableReference.kt");
doTest(fileName);
}
@TestMetadata("throwableParamOrder.kt")
public void testThrowableParamOrder() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/throwableParamOrder.kt");
doTest(fileName);
}
@TestMetadata("tostring.kt")
public void testTostring() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/tostring.kt");
+7 -1
View File
@@ -22,7 +22,13 @@ package kotlin
* @param message the detail message string.
* @param cause the cause of this throwable.
*/
public open class Throwable(val message: String? = null, val cause: Throwable? = null) {
public open class Throwable(val message: String?, val cause: Throwable?) {
constructor(message: String?) : this(message, null)
constructor(cause: Throwable?) : this(cause?.toString(), cause)
constructor() : this(null, null)
/**
* Prints the stack trace of this throwable to the standard output.
*/