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

[FIR] Minor. Extract methods used DataFlowInfo from DataFlowInferenceContext

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-09-06 14:50:55 +03:00
parent 65edf73bee
commit 44571fbd8f
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/DataFlowInferenceContext.kt
-24
View File
@@ -29,28 +29,4 @@ interface DataFlowInferenceContext : TypeSystemCommonSuperTypesContext, ConeInfe
else -> ConeTypeIntersector.intersectTypes(this as ConeInferenceContext, types) else -> ConeTypeIntersector.intersectTypes(this as ConeInferenceContext, types)
} }
} }
fun or(infos: Collection<FirDataFlowInfo>): FirDataFlowInfo {
infos.singleOrNull()?.let { return it }
val exactType = orTypes(infos.map { it.exactType })
val exactNotType = orTypes(infos.map { it.exactNotType })
return FirDataFlowInfo(exactType, exactNotType)
}
private fun orTypes(types: Collection<Set<ConeKotlinType>>): Set<ConeKotlinType> {
if (types.any { it.isEmpty() }) return emptySet()
val allTypes = types.flatMapTo(mutableSetOf()) { it }
val commonTypes = allTypes.toMutableSet()
types.forEach { commonTypes.retainAll(it) }
val differentTypes = allTypes - commonTypes
commonSuperTypeOrNull(differentTypes.toList())?.let { commonTypes += it }
return commonTypes
}
fun and(infos: Collection<FirDataFlowInfo>): FirDataFlowInfo {
infos.singleOrNull()?.let { return it }
val exactType = infos.flatMapTo(mutableSetOf()) { it.exactType }
val exactNotType = infos.flatMapTo(mutableSetOf()) { it.exactNotType }
return FirDataFlowInfo(exactType, exactNotType)
}
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt
+30 -5
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.fir.resolve.dfa package org.jetbrains.kotlin.fir.resolve.dfa
import com.google.common.collect.HashMultimap import com.google.common.collect.HashMultimap
import org.jetbrains.kotlin.fir.types.ConeKotlinType
class LogicSystem(private val context: DataFlowInferenceContext) { class LogicSystem(private val context: DataFlowInferenceContext) {
private fun <E> List<Set<E>>.intersectSets(): Set<E> = takeIf { isNotEmpty() }?.reduce { x, y -> x.intersect(y) } ?: emptySet() private fun <E> List<Set<E>>.intersectSets(): Set<E> = takeIf { isNotEmpty() }?.reduce { x, y -> x.intersect(y) } ?: emptySet()
@@ -20,7 +21,7 @@ class LogicSystem(private val context: DataFlowInferenceContext) {
.forEach { variable -> .forEach { variable ->
val infos = storages.map { it.approvedInfos[variable]!! } val infos = storages.map { it.approvedInfos[variable]!! }
if (infos.isNotEmpty()) { if (infos.isNotEmpty()) {
approvedFacts[variable] = context.or(infos) approvedFacts[variable] = or(infos)
} }
} }
@@ -49,7 +50,7 @@ class LogicSystem(private val context: DataFlowInferenceContext) {
for (variable in left.keys.union(right.keys)) { for (variable in left.keys.union(right.keys)) {
val leftInfo = left[variable] val leftInfo = left[variable]
val rightInfo = right[variable] val rightInfo = right[variable]
map[variable] = context.and(listOfNotNull(leftInfo, rightInfo)) map[variable] = and(listOfNotNull(leftInfo, rightInfo))
} }
return map return map
} }
@@ -63,7 +64,7 @@ class LogicSystem(private val context: DataFlowInferenceContext) {
for (variable in left.keys.intersect(right.keys)) { for (variable in left.keys.intersect(right.keys)) {
val leftInfo = left[variable]!! val leftInfo = left[variable]!!
val rightInfo = right[variable]!! val rightInfo = right[variable]!!
map[variable] = context.or(listOf(leftInfo, rightInfo)) map[variable] = or(listOf(leftInfo, rightInfo))
} }
return map return map
} }
@@ -89,7 +90,7 @@ class LogicSystem(private val context: DataFlowInferenceContext) {
flow.approvedInfos[variable]?.let { flow.approvedInfos[variable]?.let {
infos.add(it) infos.add(it)
} }
flow.approvedInfos[variable] = context.and(infos) flow.approvedInfos[variable] = and(infos)
if (variable.isThisReference) { if (variable.isThisReference) {
updatedReceivers += variable updatedReceivers += variable
} }
@@ -108,6 +109,30 @@ class LogicSystem(private val context: DataFlowInferenceContext) {
newFacts.put(it.variable, it.info) newFacts.put(it.variable, it.info)
} }
} }
return newFacts.asMap().mapValuesTo(mutableMapOf()) { (_, infos) -> context.and(infos) } return newFacts.asMap().mapValuesTo(mutableMapOf()) { (_, infos) -> and(infos) }
}
private fun or(infos: Collection<FirDataFlowInfo>): FirDataFlowInfo {
infos.singleOrNull()?.let { return it }
val exactType = orTypes(infos.map { it.exactType })
val exactNotType = orTypes(infos.map { it.exactNotType })
return FirDataFlowInfo(exactType, exactNotType)
}
private fun orTypes(types: Collection<Set<ConeKotlinType>>): Set<ConeKotlinType> {
if (types.any { it.isEmpty() }) return emptySet()
val allTypes = types.flatMapTo(mutableSetOf()) { it }
val commonTypes = allTypes.toMutableSet()
types.forEach { commonTypes.retainAll(it) }
val differentTypes = allTypes - commonTypes
context.commonSuperTypeOrNull(differentTypes.toList())?.let { commonTypes += it }
return commonTypes
}
private fun and(infos: Collection<FirDataFlowInfo>): FirDataFlowInfo {
infos.singleOrNull()?.let { return it }
val exactType = infos.flatMapTo(mutableSetOf()) { it.exactType }
val exactNotType = infos.flatMapTo(mutableSetOf()) { it.exactNotType }
return FirDataFlowInfo(exactType, exactNotType)
} }
} }