Merge pull request #399 from smarter/fix/ctxReset

DarkDimius · DarkDimius · commit 8195baf78b33 · 2015-03-10T18:59:22.000+01:00
Compiler#newRun: reset the context _before_ initializing a new run
diff --git a/src/dotty/tools/dotc/Compiler.scala b/src/dotty/tools/dotc/Compiler.scala
@@ -104,10 +104,8 @@ class Compiler {
   }
 
   def newRun(implicit ctx: Context): Run = {
-    try new Run(this)(rootContext)
-    finally {
-      ctx.base.reset()
-      ctx.runInfo.clear()
-    }
+    ctx.base.reset()
+    ctx.runInfo.clear()
+    new Run(this)(rootContext)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,8 @@ class Compiler {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`def newRun(implicit ctx: Context): Run = {`
`107`		`- try new Run(this)(rootContext)`
`108`		`- finally {`
`109`		`- ctx.base.reset()`
`110`		`- ctx.runInfo.clear()`
`111`		`- }`
	`107`	`+ ctx.base.reset()`
	`108`	`+ ctx.runInfo.clear()`
	`109`	`+ new Run(this)(rootContext)`
`112`	`110`	`}`
`113`	`111`	`}`