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

Optimize CF merge operations

Browse Source 
Return incoming value if it's single
This commit is contained in:
Denis Zharkov
2016-03-10 14:29:28 +03:00
parent 4bea054e4b
commit 50d258e7f4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt
+14 -6
View File
@@ -155,12 +155,19 @@ class PseudocodeVariablesData(val pseudocode: Pseudocode, private val bindingCon
TraversalOrder.BACKWARD, true, UseControlFlowInfo() TraversalOrder.BACKWARD, true, UseControlFlowInfo()
) { ) {
instruction: Instruction, incomingEdgesData: Collection<UseControlFlowInfo> -> instruction: Instruction, incomingEdgesData: Collection<UseControlFlowInfo> ->
val enterResult = UseControlFlowInfo() val enterResult: UseControlFlowInfo
for (edgeData in incomingEdgesData) {
for (entry in edgeData.entries) { if (incomingEdgesData.size == 1) {
val variableDescriptor = entry.key enterResult = incomingEdgesData.single()
val variableUseState = entry.value }
enterResult.put(variableDescriptor, variableUseState.merge(enterResult[variableDescriptor])) else {
enterResult = UseControlFlowInfo()
for (edgeData in incomingEdgesData) {
for (entry in edgeData.entries) {
val variableDescriptor = entry.key
val variableUseState = entry.value
enterResult.put(variableDescriptor, variableUseState.merge(enterResult[variableDescriptor]))
}
} }
} }
val variableDescriptor = PseudocodeUtil.extractVariableDescriptorIfAny(instruction, true, bindingContext) val variableDescriptor = PseudocodeUtil.extractVariableDescriptorIfAny(instruction, true, bindingContext)
@@ -207,6 +214,7 @@ class PseudocodeVariablesData(val pseudocode: Pseudocode, private val bindingCon
private fun mergeIncomingEdgesDataForInitializers( private fun mergeIncomingEdgesDataForInitializers(
incomingEdgesData: Collection<InitControlFlowInfo> incomingEdgesData: Collection<InitControlFlowInfo>
): InitControlFlowInfo { ): InitControlFlowInfo {
if (incomingEdgesData.size == 1) return incomingEdgesData.single()
val variablesInScope = Sets.newHashSet<VariableDescriptor>() val variablesInScope = Sets.newHashSet<VariableDescriptor>()
for (edgeData in incomingEdgesData) { for (edgeData in incomingEdgesData) {
variablesInScope.addAll(edgeData.keys) variablesInScope.addAll(edgeData.keys)