From 0626225ea543a36917f7249854536bc10f5e9d75 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Fri, 14 Dec 2012 18:36:25 +0400 Subject: [PATCH] removed always true 'lookInside' parameter --- .../jetbrains/jet/lang/cfg/JetFlowInformationProvider.java | 4 ++-- .../src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java index 74de8a05827..a53db9604ed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java @@ -198,7 +198,7 @@ public class JetFlowInformationProvider { final Map reportedDiagnosticMap = Maps.newHashMap(); - PseudocodeTraverser.traverse(pseudocode, FORWARD, true, initializers, new InstructionDataAnalyzeStrategy>() { + PseudocodeTraverser.traverse(pseudocode, FORWARD, initializers, new InstructionDataAnalyzeStrategy>() { @Override public void execute(@NotNull Instruction instruction, @Nullable Map in, @@ -505,7 +505,7 @@ public class JetFlowInformationProvider { } } }; - PseudocodeTraverser.traverse(pseudocode, BACKWARD, true, variableStatusData, variableStatusAnalyzeStrategy); + PseudocodeTraverser.traverse(pseudocode, BACKWARD, variableStatusData, variableStatusAnalyzeStrategy); } //////////////////////////////////////////////////////////////////////////////// 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 ccef1e730a0..5b43f99fdb7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeTraverser.java @@ -169,14 +169,14 @@ public class PseudocodeTraverser { } public static void traverse( - @NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, boolean lookInside, + @NotNull Pseudocode pseudocode, TraversalOrder traversalOrder, @NotNull Map> edgesMap, @NotNull InstructionDataAnalyzeStrategy instructionDataAnalyzeStrategy) { List instructions = getInstructions(pseudocode, traversalOrder); for (Instruction instruction : instructions) { - if (lookInside && instruction instanceof LocalDeclarationInstruction) { - traverse(((LocalDeclarationInstruction) instruction).getBody(), traversalOrder, lookInside, edgesMap, + if (instruction instanceof LocalDeclarationInstruction) { + traverse(((LocalDeclarationInstruction) instruction).getBody(), traversalOrder, edgesMap, instructionDataAnalyzeStrategy); } Edges edges = edgesMap.get(instruction);