diff options
author | Paul Phillips <paulp@improving.org> | 2011-11-18 22:23:08 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-11-18 22:23:08 +0000 |
commit | 7eb6f102e8e3bf90319e0339938d7e6eb5aaea43 (patch) | |
tree | bad7b8847580310d33fa1515dc7a8feee38cfb3b /src | |
parent | 47c9911a12ac03f6b2bba72016b6d79847198797 (diff) | |
download | scala-7eb6f102e8e3bf90319e0339938d7e6eb5aaea43.tar.gz scala-7eb6f102e8e3bf90319e0339938d7e6eb5aaea43.tar.bz2 scala-7eb6f102e8e3bf90319e0339938d7e6eb5aaea43.zip |
Fix for unfortunate thinko recently introduced.
Many thanks to Jordi Salvat i Alabart for catching this. Universal
equality is a formidable foe when it comes to avoiding this kind of
mistake. Closes SI-5206, no review.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/reflect/internal/Types.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index c8d7cb3a1e..7322eec1df 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -2916,7 +2916,7 @@ A type's typeSymbol should never be inspected directly. // Optimization to avoid creating unnecessary new typerefs. def copyTypeRef(tp: Type, pre: Type, sym: Symbol, args: List[Type]): Type = tp match { - case TypeRef(pre0, sym0, _) if (pre0 eq sym0) && sym0.name == sym.name => + case TypeRef(pre0, sym0, _) if pre == pre0 && sym0.name == sym.name => if (sym.isAliasType && sameLength(sym.info.typeParams, args) && !sym.lockOK) throw new TypeError("illegal cyclic reference involving " + sym) |