From 0a4abd2ebdbb35084ef2636fb7bafd55a10cf53e Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Mon, 3 Mar 2014 14:47:04 +0400
Subject: [PATCH] refactoring: inlined createEdges function

---
 .../src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt  | 1 -
 .../jetbrains/jet/lang/cfg/PseudocodeVariablesData.java    | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
index 9de52f89901..b3b93415f74 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.kt
@@ -186,7 +186,6 @@ private fun <D> Pseudocode.collectDataFromSubgraph(
 }
 
 data class Edges<T>(val `in`: T, val out: T)
-fun <T> createEdges(`in`: T, out: T) = Edges(`in`, out)
 
 
 // returns false when interrupted by handler
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
index 728c65aab00..9b6d8ad45c9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
@@ -38,7 +38,6 @@ import java.util.Set;
 
 import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.BACKWARD;
 import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
-import static org.jetbrains.jet.lang.cfg.pseudocodeTraverser.PseudocodeTraverserPackage.createEdges;
 
 public class PseudocodeVariablesData {
     private final Pseudocode pseudocode;
@@ -159,7 +158,7 @@ public class PseudocodeVariablesData {
                                 mergeIncomingEdgesDataForInitializers(incomingEdgesData);
                         Map<VariableDescriptor, VariableInitState> exitInstructionData = addVariableInitStateFromCurrentInstructionIfAny(
                                 instruction, enterInstructionData, lexicalScopeVariableInfo);
-                        return createEdges(enterInstructionData, exitInstructionData);
+                        return new Edges<Map<VariableDescriptor, VariableInitState>>(enterInstructionData, exitInstructionData);
                     }
                 }
         );
@@ -267,7 +266,7 @@ public class PseudocodeVariablesData {
                                 instruction, true, bindingContext);
                         if (variableDescriptor == null ||
                             (!(instruction instanceof ReadValueInstruction) && !(instruction instanceof WriteValueInstruction))) {
-                            return createEdges(enterResult, enterResult);
+                            return new Edges<Map<VariableDescriptor, VariableUseState>>(enterResult, enterResult);
                         }
                         Map<VariableDescriptor, VariableUseState> exitResult = Maps.newHashMap(enterResult);
                         if (instruction instanceof ReadValueInstruction) {
@@ -288,7 +287,7 @@ public class PseudocodeVariablesData {
                                     exitResult.put(variableDescriptor, VariableUseState.WRITTEN_AFTER_READ);
                             }
                         }
-                        return createEdges(enterResult, exitResult);
+                        return new Edges<Map<VariableDescriptor, VariableUseState>>(enterResult, exitResult);
                     }
                 }
         );