diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-05 10:04:26 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-01-31 22:10:01 +0100 |
| commit | 502424684ac04a69480973af4fa82286f71a6d1c (patch) | |
| tree | 866b0d329508a7c88851d0e4e814bd4f201f11bb /src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | |
| parent | a6f2704619a1f724693b456dadcb1836e2f71328 (diff) | |
| download | scala-502424684ac04a69480973af4fa82286f71a6d1c.tar.gz scala-502424684ac04a69480973af4fa82286f71a6d1c.tar.bz2 scala-502424684ac04a69480973af4fa82286f71a6d1c.zip | |
Optimize the pickler phase
- move "erroneous type" diagnostic into a crash recovery handler,
rather than running it proactively
- move the "unexpanded macros" check into refchecks.
Cuts this phase in half, from about 1% of compile time to 0.5%.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/RefChecks.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 68d724b6fc..f7684b93af 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -1596,6 +1596,10 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans } } + private def checkUnexpandedMacro(t: Tree) = + if (!t.isDef && t.hasSymbolField && t.symbol.isTermMacro) + unit.error(t.pos, "macro has not been expanded") + override def transform(tree: Tree): Tree = { val savedLocalTyper = localTyper val savedCurrentApplication = currentApplication @@ -1755,6 +1759,9 @@ abstract class RefChecks extends InfoTransform with scala.reflect.internal.trans varianceValidator.traverse(tt.original) // See SI-7872 case _ => } + + checkUnexpandedMacro(result) + result } catch { case ex: TypeError => |