summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2010-10-13 19:01:25 +0000
committerMartin Odersky <odersky@gmail.com>2010-10-13 19:01:25 +0000
commitd9e7e347c74a5c89b5594254ddfccf5dd7e9377c (patch)
tree4137f532a9335f4d10efb473793787a211bc537e /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
parent15f4e9fc9bab8a7d4e2240dd2eb47d4f63c63c04 (diff)
downloadscala-d9e7e347c74a5c89b5594254ddfccf5dd7e9377c.tar.gz
scala-d9e7e347c74a5c89b5594254ddfccf5dd7e9377c.tar.bz2
scala-d9e7e347c74a5c89b5594254ddfccf5dd7e9377c.zip
Closes #3894. Review by dubochet.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/RefChecks.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index 08fb0438de..7ea2aeec45 100644
--- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
@@ -476,10 +476,10 @@ abstract class RefChecks extends InfoTransform {
})
def ignoreDeferred(member: Symbol) =
- (currentRun.erasurePhase != NoPhase) && ( // the test requires atPhase(erasurePhase.next) so shouldn't be done if the compiler has no erasure phase available
- isAbstractTypeWithoutFBound(member) ||
- (member.isJavaDefined && javaErasedOverridingSym(member) != NoSymbol)
- )
+ isAbstractTypeWithoutFBound(member) ||
+ (member.isJavaDefined &&
+ (currentRun.erasurePhase == NoPhase || // the test requires atPhase(erasurePhase.next) so shouldn't be done if the compiler has no erasure phase available
+ javaErasedOverridingSym(member) != NoSymbol))
// 2. Check that only abstract classes have deferred members
def checkNoAbstractMembers() = {