diff options
| author | mihaylov <mihaylov@epfl.ch> | 2007-09-02 22:22:22 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2007-09-02 22:22:22 +0000 |
| commit | dfa2cf1c11dc1d787b2147cf53608291fcf13ca7 (patch) | |
| tree | d1d837d655ad7451a38d26ba9af03884d98e552c /src | |
| parent | 2e1e65ee5b7d50cf155784bdb6c2c76ad91278c4 (diff) | |
| download | scala-dfa2cf1c11dc1d787b2147cf53608291fcf13ca7.tar.gz scala-dfa2cf1c11dc1d787b2147cf53608291fcf13ca7.tar.bz2 scala-dfa2cf1c11dc1d787b2147cf53608291fcf13ca7.zip | |
Use jcl.LinkedHashSet instead of the deprecated...
Use jcl.LinkedHashSet instead of the deprecated mutable.LinkedHashSet
Diffstat (limited to 'src')
3 files changed, 6 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala index c95f392e9d..f02dfa07f5 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala @@ -8,7 +8,8 @@ package scala.tools.nsc.backend.icode //import scala.tools.nsc.ast._ -import scala.collection.mutable.{Map, Set, LinkedHashSet} +import scala.collection.mutable.{Map, Set} +import scala.collection.jcl.LinkedHashSet import scala.tools.nsc.util.{Position,NoPosition} import scala.tools.nsc.backend.icode.analysis.ProgramPoint diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala index 7a3e858baa..e8c4436f74 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala @@ -7,7 +7,7 @@ package scala.tools.nsc.backend.icode.analysis -import scala.collection.mutable.{Map, HashMap, Set, HashSet, LinkedHashSet} +import scala.collection.jcl.{Map, HashMap, Set, HashSet, LinkedHashSet} /** A generic framework for data flow analysis. */ @@ -18,8 +18,8 @@ trait DataFlowAnalysis[L <: CompleteLattice] { val worklist: Set[P] = new LinkedHashSet - val in: Map[P, lattice.Elem] = new collection.jcl.HashMap - val out: Map[P, lattice.Elem] = new collection.jcl.HashMap + val in: Map[P, lattice.Elem] = new HashMap + val out: Map[P, lattice.Elem] = new HashMap val visited: HashSet[P] = new HashSet /* Implement this function to initialize the worklist. */ diff --git a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala index d8a25f2bbb..dd66c557ce 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala @@ -57,7 +57,7 @@ abstract class DeadCodeElimination extends SubComponent { var defs: Map[(BasicBlock, Int), Set[rdef.lattice.Definition]] = HashMap.empty /** Useful instructions which have not been scanned yet. */ - val worklist: mutable.Set[(BasicBlock, Int)] = new mutable.LinkedHashSet + val worklist: mutable.Set[(BasicBlock, Int)] = new jcl.LinkedHashSet /** what instructions have been marked as useful? */ val useful: mutable.Map[BasicBlock, mutable.BitSet] = new mutable.HashMap |