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

Add explicit fast path in TypeCheckerContext::anySupertype

Browse Source
This commit is contained in:
Denis Zharkov
2017-10-03 19:36:53 +03:00
parent b99658b8eb
commit f81c7a1a47
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckerContext.kt
+9 -8
View File
@@ -70,6 +70,8 @@ open class TypeCheckerContext(val errorTypeEqualsToAnything: Boolean, val allowe
predicate: (SimpleType) -> Boolean, predicate: (SimpleType) -> Boolean,
supertypesPolicy: (SimpleType) -> SupertypesPolicy supertypesPolicy: (SimpleType) -> SupertypesPolicy
): Boolean { ): Boolean {
if (predicate(start)) return true
initialize() initialize()
val deque = supertypesDeque!! val deque = supertypesDeque!!
@@ -81,18 +83,17 @@ open class TypeCheckerContext(val errorTypeEqualsToAnything: Boolean, val allowe
error("Too many supertypes for type: $start. Supertypes = ${visitedSupertypes.joinToString()}") error("Too many supertypes for type: $start. Supertypes = ${visitedSupertypes.joinToString()}")
} }
val current = deque.pop() val current = deque.pop()
if (!visitedSupertypes.add(current)) continue
if (!visitedSupertypes.add(current)) { val policy = supertypesPolicy(current).takeIf { it != SupertypesPolicy.None } ?: continue
continue for (supertype in current.constructor.supertypes) {
} val newType = policy.transformType(supertype)
if (predicate(newType)) {
if (predicate(current)) {
clear() clear()
return true return true
} }
deque.add(newType)
val policy = supertypesPolicy(current).takeIf { it != SupertypesPolicy.None } ?: continue }
for (supertype in current.constructor.supertypes) deque.add(policy.transformType(supertype))
} }
clear() clear()