fixup! Don't emit CAST_NEVER_SUCCEEDS when casting to a forward declaration type
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/PlatformSpecificCastChecker.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/PlatformSpecificCastChecker.kt
index cb96ece..a485305 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/PlatformSpecificCastChecker.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/PlatformSpecificCastChecker.kt
@@ -5,10 +5,11 @@
package org.jetbrains.kotlin.builtins
import org.jetbrains.kotlin.container.DefaultImplementation
+import org.jetbrains.kotlin.container.PlatformSpecificExtension
import org.jetbrains.kotlin.types.KotlinType
@DefaultImplementation(impl = PlatformSpecificCastChecker.Default::class)
-interface PlatformSpecificCastChecker {
+interface PlatformSpecificCastChecker : PlatformSpecificExtension<PlatformSpecificCastChecker> {
fun isCastPossible(fromType: KotlinType, toType: KotlinType): Boolean
class Default : PlatformSpecificCastChecker {
diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativePlatformSpecificCastChecker.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativePlatformSpecificCastChecker.kt
index 2804a2a..0a82010 100644
--- a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativePlatformSpecificCastChecker.kt
+++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/diagnostics/NativePlatformSpecificCastChecker.kt
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.resolve.konan.diagnostics
import org.jetbrains.kotlin.builtins.PlatformSpecificCastChecker
+import org.jetbrains.kotlin.container.PlatformSpecificExtension
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.konan.getForwardDeclarationKindOrNull
import org.jetbrains.kotlin.types.KotlinType
diff --git a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt
index f070c6f..7c25426 100644
--- a/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt
+++ b/native/frontend/src/org/jetbrains/kotlin/resolve/konan/platform/NativePlatformConfigurator.kt
@@ -5,9 +5,8 @@
package org.jetbrains.kotlin.resolve.konan.platform
-import org.jetbrains.kotlin.container.StorageComponentContainer
-import org.jetbrains.kotlin.container.useImpl
-import org.jetbrains.kotlin.container.useInstance
+import org.jetbrains.kotlin.builtins.PlatformSpecificCastChecker
+import org.jetbrains.kotlin.container.*
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.resolve.BindingContext
@@ -31,6 +30,9 @@
NativeObjCRefinementChecker, NativeObjCRefinementAnnotationChecker,
NativeObjCRefinementOverridesChecker, NativeHiddenFromObjCInheritanceChecker,
),
+ additionalClashResolvers = listOf(
+ PlatformExtensionsClashResolver.FallbackToDefault(NativePlatformSpecificCastChecker, PlatformSpecificCastChecker::class.java)
+ ),
platformSpecificCastChecker = NativePlatformSpecificCastChecker
) {
override fun configureModuleComponents(container: StorageComponentContainer) {
