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

Do subtyping with stub types properly

Browse Source 
1) Return stub type if we are calculating super type between two same stub types
2) Return nullable Any if those stub types are different
This commit is contained in:
Victor Petukhov
2021-04-27 14:05:35 +03:00
parent 5d0461c722
commit ac7b459f2a
49 changed files with 1536 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
+6 -2
View File
@@ -478,7 +478,11 @@ object AbstractTypeChecker {
)
}
if (subType.isStubType() || superType.isStubType()) return context.isStubTypeEqualsToAnything
if (subType.isStubType() && superType.isStubType())
return subType.typeConstructor() === superType.typeConstructor()
if (subType.isStubType() || superType.isStubType() || subType.isStubTypeForVariableInSubtyping() || superType.isStubTypeForVariableInSubtyping())
return context.isStubTypeEqualsToAnything
// superType might be a definitely notNull type (see KT-42824)
val superOriginalType = superType.asDefinitelyNotNullType()?.original() ?: superType
@@ -742,7 +746,7 @@ object AbstractNullabilityChecker {
if (type.isNothing()) return true
if (type.isMarkedNullable()) return false
if (context.isStubTypeEqualsToAnything && type.isStubType()) return true
if (context.isStubTypeEqualsToAnything && (type.isStubTypeForVariableInSubtyping() || type.isStubType())) return true
return areEqualTypeConstructors(type.typeConstructor(), end)
}
core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
+3 -2
View File
@@ -73,7 +73,7 @@ interface TypeSystemBuiltInsContext {
/**
* Context that allow construction of types
*/
interface TypeSystemTypeFactoryContext {
interface TypeSystemTypeFactoryContext: TypeSystemBuiltInsContext {
fun createFlexibleType(lowerBound: SimpleTypeMarker, upperBound: SimpleTypeMarker): KotlinTypeMarker
fun createSimpleType(
constructor: TypeConstructorMarker,
@@ -169,7 +169,7 @@ interface TypeSystemInferenceExtensionContext : TypeSystemContext, TypeSystemBui
): CapturedTypeMarker
fun createStubType(typeVariable: TypeVariableMarker): StubTypeMarker
fun createStubTypeForTypeVariablesInSubtyping(typeVariable: TypeVariableMarker): StubTypeMarker
fun KotlinTypeMarker.removeAnnotations(): KotlinTypeMarker
fun KotlinTypeMarker.removeExactAnnotation(): KotlinTypeMarker
@@ -299,6 +299,7 @@ interface TypeSystemContext : TypeSystemOptimizationContext {
}
fun SimpleTypeMarker.isStubType(): Boolean
fun SimpleTypeMarker.isStubTypeForVariableInSubtyping(): Boolean
fun KotlinTypeMarker.asTypeArgument(): TypeArgumentMarker