diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2010-05-02 17:42:06 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2010-05-02 17:42:06 +0000 |
| commit | a46601aa3e998f86ba015c338ac4a278267e13b0 (patch) | |
| tree | d875cdcc7362d710807ff383b71aa87d3a9fe17e | |
| parent | 3c2edb472a20e27ecfaf3315d00b71733d140e87 (diff) | |
| download | scala-a46601aa3e998f86ba015c338ac4a278267e13b0.tar.gz scala-a46601aa3e998f86ba015c338ac4a278267e13b0.tar.bz2 scala-a46601aa3e998f86ba015c338ac4a278267e13b0.zip | |
Closes #3382. no review.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Duplicators.scala | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala index de9318d6b6..7096a38531 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala @@ -113,12 +113,10 @@ abstract class Duplicators extends Analyzer { val tpe1 = envSubstitution(tpe) log("tpe1: " + tpe1) val tpe2: Type = (new FixInvalidSyms)(tpe1) - val tpe3 = tpe2 match { - case TypeRef(_, sym, _) if (sym.owner == oldClassOwner) => - log("seeing " + sym.fullName + " from a different angle") - tpe2.asSeenFrom(newClassOwner.thisType, oldClassOwner) - case _ => tpe2 - } + val tpe3 = if (newClassOwner ne null) { + log("seeing it from a different angle: " + tpe2 + " nco: " + newClassOwner + " oco: " + oldClassOwner) + tpe2.asSeenFrom(newClassOwner.thisType, oldClassOwner) + } else tpe2 log("tpe2: " + tpe3) tpe3 } |