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

FIR: Optimize ConeTypeContext::captureFromArguments

Browse Source
This commit is contained in:
Denis Zharkov
2019-06-03 19:56:32 +03:00
parent 2c5bd46a97
commit 115ab38423
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+7 -3
View File
@@ -280,10 +280,14 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext {
override fun captureFromArguments(type: SimpleTypeMarker, status: CaptureStatus): SimpleTypeMarker? { override fun captureFromArguments(type: SimpleTypeMarker, status: CaptureStatus): SimpleTypeMarker? {
require(type is ConeKotlinType) require(type is ConeKotlinType)
val argumentsCount = type.argumentsCount()
if (argumentsCount == 0) return null
val typeConstructor = type.typeConstructor() val typeConstructor = type.typeConstructor()
if (type.argumentsCount() != typeConstructor.parametersCount()) return null if (argumentsCount != typeConstructor.parametersCount()) return null
if (type.asArgumentList().all(this) { !it.isStarProjection() && it.getVariance() == TypeVariance.INV }) return null if (type.asArgumentList().all(this) { !it.isStarProjection() && it.getVariance() == TypeVariance.INV }) return null
val newArguments = Array(type.argumentsCount()) { index -> val newArguments = Array(argumentsCount) { index ->
val argument = type.getArgument(index) val argument = type.getArgument(index)
if (!argument.isStarProjection() && argument.getVariance() == TypeVariance.INV) return@Array argument as ConeKotlinTypeProjection if (!argument.isStarProjection() && argument.getVariance() == TypeVariance.INV) return@Array argument as ConeKotlinTypeProjection
@@ -296,7 +300,7 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext {
ConeCapturedType(status, lowerType, argument as ConeKotlinTypeProjection) ConeCapturedType(status, lowerType, argument as ConeKotlinTypeProjection)
} }
for (index in 0 until type.argumentsCount()) { for (index in 0 until argumentsCount) {
val oldArgument = type.getArgument(index) val oldArgument = type.getArgument(index)
val newArgument = newArguments[index] val newArgument = newArguments[index]