summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-06-05 15:40:48 +0000
committerPaul Phillips <paulp@improving.org>2010-06-05 15:40:48 +0000
commit5440040432585e9f5d5daaa3a04c2004d25da725 (patch)
tree97c7b2618e03a125b439ecc06b4bd9fe67580517 /src/compiler
parentd3a747882c0332dd1316c31c500f983268bd8c8b (diff)
downloadscala-5440040432585e9f5d5daaa3a04c2004d25da725.tar.gz
scala-5440040432585e9f5d5daaa3a04c2004d25da725.tar.bz2
scala-5440040432585e9f5d5daaa3a04c2004d25da725.zip
Patch from Jason Zaugg so singleton types aren'...
Patch from Jason Zaugg so singleton types aren't accidentally deprived of a fourth try at satisfaction. Already reviewed by odersky, so no review.
Diffstat (limited to 'src/compiler')
-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 e0987c2d8b..c291a391ca 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -4347,7 +4347,7 @@ A type's typeSymbol should never be inspected directly.
if (sym2 == NotNullClass)
tp1.isNotNull
else if (sym2 == SingletonClass)
- tp1.isStable
+ tp1.isStable || fourthTry
else if (isRaw(sym2, tp2.args))
isSubType(tp1, rawToExistential(tp2), depth)
else if (sym2.name == nme.REFINE_CLASS_NAME.toTypeName)