Reuse extraArgs logic for dotc and scalac.

Author: olafurpg

compilation/src/main/dotc/scala/tools/benchmark/BenchmarkDriver.scala

@@ -16,8 +16,7 @@ trait BenchmarkDriver extends BaseBenchmarkDriver {
     ctx.setSetting(ctx.settings.d, tempDir.getAbsolutePath)
     ctx.setSetting(ctx.settings.language, List("Scala2"))
     val compiler = new dotty.tools.dotc.Compiler
-    val args = compilerArgs ++ sourceFiles
-    val reporter = dotty.tools.dotc.Bench.doCompile(compiler, args)
+    val reporter = dotty.tools.dotc.Bench.doCompile(compiler, allArgs)
     assert(!reporter.hasErrors)
   }
 }

compilation/src/main/scala/scala/tools/nsc/ScalacBenchmark.scala

@@ -17,6 +17,8 @@ import scala.tools.benchmark.BenchmarkDriver
 trait BaseBenchmarkDriver {
   def source: String
   def extraArgs: String
+  def extras: List[String] = if (extraArgs != null && extraArgs != "") extraArgs.split('|').toList else Nil
+  def allArgs: List[String] = compilerArgs ++ extras ++ sourceFiles
   def corpusVersion: String
   def depsClasspath: String
   def tempDir: File

compilation/src/main/scalac/scala/tools/benchmark/BenchmarkDriver.scala

@@ -28,9 +28,6 @@ trait BenchmarkDriver extends BaseBenchmarkDriver {
       }
     }
     val driver = new MainClass
-
-    val extras = if (extraArgs != null && extraArgs != "") extraArgs.split('|').toList else Nil
-    val allArgs = compilerArgs ++ extras ++ sourceFiles
     driver.process(allArgs.toArray)
     assert(!driver.reporter.hasErrors)
   }