From 541a6692c2b4124491fa43fe3a1455c9cf7d7042 Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Wed, 21 Dec 2011 14:25:55 +0100 Subject: Made -Ystop-after:parser work correctly Without this fix running a compiler with the aforementioned option leads to a crash (because namerPhase gets resolved to a NoPhase). --- src/compiler/scala/tools/nsc/Global.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index f14474eda8..90b4da8c9a 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1201,8 +1201,10 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb perRunCaches.clearAll() // Reset project - atPhase(namerPhase) { - resetProjectClasses(definitions.RootClass) + if (!stopPhase("namer")) { + atPhase(namerPhase) { + resetProjectClasses(definitions.RootClass) + } } } -- cgit v1.2.3