summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-03-07 07:54:48 +0000
committerMartin Odersky <odersky@gmail.com>2011-03-07 07:54:48 +0000
commit2edab8991bc07ce0eecb3a85d8317e31f98df840 (patch)
tree53d44728bf4af30631b2635dd0f3a9efd66edfc3 /src
parent1ff7cd53e3045a62f2bea37a83b4dbc37ee380e9 (diff)
downloadscala-2edab8991bc07ce0eecb3a85d8317e31f98df840.tar.gz
scala-2edab8991bc07ce0eecb3a85d8317e31f98df840.tar.bz2
scala-2edab8991bc07ce0eecb3a85d8317e31f98df840.zip
Closes #3987. Review by extempore.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Types.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index 17898393ed..8cc977fa65 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -4557,7 +4557,7 @@ A type's typeSymbol should never be inspected directly.
val pre1 = tr1.pre
val pre2 = tr2.pre
(((if (sym1 == sym2) phase.erasedTypes || pre1 <:< pre2
- else (sym1.name == sym2.name &&
+ else (sym1.name == sym2.name && !sym1.isModuleClass && !sym2.isModuleClass &&
(isUnifiable(pre1, pre2) || isSameSpecializedSkolem(sym1, sym2, pre1, pre2)))) &&
isSubArgs(tr1.args, tr2.args, sym1.typeParams))
||