diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-10-13 20:11:11 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-10-13 20:11:11 +0000 |
| commit | b8c7f6f8b46422bdb718c538569c5a8517705edb (patch) | |
| tree | f0d9d30ea1f3bd8ffc893d30d4826ab87942140b | |
| parent | 91f59159f8768bb7ff34155a97c568076f2da675 (diff) | |
| download | scala-b8c7f6f8b46422bdb718c538569c5a8517705edb.tar.gz scala-b8c7f6f8b46422bdb718c538569c5a8517705edb.tar.bz2 scala-b8c7f6f8b46422bdb718c538569c5a8517705edb.zip | |
Merged revisions 23246 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r23246 | odersky | 2010-10-13 21:01:25 +0200 (Wed, 13 Oct 2010) | 1 line
Closes #3894. Review by dubochet.
........
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 8 |
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 da818e7cea..5c448349cb 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -463,10 +463,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() = { |