bufferedReporting as requested

scala · Feb 15, 2018 · 7c45bd8 · 7c45bd8
1 parent 32bea17
commit 7c45bd8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GeneratedClassHandler.scala b/src/compiler/scala/tools/nsc/backend/jvm/GeneratedClassHandler.scala
@@ -105,7 +105,7 @@ private[jvm] object GeneratedClassHandler {
 
     final def postProcessUnit(unitInPostProcess: CompilationUnitInPostProcess): Unit = {
       unitInPostProcess.task = Future {
-        frontendAccess.withThreadLocalReporter(unitInPostProcess) {
+        frontendAccess.withThreadLocalReporter(unitInPostProcess.bufferedReporting) {
           // we 'take' classes to reduce the memory pressure
           // as soon as the class is consumed and written, we release its data
           unitInPostProcess.takeClasses() foreach {
@@ -149,7 +149,7 @@ private[jvm] object GeneratedClassHandler {
       takeProcessingUnits().foreach { unitInPostProcess =>
         try {
           stealWhileWaiting(unitInPostProcess)
-          unitInPostProcess.relayReports(directBackendReporting)
+          unitInPostProcess.bufferedReporting.relayReports(directBackendReporting)
           // We know the future is complete, throw the exception if it completed with a failure
           unitInPostProcess.task.value.get.get
         } catch {
@@ -200,7 +200,7 @@ sealed trait CompilationUnitPaths {
 final class CompilationUnitInPostProcess(
   private var classes: List[GeneratedClass],
   val sourceFile: AbstractFile,
-  val outputDir: AbstractFile) extends CompilationUnitPaths with BufferingBackendReporting {
+  val outputDir: AbstractFile) extends CompilationUnitPaths {
   def takeClasses(): List[GeneratedClass] = {
     val c = classes
     classes = Nil
@@ -209,4 +209,6 @@ final class CompilationUnitInPostProcess(
 
   /** the main async task submitted onto the scheduler */
   var task: Future[Unit] = _
+
+  val bufferedReporting = new BufferingBackendReporting
 }
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/PostProcessorFrontendAccess.scala b/src/compiler/scala/tools/nsc/backend/jvm/PostProcessorFrontendAccess.scala
@@ -89,7 +89,7 @@ object PostProcessorFrontendAccess {
     def log(message: String): Unit
   }
 
-  trait BufferingBackendReporting extends BackendReporting {
+  final class BufferingBackendReporting extends BackendReporting {
     // We optimise access to the buffered reports for the common case - that there are no warning/errors to report
     // We could use a listBuffer etc - but that would be extra allocation in the common case
     // Note - all access is externally synchronized, as this allow the reports to be generated in on thread and