summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-11-07 11:26:03 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-11-07 21:41:42 +1000
commitb8f7fbee940856173dd19afddcd689495313c4cf (patch)
treea066ac526d80c7141f3e0e89e3ec651b415347e5 /src
parentced9e167d9d2c9016e76b6db94ceea7335d37bf2 (diff)
downloadscala-b8f7fbee940856173dd19afddcd689495313c4cf.tar.gz
scala-b8f7fbee940856173dd19afddcd689495313c4cf.tar.bz2
scala-b8f7fbee940856173dd19afddcd689495313c4cf.zip
SI-8965 Account for corner case in "unrelated types" warning
It's okay for the two types to LUB to something above `Object` if they both individially were its supertype.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/RefChecks.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index af4e9e8927..4ab6f416d2 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -1095,7 +1095,7 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans
// better to have lubbed and lost
def warnIfLubless(): Unit = {
val common = global.lub(List(actual.tpe, receiver.tpe))
- if (ObjectTpe <:< common)
+ if (ObjectTpe <:< common && !(ObjectTpe <:< actual.tpe && ObjectTpe <:< receiver.tpe))
unrelatedTypes()
}
// warn if actual has a case parent that is not same as receiver's;