azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Array<Subtype> can be now cast to Array<Supertype(?)> without CAST_NEVER_SUCCEEDS #KT-6391 Fixed

Browse Source 
(cherry picked from commit 2629d55)
This commit is contained in:
Mikhail Glukhikh
2016-07-19 16:40:43 +03:00
committed by Mikhail Glukhikh
parent 90e5e561e3
commit dbbc4ec281
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.kt
+6 -2
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.types.typeUtil.isPrimitiveNumberType
object CastDiagnosticsUtil {
@@ -46,8 +47,11 @@ object CastDiagnosticsUtil {
if (KotlinBuiltIns.isArray(lhsType)) {
val lhsArgument = lhsType.arguments.firstOrNull()
val rhsArgument = rhsType.arguments.firstOrNull()
if (lhsArgument != null && rhsArgument != null && lhsArgument.type.constructor == rhsArgument.type.constructor) {
return true
if (lhsArgument != null && rhsArgument != null) {
if (lhsArgument.type.constructor == rhsArgument.type.constructor) return true
if (KotlinTypeChecker.DEFAULT.isSubtypeOf(TypeUtils.makeNotNullable(lhsArgument.type), rhsArgument.type)) {
return true
}
}
}
}