diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/Exceptions.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/Exceptions.kt index 0d8dafc7575..e24b75386dd 100644 --- a/kotlin-native/runtime/src/main/kotlin/kotlin/Exceptions.kt +++ b/kotlin-native/runtime/src/main/kotlin/kotlin/Exceptions.kt @@ -131,7 +131,7 @@ public actual open class AssertionError : Error { actual constructor(message: Any?) : super(message?.toString(), message as? Throwable) - constructor(message: String?, cause: Throwable?) : super(message, cause) + actual constructor(message: String?, cause: Throwable?) : super(message, cause) } @Suppress("ACTUAL_WITHOUT_EXPECT") diff --git a/libraries/stdlib/common/src/kotlin/ExceptionsH.kt b/libraries/stdlib/common/src/kotlin/ExceptionsH.kt index ee48cdd6533..ec3228f6b2a 100644 --- a/libraries/stdlib/common/src/kotlin/ExceptionsH.kt +++ b/libraries/stdlib/common/src/kotlin/ExceptionsH.kt @@ -78,6 +78,9 @@ public expect open class ClassCastException : RuntimeException { public expect open class AssertionError : Error { constructor() constructor(message: Any?) + + @SinceKotlin("1.9") + constructor(message: String?, cause: Throwable?) } public expect open class NoSuchElementException : RuntimeException { diff --git a/libraries/stdlib/js-ir/src/kotlin/exceptions.kt b/libraries/stdlib/js-ir/src/kotlin/exceptions.kt index aad37e8fa9a..e6635221eec 100644 --- a/libraries/stdlib/js-ir/src/kotlin/exceptions.kt +++ b/libraries/stdlib/js-ir/src/kotlin/exceptions.kt @@ -81,7 +81,7 @@ public actual open class AssertionError : Error { public constructor(message: String?) : super(message) public actual constructor(message: Any?) : super(message?.toString(), message as? Throwable) @SinceKotlin("1.4") - public constructor(message: String?, cause: Throwable?) : super(message, cause) + public actual constructor(message: String?, cause: Throwable?) : super(message, cause) } public actual open class NoSuchElementException : RuntimeException { diff --git a/libraries/stdlib/js-v1/src/kotlin/exceptions.kt b/libraries/stdlib/js-v1/src/kotlin/exceptions.kt index 1cd6cf48276..e3c11acf4c2 100644 --- a/libraries/stdlib/js-v1/src/kotlin/exceptions.kt +++ b/libraries/stdlib/js-v1/src/kotlin/exceptions.kt @@ -82,7 +82,7 @@ public actual open class ClassCastException actual constructor(message: String?) public actual open class AssertionError @SinceKotlin("1.4") -constructor(message: String?, cause: Throwable?) : Error(message, cause) { +actual constructor(message: String?, cause: Throwable?) : Error(message, cause) { actual constructor() : this(null) constructor(message: String?) : this(message, null) actual constructor(message: Any?) : this(message.toString(), message as? Throwable) diff --git a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt index ba5b810e8a7..4a7cc770ad6 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/TypeAliases.kt @@ -20,6 +20,7 @@ package kotlin @SinceKotlin("1.1") public actual typealias NumberFormatException = java.lang.NumberFormatException @SinceKotlin("1.1") public actual typealias NullPointerException = java.lang.NullPointerException @SinceKotlin("1.1") public actual typealias ClassCastException = java.lang.ClassCastException +@Suppress("NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS") @SinceKotlin("1.1") public actual typealias AssertionError = java.lang.AssertionError @SinceKotlin("1.1") public actual typealias NoSuchElementException = java.util.NoSuchElementException diff --git a/libraries/stdlib/test/exceptions/ExceptionTest.kt b/libraries/stdlib/test/exceptions/ExceptionTest.kt index 789ea14bf9c..a86350e028b 100644 --- a/libraries/stdlib/test/exceptions/ExceptionTest.kt +++ b/libraries/stdlib/test/exceptions/ExceptionTest.kt @@ -29,7 +29,7 @@ class ExceptionTest { @Test fun noWhenBranchMatchedException() = @Suppress("DEPRECATION_ERROR") testCreateException(::NoWhenBranchMatchedException, ::NoWhenBranchMatchedException, ::NoWhenBranchMatchedException, ::NoWhenBranchMatchedException) @Test fun uninitializedPropertyAccessException() = @Suppress("DEPRECATION_ERROR") testCreateException(::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException, ::UninitializedPropertyAccessException) - @Test fun assertionError() = testCreateException(::AssertionError, ::AssertionError, ::AssertionError) + @Test fun assertionError() = testCreateException(::AssertionError, ::AssertionError, ::AssertionError, ::AssertionError) private fun testCreateException( diff --git a/libraries/stdlib/wasm/src/kotlin/Exceptions.kt b/libraries/stdlib/wasm/src/kotlin/Exceptions.kt index 966f88f6168..d8b62c0a783 100644 --- a/libraries/stdlib/wasm/src/kotlin/Exceptions.kt +++ b/libraries/stdlib/wasm/src/kotlin/Exceptions.kt @@ -81,7 +81,7 @@ public actual open class AssertionError : Error { public constructor(message: String?) : super(message) public actual constructor(message: Any?) : super(message?.toString(), message as? Throwable) @SinceKotlin("1.4") - public constructor(message: String?, cause: Throwable?) : super(message, cause) + public actual constructor(message: String?, cause: Throwable?) : super(message, cause) } public actual open class NoSuchElementException : RuntimeException {