diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index ea7f9d447d..592d95fd2e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -301,9 +301,7 @@ trait Typers { self: Analyzer => def checkNonCyclic(pos: Position, tp: Type): Boolean = { def checkNotLocked(sym: Symbol): Boolean = { sym.initialize - if (sym hasFlag LOCKED) { - error(pos, "cyclic aliasing or subtyping involving "+sym); false - } else true + sym.lockOK || {error(pos, "cyclic aliasing or subtyping involving "+sym); false} } tp match { case TypeRef(pre, sym, args) => @@ -332,9 +330,11 @@ trait Typers { self: Analyzer => } def checkNonCyclic(pos: Position, tp: Type, lockedSym: Symbol): Boolean = { - lockedSym.setFlag(LOCKED) + lockedSym.lock { + throw new TypeError("illegal cyclic reference involving " + lockedSym) + } val result = checkNonCyclic(pos, tp) - lockedSym.resetFlag(LOCKED) + lockedSym.unlock() result } |