diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala index b57bb2df16..4267b5c95e 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala @@ -84,13 +84,15 @@ trait BasicBlocks { override def toList: List[Instruction] = { if (closed && touched) - instructionList = List.fromArray(instrs) + instructionList = instrs.toList instructionList } /** Return an iterator over the instructions in this basic block. */ - def elements: Iterator[Instruction] = - if (closed) instrs.elements else instructionList.reverse.elements + def iterator: Iterator[Instruction] = + if (closed) instrs.iterator else instructionList.reverse.iterator + + @deprecated def elements = iterator /** return the underlying array of instructions */ def getArray: Array[Instruction] = { @@ -436,7 +438,7 @@ trait BasicBlocks { * in different code 'chunks' than the rest of the method. */ def predecessors: List[BasicBlock] = { - preds = code.blocks.elements.filter (_.successors.contains(this)).toList + preds = code.blocks.iterator.filter (_.successors.contains(this)).toList preds } |