Skip to content

Commit e8d748e

Browse files
smartersmarter
authored
Merge pull request #10607 from adpi2/sbt-bridge
2 parents dbc1186 + ef81ccf commit e8d748e

37 files changed

+718
-351
lines changed

‎bench/src/main/scala/Benchmarks.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import scala.collection.JavaConverters._
1717
import scala.io.Source
1818
import scala.util.Using
1919

20+
import dotty.tools.io.AbstractFile
21+
2022
object Bench {
2123
val COMPILE_OPTS_FILE = "compile.txt"
2224

@@ -93,11 +95,11 @@ class CompilerOptions {
9395

9496
class Worker extends Driver {
9597
// override to avoid printing summary information
96-
override def doCompile(compiler: Compiler, fileNames: List[String])(implicit ctx: Context): Reporter =
97-
if (fileNames.nonEmpty)
98+
override def doCompile(compiler: Compiler, files: List[AbstractFile])(implicit ctx: Context): Reporter =
99+
if (files.nonEmpty)
98100
try {
99101
val run = compiler.newRun
100-
run.compile(fileNames)
102+
run.compile(files)
101103
ctx.reporter
102104
}
103105
catch {

‎compiler/src/dotty/tools/dotc/Bench.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dotc
33

44
import core.Contexts._
55
import reporting.Reporter
6+
import io.AbstractFile
67

78
import scala.annotation.internal.sharable
89

@@ -19,12 +20,12 @@ object Bench extends Driver:
1920

2021
@sharable private var times: Array[Int] = _
2122

22-
override def doCompile(compiler: Compiler, fileNames: List[String])(using Context): Reporter =
23+
override def doCompile(compiler: Compiler, files: List[AbstractFile])(using Context): Reporter =
2324
times = new Array[Int](numRuns)
2425
var reporter: Reporter = emptyReporter
2526
for i <- 0 until numRuns do
2627
val start = System.nanoTime()
27-
reporter = super.doCompile(compiler, fileNames)
28+
reporter = super.doCompile(compiler, files)
2829
times(i) = ((System.nanoTime - start) / 1000000).toInt
2930
println(s"time elapsed: ${times(i)}ms")
3031
if ctx.settings.Xprompt.value then

‎compiler/src/dotty/tools/dotc/Driver.scala

Lines changed: 49 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import core.Contexts._
99
import core.{MacroClassLoader, Mode, TypeError}
1010
import core.StdNames.nme
1111
import dotty.tools.dotc.ast.Positioned
12-
import dotty.tools.io.File
12+
import dotty.tools.io.AbstractFile
1313
import reporting._
1414
import core.Decorators._
1515
import config.Feature
16+
import util.SourceFile
1617

1718
import scala.util.control.NonFatal
1819
import fromtasty.{TASTYCompiler, TastyFileUtil}
@@ -31,41 +32,39 @@ class Driver {
3132

3233
protected def emptyReporter: Reporter = new StoreReporter(null)
3334

34-
protected def doCompile(compiler: Compiler, fileNames: List[String])(using Context): Reporter =
35-
if (fileNames.nonEmpty)
35+
protected def doCompile(compiler: Compiler, files: List[AbstractFile])(using Context): Reporter =
36+
if files.nonEmpty then
3637
try
3738
val run = compiler.newRun
38-
run.compile(fileNames)
39-
40-
def finish(run: Run)(using Context): Unit =
41-
run.printSummary()
42-
if !ctx.reporter.errorsReported && run.suspendedUnits.nonEmpty then
43-
val suspendedUnits = run.suspendedUnits.toList
44-
if (ctx.settings.XprintSuspension.value)
45-
report.echo(i"compiling suspended $suspendedUnits%, %")
46-
val run1 = compiler.newRun
47-
for unit <- suspendedUnits do unit.suspended = false
48-
run1.compileUnits(suspendedUnits)
49-
finish(run1)(using MacroClassLoader.init(ctx.fresh))
50-
51-
finish(run)
39+
run.compile(files)
40+
finish(compiler, run)
5241
catch
53-
case ex: FatalError =>
42+
case ex: FatalError =>
5443
report.error(ex.getMessage) // signals that we should fail compilation.
5544
case ex: TypeError =>
56-
println(s"${ex.toMessage} while compiling ${fileNames.mkString(", ")}")
45+
println(s"${ex.toMessage} while compiling ${files.map(_.path).mkString(", ")}")
5746
throw ex
5847
case ex: Throwable =>
59-
println(s"$ex while compiling ${fileNames.mkString(", ")}")
48+
println(s"$ex while compiling ${files.map(_.path).mkString(", ")}")
6049
throw ex
6150
ctx.reporter
62-
end doCompile
51+
52+
protected def finish(compiler: Compiler, run: Run)(using Context): Unit =
53+
run.printSummary()
54+
if !ctx.reporter.errorsReported && run.suspendedUnits.nonEmpty then
55+
val suspendedUnits = run.suspendedUnits.toList
56+
if (ctx.settings.XprintSuspension.value)
57+
report.echo(i"compiling suspended $suspendedUnits%, %")
58+
val run1 = compiler.newRun
59+
for unit <- suspendedUnits do unit.suspended = false
60+
run1.compileUnits(suspendedUnits)
61+
finish(compiler, run1)(using MacroClassLoader.init(ctx.fresh))
6362

6463
protected def initCtx: Context = (new ContextBase).initialCtx
6564

6665
protected def sourcesRequired: Boolean = true
6766

68-
def setup(args: Array[String], rootCtx: Context): (List[String], Context) = {
67+
def setup(args: Array[String], rootCtx: Context): (List[AbstractFile], Context) = {
6968
val ictx = rootCtx.fresh
7069
val summary = CompilerCommand.distill(args)(using ictx)
7170
ictx.setSettings(summary.sstate)
@@ -76,43 +75,37 @@ class Driver {
7675
if !ctx.settings.YdropComments.value || ctx.mode.is(Mode.ReadComments) then
7776
ictx.setProperty(ContextDoc, new ContextDocstrings)
7877
val fileNames = CompilerCommand.checkUsage(summary, sourcesRequired)
79-
fromTastySetup(fileNames, ctx)
78+
val files = fileNames.map(ctx.getFile)
79+
(files, fromTastySetup(files))
8080
}
8181
}
8282

83-
/** Setup extra classpath and figure out class names for tasty file inputs */
84-
protected def fromTastySetup(fileNames0: List[String], ctx0: Context): (List[String], Context) =
85-
given Context = ctx0
86-
if (ctx0.settings.fromTasty.value) {
87-
val fromTastyIgnoreList = ctx0.settings.YfromTastyIgnoreList.value.toSet
88-
// Resolve classpath and class names of tasty files
89-
val (classPaths, classNames) = fileNames0.flatMap { name =>
90-
val path = Paths.get(name)
91-
if !Files.exists(path) then
92-
report.error(s"File does not exist: $name")
93-
Nil
94-
else if name.endsWith(".jar") then
95-
new dotty.tools.io.Jar(File(name)).toList.collect {
96-
case e if e.getName.endsWith(".tasty") && !fromTastyIgnoreList(e.getName) =>
97-
(name, e.getName.stripSuffix(".tasty").replace("/", "."))
98-
}
99-
else if name.endsWith(".tasty") then
100-
TastyFileUtil.getClassName(path) match
101-
case Some(res) => res :: Nil
83+
/** Setup extra classpath of tasty and jar files */
84+
protected def fromTastySetup(files: List[AbstractFile])(using Context): Context =
85+
if ctx.settings.fromTasty.value then
86+
val newEntries: List[String] = files
87+
.flatMap { file =>
88+
if !file.exists then
89+
report.error(s"File does not exist: ${file.path}")
90+
None
91+
else file.extension match
92+
case "jar" => Some(file.path)
93+
case "tasty" =>
94+
TastyFileUtil.getClassPath(file) match
95+
case Some(classpath) => Some(classpath)
96+
case _ =>
97+
report.error(s"Could not load classname from: ${file.path}")
98+
None
10299
case _ =>
103-
report.error(s"Could not load classname from: $name")
104-
Nil
105-
else
106-
report.error(s"File extension is not `tasty` or `jar`: $name")
107-
Nil
108-
}.unzip
109-
val ctx1 = ctx0.fresh
110-
val classPaths1 = classPaths.distinct.filter(_ != "")
111-
val fullClassPath = (classPaths1 :+ ctx1.settings.classpath.value(using ctx1)).mkString(java.io.File.pathSeparator)
100+
report.error(s"File extension is not `tasty` or `jar`: ${file.path}")
101+
None
102+
}
103+
.distinct
104+
val ctx1 = ctx.fresh
105+
val fullClassPath =
106+
(newEntries :+ ctx.settings.classpath.value).mkString(java.io.File.pathSeparator)
112107
ctx1.setSetting(ctx1.settings.classpath, fullClassPath)
113-
(classNames, ctx1)
114-
}
115-
else (fileNames0, ctx0)
108+
else ctx
116109

117110
/** Entry point to the compiler that can be conveniently used with Java reflection.
118111
*
@@ -189,8 +182,8 @@ class Driver {
189182
* if compilation succeeded.
190183
*/
191184
def process(args: Array[String], rootCtx: Context): Reporter = {
192-
val (fileNames, compileCtx) = setup(args, rootCtx)
193-
doCompile(newCompiler(using compileCtx), fileNames)(using compileCtx)
185+
val (files, compileCtx) = setup(args, rootCtx)
186+
doCompile(newCompiler(using compileCtx), files)(using compileCtx)
194187
}
195188

196189
def main(args: Array[String]): Unit = {

‎compiler/src/dotty/tools/dotc/Resident.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class Resident extends Driver {
4040

4141
final override def process(args: Array[String], rootCtx: Context): Reporter = {
4242
@tailrec def loop(args: Array[String], prevCtx: Context): Reporter = {
43-
var (fileNames, ctx) = setup(args, prevCtx)
44-
inContext(ctx){doCompile(residentCompiler, fileNames)}
43+
var (files, ctx) = setup(args, prevCtx)
44+
inContext(ctx) { doCompile(residentCompiler, files) }
4545
var nextCtx = ctx
4646
var line = getLine()
4747
while (line == reset) {

‎compiler/src/dotty/tools/dotc/Run.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,15 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
124124
/** Actions that need to be performed at the end of the current compilation run */
125125
private var finalizeActions = mutable.ListBuffer[() => Unit]()
126126

127-
def compile(fileNames: List[String]): Unit = try {
128-
val sources = fileNames.map(runContext.getSource(_))
129-
compileSources(sources)
130-
}
131-
catch {
132-
case NonFatal(ex) =>
133-
if units != null then report.echo(i"exception occurred while compiling $units%, %")
134-
else report.echo(s"exception occurred while compiling ${fileNames.mkString(", ")}")
135-
throw ex
136-
}
127+
def compile(files: List[AbstractFile]): Unit =
128+
try
129+
val sources = files.map(runContext.getSource(_))
130+
compileSources(sources)
131+
catch
132+
case NonFatal(ex) =>
133+
if units != null then report.echo(i"exception occurred while compiling $units%, %")
134+
else report.echo(s"exception occurred while compiling ${files.map(_.name).mkString(", ")}")
135+
throw ex
137136

138137
/** TODO: There's a fundamental design problem here: We assemble phases using `fusePhases`
139138
* when we first build the compiler. But we modify them with -Yskip, -Ystop
@@ -147,6 +146,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
147146
compileUnits()
148147
}
149148

149+
150150
def compileUnits(us: List[CompilationUnit]): Unit = {
151151
units = us
152152
compileUnits()
@@ -218,7 +218,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
218218
if (!files.contains(file) && !lateFiles.contains(file)) {
219219
lateFiles += file
220220

221-
val unit = CompilationUnit(ctx.getSource(file.path))
221+
val unit = CompilationUnit(ctx.getSource(file))
222222
val unitCtx = runContext.fresh
223223
.setCompilationUnit(unit)
224224
.withRootImports

‎compiler/src/dotty/tools/dotc/config/CompilerCommand.scala

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ object CompilerCommand {
3333

3434
def versionMsg: String = s"Scala compiler $versionString -- $copyrightString"
3535

36+
def shouldStopWithInfo(using Context): Boolean = {
37+
val settings = ctx.settings
38+
import settings._
39+
Set(help, Xhelp, Yhelp, showPlugins, XshowPhases) exists (_.value)
40+
}
41+
3642
/** Distill arguments into summary detailing settings, errors and files to compiler */
3743
def distill(args: Array[String])(using Context): ArgsSummary = {
3844
/**
@@ -110,11 +116,6 @@ object CompilerCommand {
110116
def xusageMessage = createUsageMsg("Possible advanced", shouldExplain = true, isAdvanced)
111117
def yusageMessage = createUsageMsg("Possible private", shouldExplain = true, isPrivate)
112118

113-
def shouldStopWithInfo = {
114-
import settings._
115-
Set(help, Xhelp, Yhelp, showPlugins, XshowPhases) exists (_.value)
116-
}
117-
118119
def phasesMessage: String = {
119120
(new Compiler()).phases.map {
120121
case List(single) => single.phaseName

‎compiler/src/dotty/tools/dotc/core/Contexts.scala

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -266,25 +266,32 @@ object Contexts {
266266
base.sources.getOrElseUpdate(file, new SourceFile(file, codec))
267267
}
268268

269-
/** Sourcefile with given path name, memoized */
270-
def getSource(path: TermName): SourceFile = base.sourceNamed.get(path) match {
271-
case Some(source) =>
272-
source
273-
case None => try {
274-
val f = new PlainFile(Path(path.toString))
275-
val src = getSource(f)
276-
base.sourceNamed(path) = src
277-
src
278-
} catch {
279-
case ex: InvalidPathException =>
280-
report.error(s"invalid file path: ${ex.getMessage}")
281-
NoSource
282-
}
283-
}
269+
/** SourceFile with given path name, memoized */
270+
def getSource(path: TermName): SourceFile = getFile(path) match
271+
case NoAbstractFile => NoSource
272+
case file => getSource(file)
284273

285-
/** Sourcefile with given path, memoized */
274+
/** SourceFile with given path, memoized */
286275
def getSource(path: String): SourceFile = getSource(path.toTermName)
287276

277+
/** AbstraFile with given path name, memoized */
278+
def getFile(name: TermName): AbstractFile = base.files.get(name) match
279+
case Some(file) =>
280+
file
281+
case None =>
282+
try
283+
val file = new PlainFile(Path(name.toString))
284+
base.files(name) = file
285+
file
286+
catch
287+
case ex: InvalidPathException =>
288+
report.error(s"invalid file path: ${ex.getMessage}")
289+
NoAbstractFile
290+
291+
/** AbstractFile with given path, memoized */
292+
def getFile(name: String): AbstractFile = getFile(name.toTermName)
293+
294+
288295
private var related: SimpleIdentityMap[Phase | SourceFile, Context] = null
289296

290297
private def lookup(key: Phase | SourceFile): Context =
@@ -841,9 +848,9 @@ object Contexts {
841848
private var _nextSymId: Int = 0
842849
def nextSymId: Int = { _nextSymId += 1; _nextSymId }
843850

844-
/** Sources that were loaded */
851+
/** Sources and Files that were loaded */
845852
val sources: util.HashMap[AbstractFile, SourceFile] = util.HashMap[AbstractFile, SourceFile]()
846-
val sourceNamed: util.HashMap[TermName, SourceFile] = util.HashMap[TermName, SourceFile]()
853+
val files: util.HashMap[TermName, AbstractFile] = util.HashMap()
847854

848855
// Types state
849856
/** A table for hash consing unique types */
@@ -927,7 +934,7 @@ object Contexts {
927934
emptyWildcardBounds = null
928935
errorTypeMsg.clear()
929936
sources.clear()
930-
sourceNamed.clear()
937+
files.clear()
931938
comparers.clear() // forces re-evaluation of top and bottom classes in TypeComparer
932939

933940
// Test that access is single threaded

‎compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ object SymbolLoaders {
173173
Nil)
174174
}
175175

176-
val unit = CompilationUnit(ctx.getSource(src.path))
176+
val unit = CompilationUnit(ctx.getSource(src))
177177
enterScanned(unit)(using ctx.fresh.setCompilationUnit(unit))
178178

179179
/** The package objects of scala and scala.reflect should always

‎compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import dotty.tools.dotc.core.Contexts._
66
import dotty.tools.dotc.core._
77
import dotty.tools.dotc.core.tasty.TastyHTMLPrinter
88
import dotty.tools.dotc.reporting._
9+
import dotty.tools.io.AbstractFile
910

1011
import scala.quoted.runtime.impl.QuotesImpl
1112

@@ -25,13 +26,13 @@ class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
2526

2627
private val decompiler = new PartialTASTYDecompiler
2728

28-
def run(className: String): (String, String) = {
29+
def run(tastyFile: AbstractFile): (String, String) = {
2930
val reporter = new StoreReporter(null) with HideNonSensicalMessages
3031

3132
val run = decompiler.newRun(using myInitCtx.fresh.setReporter(reporter))
3233

3334
inContext(run.runContext) {
34-
run.compile(List(className))
35+
run.compile(List(tastyFile))
3536
run.printSummary()
3637
val unit = ctx.run.units.head
3738

0 commit comments

Comments
 (0)