diff options
| author | Paul Phillips <paulp@improving.org> | 2011-03-02 02:55:44 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-03-02 02:55:44 +0000 |
| commit | e465571a4e1dcdd76d888da1e93108e0ee71ce85 (patch) | |
| tree | 68080d88adc17b8c8b7962719e0d851bfa60a2e6 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | e42733e9fe1f3af591976fbb48b66035253d85b9 (diff) | |
| download | scala-e465571a4e1dcdd76d888da1e93108e0ee71ce85.tar.gz scala-e465571a4e1dcdd76d888da1e93108e0ee71ce85.tar.bz2 scala-e465571a4e1dcdd76d888da1e93108e0ee71ce85.zip | |
Added cycle detection to getParts.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 6d36c77b28..655e5dfe09 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -724,11 +724,15 @@ trait Implicits { */ private def companionImplicits(tp: Type): Infoss = { val partMap = new LinkedHashMap[Symbol, Type] + val seen = mutable.HashSet[Type]() // cycle detection /** Enter all parts of `tp` into `parts` set. * This method is performance critical: about 2-4% of all type checking is spent here */ def getParts(tp: Type) { + if (seen(tp)) + return + seen += tp tp match { case TypeRef(pre, sym, args) => if (sym.isClass) { |