diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-04-14 10:33:10 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-04-14 11:33:56 +0200 |
| commit | 0ba3d542cc236ab2dbed3dc551920ede94787a0c (patch) | |
| tree | 9e7e6e0c26a8d2f8e5b62fbf2a609349acbd8855 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 3a2901da406f2478b5634b0636e56de9c4cd676d (diff) | |
| download | scala-0ba3d542cc236ab2dbed3dc551920ede94787a0c.tar.gz scala-0ba3d542cc236ab2dbed3dc551920ede94787a0c.tar.bz2 scala-0ba3d542cc236ab2dbed3dc551920ede94787a0c.zip | |
restores some disabled macro tests, makes checkFeature synchronous when used for macros
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index b4e0ad6edf..4fb9362ccc 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -166,7 +166,7 @@ trait Implicits { } def isCyclicOrErroneous = - try containsError(tpe) + try sym.hasFlag(LOCKED) || containsError(tpe) catch { case _: CyclicReference => true } var useCountArg: Int = 0 |