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

NI: limit cache size for approximated types during incorporation

Browse Source
This commit is contained in:
Victor Petukhov
2020-03-17 12:24:45 +03:00
parent ea59ea8aa2
commit 81385b73b7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/types/TypeApproximator.kt
+7
View File
@@ -134,6 +134,10 @@ abstract class AbstractTypeApproximator(val ctx: TypeSystemInferenceExtensionCon
private val referenceApproximateToSuperType = this::approximateSimpleToSuperType private val referenceApproximateToSuperType = this::approximateSimpleToSuperType
private val referenceApproximateToSubType = this::approximateSimpleToSubType private val referenceApproximateToSubType = this::approximateSimpleToSubType
companion object {
const val CACHE_FOR_INCORPORATION_MAX_SIZE = 500
}
open fun createErrorType(message: String): SimpleTypeMarker = open fun createErrorType(message: String): SimpleTypeMarker =
ErrorUtils.createErrorType(message) ErrorUtils.createErrorType(message)
@@ -183,6 +187,9 @@ abstract class AbstractTypeApproximator(val ctx: TypeSystemInferenceExtensionCon
if (conf !is TypeApproximatorConfiguration.IncorporationConfiguration) return approximate() if (conf !is TypeApproximatorConfiguration.IncorporationConfiguration) return approximate()
val cache = if (toSuper) cacheForIncorporationConfigToSuperDirection else cacheForIncorporationConfigToSubtypeDirection val cache = if (toSuper) cacheForIncorporationConfigToSuperDirection else cacheForIncorporationConfigToSubtypeDirection
if (cache.size > CACHE_FOR_INCORPORATION_MAX_SIZE) return approximate()
return cache.getOrPut(type, { approximate().toApproximationResult() }).type return cache.getOrPut(type, { approximate().toApproximationResult() }).type
} }