summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-05-28 05:29:27 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-05-28 05:29:27 -0700
commit3f290baa0fdd5e8a34dba698ba6d0b642a71d75d (patch)
tree186008d82541cad2b4d069e0d3d41892b3f2aada /src/compiler
parent6da73dd38d6dd7d8b463520bf54fc79975afc2a0 (diff)
parent8d4ce1da77bd6bf4a2311c9e30bd815a9aedae1b (diff)
downloadscala-3f290baa0fdd5e8a34dba698ba6d0b642a71d75d.tar.gz
scala-3f290baa0fdd5e8a34dba698ba6d0b642a71d75d.tar.bz2
scala-3f290baa0fdd5e8a34dba698ba6d0b642a71d75d.zip
Merge pull request #636 from retronym/ticket/5845
SI-5845 Advances the example from a crasher to an inference failure.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/reflect/internal/Types.scala2
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 cfc45695a7..67c858356c 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -4318,7 +4318,7 @@ trait Types extends api.Types { self: SymbolTable =>
def throwError = abort("" + tp + sym.locationString + " cannot be instantiated from " + pre.widen)
val symclazz = sym.owner
- if (symclazz == clazz && !pre.isInstanceOf[TypeVar] && (pre.widen.typeSymbol isNonBottomSubClass symclazz)) {
+ if (symclazz == clazz && !pre.widen.isInstanceOf[TypeVar] && (pre.widen.typeSymbol isNonBottomSubClass symclazz)) {
// have to deconst because it may be a Class[T].
pre.baseType(symclazz).deconst match {
case TypeRef(_, basesym, baseargs) =>