diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java index 3997bced6df..c67d560ec73 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java @@ -70,9 +70,13 @@ public class PseudocodeTraverser { } public static Map> collectData( - @NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, LookInsideStrategy lookInside, - @NotNull D initialDataValue, @NotNull D initialDataValueForEnterInstruction, - @NotNull InstructionDataMergeStrategy instructionDataMergeStrategy) { + @NotNull Pseudocode pseudocode, + @NotNull TraversalOrder traversalOrder, + @NotNull LookInsideStrategy lookInside, + @NotNull D initialDataValue, + @NotNull D initialDataValueForEnterInstruction, + @NotNull InstructionDataMergeStrategy instructionDataMergeStrategy + ) { Map> edgesMap = Maps.newLinkedHashMap(); initializeEdgesMap(pseudocode, lookInside, edgesMap, initialDataValue); @@ -103,13 +107,15 @@ public class PseudocodeTraverser { } private static void collectDataFromSubgraph( - @NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, - LookInsideStrategy lookInside, + @NotNull Pseudocode pseudocode, + @NotNull TraversalOrder traversalOrder, + @NotNull LookInsideStrategy lookInside, @NotNull Map> edgesMap, @NotNull InstructionDataMergeStrategy instructionDataMergeStrategy, @NotNull Collection previousSubGraphInstructions, - boolean[] changed, boolean isLocal) { - + boolean[] changed, + boolean isLocal + ) { List instructions = getInstructions(pseudocode, traversalOrder); Instruction startInstruction = getStartInstruction(pseudocode, traversalOrder); @@ -131,8 +137,7 @@ public class PseudocodeTraverser { if (shouldLookInside(instruction, lookInside)) { Pseudocode subroutinePseudocode = ((LocalFunctionDeclarationInstruction) instruction).getBody(); collectDataFromSubgraph(subroutinePseudocode, traversalOrder, lookInside, edgesMap, instructionDataMergeStrategy, - previousInstructions, - changed, true); + previousInstructions, changed, true); Instruction lastInstruction = getLastInstruction(subroutinePseudocode, traversalOrder); Edges previousValue = edgesMap.get(instruction); Edges newValue = edgesMap.get(lastInstruction); @@ -161,9 +166,10 @@ public class PseudocodeTraverser { } public static void traverse( - @NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, - InstructionAnalyzeStrategy instructionAnalyzeStrategy) { - + @NotNull Pseudocode pseudocode, + @NotNull TraversalOrder traversalOrder, + @NotNull InstructionAnalyzeStrategy instructionAnalyzeStrategy + ) { List instructions = getInstructions(pseudocode, traversalOrder); for (Instruction instruction : instructions) { if (instruction instanceof LocalFunctionDeclarationInstruction) {