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

Do not inherit IrTypeSystemContext from TypeSystemInferenceExtensionContext

Browse Source 
This inheritance was not used. Moreover, multiple methods were
implemented incorrectly and/or inconsistently with the base
implementation at ClassicTypeSystemContext
This commit is contained in:
Alexander Udalov
2019-06-27 00:04:40 +02:00
parent cf6ff8c6b3
commit 445c4ebe65
2 changed files with 5 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeCheckerContext.kt
+1 -16
View File
@@ -17,9 +17,6 @@ import org.jetbrains.kotlin.types.model.TypeConstructorMarker
class IrTypeCheckerContext(override val irBuiltIns: IrBuiltIns) : IrTypeSystemContext, AbstractTypeCheckerContext() {
override fun anyType(): SimpleTypeMarker =
irBuiltIns.anyType as IrSimpleType
override fun substitutionSupertypePolicy(type: SimpleTypeMarker): SupertypesPolicy.DoCustomTransform {
require(type is IrSimpleType)
val parameters = extractTypeParameters((type.classifier as IrClassSymbol).owner).map { it.symbol }
@@ -51,21 +48,14 @@ class IrTypeCheckerContext(override val irBuiltIns: IrBuiltIns) : IrTypeSystemCo
override fun areEqualTypeConstructors(a: TypeConstructorMarker, b: TypeConstructorMarker) = super.isEqualTypeConstructors(a, b)
override val isErrorTypeEqualsToAnything = false
override val KotlinTypeMarker.isAllowedTypeVariable: Boolean
get() = false
override fun newBaseTypeCheckerContext(errorTypesEqualToAnything: Boolean): AbstractTypeCheckerContext {
return IrTypeCheckerContext(irBuiltIns)
}
override fun KotlinTypeMarker.removeExactAnnotation(): KotlinTypeMarker {
// TODO remove 'Exact' annotation only
return removeAnnotations()
}
override fun KotlinTypeMarker.isUninferredParameter(): Boolean = false
override fun captureFromExpression(type: KotlinTypeMarker): KotlinTypeMarker? =
@@ -87,9 +77,4 @@ class IrTypeCheckerContext(override val irBuiltIns: IrBuiltIns) : IrTypeSystemCo
is IrSimpleType -> arguments[index]
else -> error("Type $this has no arguments")
}
override fun KotlinTypeMarker.mayBeTypeVariable(): Boolean {
require(this is IrType)
return false
}
}
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/types/IrTypeSystemContext.kt
+4 -105
View File
@@ -15,17 +15,11 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.symbols.IrClassifierSymbol
import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
import org.jetbrains.kotlin.ir.types.impl.*
import org.jetbrains.kotlin.ir.util.hasAnnotation
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.types.checker.convertVariance
import org.jetbrains.kotlin.types.model.*
private val NO_INFER_ANNOTATION_FQ_NAME = FqName("kotlin.internal.NoInfer")
private val EXACT_ANNOTATION_FQ_NAME = FqName("kotlin.internal.Exact")
interface IrTypeSystemContext : TypeSystemInferenceExtensionContext {
interface IrTypeSystemContext : TypeSystemContext, TypeSystemCommonSuperTypesContext {
val irBuiltIns: IrBuiltIns
@@ -182,15 +176,9 @@ interface IrTypeSystemContext : TypeSystemInferenceExtensionContext {
override fun TypeConstructorMarker.isIntegerLiteralTypeConstructor() = false
override fun nullableNothingType() = irBuiltIns.nothingNType as IrSimpleType
override fun nullableAnyType() = irBuiltIns.anyNType as IrSimpleType
override fun nothingType() = irBuiltIns.nothingType as IrSimpleType
override fun createFlexibleType(lowerBound: SimpleTypeMarker, upperBound: SimpleTypeMarker): KotlinTypeMarker {
require(lowerBound == nothingType())
require(upperBound == nullableAnyType())
require(lowerBound.isNothing())
require(upperBound is IrType && upperBound.isNullableAny())
return IrDynamicTypeImpl(null, emptyList(), Variance.INVARIANT)
}
@@ -220,92 +208,8 @@ interface IrTypeSystemContext : TypeSystemInferenceExtensionContext {
override fun findCommonIntegerLiteralTypesSuperType(explicitSupertypes: List<SimpleTypeMarker>): SimpleTypeMarker? =
irBuiltIns.intType as IrSimpleType
override fun KotlinTypeMarker.contains(predicate: (KotlinTypeMarker) -> Boolean) = predicate(this)
override fun TypeConstructorMarker.isUnitTypeConstructor() = isEqualTypeConstructors(this, irBuiltIns.unitClass)
override fun TypeConstructorMarker.getApproximatedIntegerLiteralType(): KotlinTypeMarker = irBuiltIns.intType
override fun Collection<KotlinTypeMarker>.singleBestRepresentative(): KotlinTypeMarker? {
if (this.size == 1) return this.first()
return this.firstOrNull { candidate ->
this.all { other ->
// We consider error types equal to anything here, so that intersections like
// {Array<String>, Array<[ERROR]>} work correctly
candidate == other || other is IrErrorType
}
}
}
override fun KotlinTypeMarker.isUnit() = (this as IrType) == irBuiltIns.unitType
override fun KotlinTypeMarker.withNullability(nullable: Boolean) = if (this is IrSimpleType)
IrSimpleTypeImpl(classifier, true, arguments, annotations)
else this
override fun KotlinTypeMarker.makeDefinitelyNotNullOrNotNull(): KotlinTypeMarker {
error("Captured Type is not supported for IrType")
}
override fun SimpleTypeMarker.makeSimpleTypeDefinitelyNotNullOrNotNull(): SimpleTypeMarker {
error("Captured Type is not supported for IrType")
}
override fun createCapturedType(
constructorProjection: TypeArgumentMarker,
constructorSupertypes: List<KotlinTypeMarker>,
lowerType: KotlinTypeMarker?,
captureStatus: CaptureStatus
): CapturedTypeMarker {
error("Captured Type is not supported for IrType")
}
override fun createStubType(typeVariable: TypeVariableMarker) = error("Stub type is not supported for IrTypes")
override fun KotlinTypeMarker.removeAnnotations() = with(this as IrType) {
if (annotations.isEmpty()) this
else {
when {
this is IrDynamicType -> IrDynamicTypeImpl(null, emptyList(), Variance.INVARIANT)
this is IrSimpleType -> IrSimpleTypeImpl(classifier, hasQuestionMark, arguments, emptyList())
else -> this
}
}
}
override fun SimpleTypeMarker.replaceArguments(newArguments: List<TypeArgumentMarker>): SimpleTypeMarker = with(this as IrSimpleType) {
IrSimpleTypeImpl(classifier, hasQuestionMark, newArguments.map { it as IrTypeArgument }, annotations)
}
override fun KotlinTypeMarker.hasExactAnnotation(): Boolean = with(this as IrType) {
annotations.hasAnnotation(EXACT_ANNOTATION_FQ_NAME)
}
override fun KotlinTypeMarker.hasNoInferAnnotation(): Boolean = with(this as IrType) {
annotations.hasAnnotation(NO_INFER_ANNOTATION_FQ_NAME)
}
override fun TypeVariableMarker.freshTypeConstructor(): TypeConstructorMarker =
error("freshTypeConstructor is not supported for IrType")
override fun CapturedTypeMarker.typeConstructorProjection() =
error("typeConstructorProjection is not supported for IrType")
override fun KotlinTypeMarker.isNullableType() = this is IrDynamicType || this is IrSimpleType && hasQuestionMark
override fun DefinitelyNotNullTypeMarker.original(): SimpleTypeMarker = error("DefinitelyNotNullTypeMarker is not supported for IrType")
override fun typeSubstitutorByTypeConstructor(map: Map<TypeConstructorMarker, KotlinTypeMarker>): TypeSubstitutorMarker {
TODO("not implemented")
}
override fun TypeSubstitutorMarker.safeSubstitute(type: KotlinTypeMarker): KotlinTypeMarker {
TODO("not implemented")
}
override fun TypeVariableMarker.defaultType(): SimpleTypeMarker = error("defaultType is not supported for IrType")
@Suppress("UNCHECKED_CAST")
override fun intersectTypes(types: List<SimpleTypeMarker>): SimpleTypeMarker =
makeTypeIntersection(types as List<IrType>) as SimpleTypeMarker
@@ -315,13 +219,8 @@ interface IrTypeSystemContext : TypeSystemInferenceExtensionContext {
override fun intersectTypes(types: List<KotlinTypeMarker>): KotlinTypeMarker =
makeTypeIntersection(types as List<IrType>)
override fun TypeConstructorMarker.isCapturedTypeConstructor(): Boolean = false
override fun createErrorTypeWithCustomConstructor(debugName: String, constructor: TypeConstructorMarker): KotlinTypeMarker =
TODO("IrTypeSystemContext doesn't support constraint system resolution")
override fun CapturedTypeMarker.captureStatus(): CaptureStatus =
error("Captured type is unsupported in IR")
}
fun extractTypeParameters(klass: IrDeclarationParent): List<IrTypeParameter> {
@@ -346,4 +245,4 @@ fun extractTypeParameters(klass: IrDeclarationParent): List<IrTypeParameter> {
}
}
return result
}
}