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

Use TypeSystemContext in KotlinTypeMapper.hasNothingInNonContravariantPosition

Browse Source 
Thanks to this abstraction, this code will now easily work with
IrType-based TypeSystemContext implementation in the new IR type mapper
This commit is contained in:
Alexander Udalov
2019-06-19 17:31:03 +02:00
parent 1896537091
commit 0460b2990f
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt
+15 -9
View File
@@ -66,7 +66,11 @@ import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource import org.jetbrains.kotlin.serialization.deserialization.descriptors.DescriptorWithContainerSource
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext
import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.* import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*
import org.jetbrains.kotlin.types.model.KotlinTypeMarker
import org.jetbrains.kotlin.types.model.TypeSystemContext
import org.jetbrains.kotlin.types.model.TypeVariance
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.org.objectweb.asm.Opcodes.*
import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.Type
@@ -1444,19 +1448,21 @@ class KotlinTypeMapper @JvmOverloads constructor(
?: SpecialNames.safeIdentifier(klass.name).identifier ?: SpecialNames.safeIdentifier(klass.name).identifier
} }
private fun hasNothingInNonContravariantPosition(kotlinType: KotlinType): Boolean { private fun hasNothingInNonContravariantPosition(kotlinType: KotlinType): Boolean =
val parameters = kotlinType.constructor.parameters SimpleClassicTypeSystemContext.hasNothingInNonContravariantPosition(kotlinType)
val arguments = kotlinType.arguments
for (i in arguments.indices) { private fun TypeSystemContext.hasNothingInNonContravariantPosition(type: KotlinTypeMarker): Boolean {
val projection = arguments[i] val typeConstructor = type.typeConstructor()
if (projection.isStarProjection) continue for (i in 0 until type.argumentsCount()) {
val projection = type.getArgument(i)
if (projection.isStarProjection()) continue
val type = projection.type val argument = projection.getType()
if (KotlinBuiltIns.isNullableNothing(type) || KotlinBuiltIns.isNothing(type) && parameters[i].variance !== Variance.IN_VARIANCE) if (argument.isNullableNothing() ||
return true argument.isNothing() && typeConstructor.getParameter(i).getVariance() != TypeVariance.IN
) return true
} }
return false return false