Index: vm/jitrino/src/optimizer/FlowGraph.h =================================================================== --- vm/jitrino/src/optimizer/FlowGraph.h (revision 479923) +++ vm/jitrino/src/optimizer/FlowGraph.h (working copy) @@ -59,7 +59,7 @@ // from block. static void foldBranch(ControlFlowGraph& fg, BranchInst* br, bool isTaken); - static void foldSwitch(ControlFlowGraph& fg, Node* block, SwitchInst* sw, uint32 target); + static void foldSwitch(ControlFlowGraph& fg, SwitchInst* sw, uint32 target); // Eliminates the check at the end of block and the associated exception // edge. If (alwaysThrows), then eliminates the non-exception edge instead; Index: vm/jitrino/src/optimizer/simplifier.cpp =================================================================== --- vm/jitrino/src/optimizer/simplifier.cpp (revision 479923) +++ vm/jitrino/src/optimizer/simplifier.cpp (working copy) @@ -3827,7 +3827,7 @@ void SimplifierWithInstFactory::foldSwitch(SwitchInst* switchInst, uint32 index) { - FlowGraph::foldSwitch(flowGraph, currentCfgNode,switchInst,index); + FlowGraph::foldSwitch(flowGraph, switchInst,index); } Index: vm/jitrino/src/optimizer/FlowGraph.cpp =================================================================== --- vm/jitrino/src/optimizer/FlowGraph.cpp (revision 479923) +++ vm/jitrino/src/optimizer/FlowGraph.cpp (working copy) @@ -76,8 +76,9 @@ } void -FlowGraph::foldSwitch(ControlFlowGraph& fg, Node* block, SwitchInst* sw, uint32 index) +FlowGraph::foldSwitch(ControlFlowGraph& fg, SwitchInst* sw, uint32 index) { + Node* block = sw->getNode(); assert(sw == block->getLastInst()); LabelInst* target; if(index < sw->getNumTargets())