summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2009-08-13 08:37:29 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2009-08-13 08:37:29 +0000
commitabc5b5f47f4bb963e229cb90a6ff93152ee09a98 (patch)
tree91ce7d7d7da87a069b62ab2647cea99b568c55e6 /src
parent2416d5724eb7fba3ed5b80092194a27e333a23f3 (diff)
downloadscala-abc5b5f47f4bb963e229cb90a6ff93152ee09a98.tar.gz
scala-abc5b5f47f4bb963e229cb90a6ff93152ee09a98.tar.bz2
scala-abc5b5f47f4bb963e229cb90a6ff93152ee09a98.zip
fixed #2251
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Types.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index 6f945b23e5..6d54594a60 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -4576,12 +4576,13 @@ A type's typeSymbol should never be inspected directly.
val l = lub(as, decr(depth))
val g = glb(as, decr(depth))
if (l <:< g) l
- else {
+ else if(!(tparam.info.bounds contains tparam)){ //@M can't deal with f-bounds, see #2251
val owner = commonOwner(as)
val qvar = makeFreshExistential("", commonOwner(as), mkTypeBounds(g, l))
capturedParams += qvar
qvar.tpe
}
+ else NoType
}
}
try {