Skip to content

Commit 188d9a4

Browse files
committed
Introduce best-effort compilation for IDEs
2 new experimental options are introduces for the compiler: `-Ybest-effort` and `-Ywith-best-effort-tasty`. A related Best Effort TASTy (.betasty) format, a TASTy aligned file format able to hold some errored trees was also added. Behaviour of the options and the format is documented as part of this commit in the `best-effort-compilation.md` docs file. `-Ybest-effort` is used to produce `.betasty` files in the `<output>/META-INF/best-effort`. `-Ywith-best-effort-tasty` allows to use them during compilation, limiting it to the frontend phases if such file is used. If any .betasty is used, transparent inline macros also cease to be expanded by the compiler. Since best-effort compilation can fail (e.g. due to cyclic reference errors which sometimes are not able to be pickled or unpickled), the crashes caused by it are wrapped into an additional descriptive error message in the aim to fail more gracefully (and not pollute our issue tracker with known problems). The feature is tested in two ways: * with a set of pairs of dependent projects, one of which is meant to produce .betasty by using `-Ybest-effort`, and the other tries to consume it using `-Ywith-best-effort-tasty`. * by reusing the compiler nonbootstrapped neg tests, first by running them with `-Ybest-effort` option, and then by running read-tasty tests on the produced betasty files to thest best-effort tastt unpickling Additionally, `-Ywith-best-effort-tasty` allows to print `.betasty` via `-print-tasty`.
1 parent c0eae68 commit 188d9a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1014
-197
lines changed

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ class GenBCode extends Phase { self =>
1616

1717
override def description: String = GenBCode.description
1818

19+
override def isRunnable(using Context) = super.isRunnable && !ctx.usesBestEffortTasty
20+
1921
private val superCallsMap = new MutableSymbolMap[Set[ClassSymbol]]
2022
def registerSuperCall(sym: Symbol, calls: ClassSymbol): Unit = {
2123
val old = superCallsMap.getOrElse(sym, Set.empty)

compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class GenSJSIR extends Phase {
1212
override def description: String = GenSJSIR.description
1313

1414
override def isRunnable(using Context): Boolean =
15-
super.isRunnable && ctx.settings.scalajs.value
15+
super.isRunnable && ctx.settings.scalajs.value && !ctx.usesBestEffortTasty
1616

1717
def run(using Context): Unit =
1818
new JSCodeGen().run()

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ class Driver {
3939
catch
4040
case ex: FatalError =>
4141
report.error(ex.getMessage.nn) // signals that we should fail compilation.
42+
case ex: Throwable if ctx.usesBestEffortTasty =>
43+
report.bestEffortError(ex, "Some best-effort tasty files were not able to be read.")
4244
case ex: TypeError if !runOrNull.enrichedErrorMessage =>
4345
println(runOrNull.enrichErrorMessage(s"${ex.toMessage} while compiling ${files.map(_.path).mkString(", ")}"))
4446
throw ex
@@ -100,8 +102,8 @@ class Driver {
100102
None
101103
else file.extension match
102104
case "jar" => Some(file.path)
103-
case "tasty" =>
104-
TastyFileUtil.getClassPath(file) match
105+
case "tasty" | "betasty" =>
106+
TastyFileUtil.getClassPath(file, ctx.withBestEffortTasty) match
105107
case Some(classpath) => Some(classpath)
106108
case _ =>
107109
report.error(em"Could not load classname from: ${file.path}")

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
230230
ctx.settings.Yskip.value, ctx.settings.YstopBefore.value, stopAfter, ctx.settings.Ycheck.value)
231231
ctx.base.usePhases(phases)
232232

233+
var forceReachPhaseMaybe =
234+
if (ctx.isBestEffort && phases.exists(_.phaseName == "typer")) Some("typer")
235+
else None
236+
233237
if ctx.settings.YnoDoubleBindings.value then
234238
ctx.base.checkNoDoubleBindings = true
235239

@@ -239,7 +243,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
239243
var phasesWereAdjusted = false
240244

241245
for (phase <- ctx.base.allPhases)
242-
if (phase.isRunnable)
246+
if (phase.isRunnable || forceReachPhaseMaybe.nonEmpty)
243247
Stats.trackTime(s"phase time ms/$phase") {
244248
val start = System.currentTimeMillis
245249
val profileBefore = profiler.beforePhase(phase)
@@ -250,6 +254,13 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
250254
def printCtx(unit: CompilationUnit) = phase.printingContext(
251255
ctx.fresh.setPhase(phase.next).setCompilationUnit(unit))
252256
lastPrintedTree = printTree(lastPrintedTree)(using printCtx(unit))
257+
258+
forceReachPhaseMaybe match {
259+
case Some(forceReachPhase) if phase.phaseName == forceReachPhase =>
260+
forceReachPhaseMaybe = None
261+
case _ =>
262+
}
263+
253264
report.informTime(s"$phase ", start)
254265
Stats.record(s"total trees at end of $phase", ast.Trees.ntrees)
255266
for (unit <- units)

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -929,12 +929,12 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
929929
else cpy.PackageDef(tree)(pid, slicedStats) :: Nil
930930
case tdef: TypeDef =>
931931
val sym = tdef.symbol
932-
assert(sym.isClass)
932+
if !ctx.isBestEffort then assert(sym.isClass)
933933
if (cls == sym || cls == sym.linkedClass) tdef :: Nil
934934
else Nil
935935
case vdef: ValDef =>
936936
val sym = vdef.symbol
937-
assert(sym.is(Module))
937+
if !ctx.isBestEffort then assert(sym.is(Module))
938938
if (cls == sym.companionClass || cls == sym.moduleClass) vdef :: Nil
939939
else Nil
940940
case tree =>

compiler/src/dotty/tools/dotc/ast/tpd.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
4848
case _: RefTree | _: GenericApply | _: Inlined | _: Hole =>
4949
ta.assignType(untpd.Apply(fn, args), fn, args)
5050
case _ =>
51-
assert(ctx.reporter.errorsReported)
51+
assert(ctx.isBestEffort || ctx.usesBestEffortTasty || ctx.reporter.errorsReported)
5252
ta.assignType(untpd.Apply(fn, args), fn, args)
5353

5454
def TypeApply(fn: Tree, args: List[Tree])(using Context): TypeApply = fn match
@@ -57,7 +57,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
5757
case _: RefTree | _: GenericApply =>
5858
ta.assignType(untpd.TypeApply(fn, args), fn, args)
5959
case _ =>
60-
assert(ctx.reporter.errorsReported, s"unexpected tree for type application: $fn")
60+
assert(ctx.isBestEffort || ctx.usesBestEffortTasty || ctx.reporter.errorsReported, s"unexpected tree for type application: $fn")
6161
ta.assignType(untpd.TypeApply(fn, args), fn, args)
6262

6363
def Literal(const: Constant)(using Context): Literal =

compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ case class DirectoryClassPath(dir: JFile) extends JFileDirectoryLookup[ClassFile
288288

289289
protected def createFileEntry(file: AbstractFile): ClassFileEntryImpl = ClassFileEntryImpl(file)
290290
protected def isMatchingFile(f: JFile): Boolean =
291-
f.isTasty || (f.isClass && f.classToTasty.isEmpty)
291+
f.isTasty || f.isBestEffortTasty || (f.isClass && f.classToTasty.isEmpty)
292292

293293
private[dotty] def classes(inPackage: PackageName): Seq[ClassFileEntry] = files(inPackage)
294294
}

compiler/src/dotty/tools/dotc/classpath/FileUtils.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ object FileUtils {
2424

2525
def hasTastyExtension: Boolean = file.hasExtension("tasty")
2626

27+
def hasBetastyExtension: Boolean = file.hasExtension("betasty")
28+
2729
def isTasty: Boolean = !file.isDirectory && hasTastyExtension
2830

31+
def isBestEffortTasty: Boolean = !file.isDirectory && hasBetastyExtension
32+
2933
def isScalaBinary: Boolean = file.isClass || file.isTasty
3034

3135
def isScalaOrJavaSource: Boolean = !file.isDirectory && (file.hasExtension("scala") || file.hasExtension("java"))
@@ -54,6 +58,8 @@ object FileUtils {
5458

5559
def isTasty: Boolean = file.isFile && file.getName.endsWith(SUFFIX_TASTY)
5660

61+
def isBestEffortTasty: Boolean = file.isFile && file.getName.endsWith(SUFFIX_BETASTY)
62+
5763
/** Returns the tasty file associated with this class file */
5864
def classToTasty: Option[JFile] =
5965
assert(file.isClass, s"non-class: $file")
@@ -66,6 +72,7 @@ object FileUtils {
6672
private val SUFFIX_CLASS = ".class"
6773
private val SUFFIX_SCALA = ".scala"
6874
private val SUFFIX_TASTY = ".tasty"
75+
private val SUFFIX_BETASTY = ".betasty"
6976
private val SUFFIX_JAVA = ".java"
7077
private val SUFFIX_SIG = ".sig"
7178

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,9 @@ private sealed trait YSettings:
406406
val YprofileRunGcBetweenPhases: Setting[List[String]] = PhasesSetting("-Yprofile-run-gc", "Run a GC between phases - this allows heap size to be accurate at the expense of more time. Specify a list of phases, or *", "_")
407407
//.withPostSetHook( _ => YprofileEnabled.value = true )
408408

409+
val YbestEffort: Setting[Boolean] = BooleanSetting("-Ybest-effort", "Enable best-effort compilation attempting to produce betasty to the META-INF/best-effort directory, regardless of errors, as part of the pickler phase.")
410+
val YwithBestEffortTasty: Setting[Boolean] = BooleanSetting("-Ywith-best-effort-tasty", "Allow to compile using best-effort tasty files. If such file is used, the compiler will stop after the pickler phase.")
411+
409412
// Experimental language features
410413
val YnoKindPolymorphism: Setting[Boolean] = BooleanSetting("-Yno-kind-polymorphism", "Disable kind polymorphism.")
411414
val YexplicitNulls: Setting[Boolean] = BooleanSetting("-Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.")

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,18 @@ object Contexts {
463463
/** Is the explicit nulls option set? */
464464
def explicitNulls: Boolean = base.settings.YexplicitNulls.value
465465

466+
/** Is best-effort-dir option set? */
467+
def isBestEffort: Boolean = base.settings.YbestEffort.value
468+
469+
/** Is the from-best-effort-tasty option set to true? */
470+
def withBestEffortTasty: Boolean = base.settings.YwithBestEffortTasty.value
471+
472+
/** Were any best effort tasty dependencies used during compilation? */
473+
def usesBestEffortTasty: Boolean = base.usedBestEffortTasty
474+
475+
/** Confirm that a best effort tasty dependency was used during compilation. */
476+
def setUsesBestEffortTasty(): Unit = base.usedBestEffortTasty = true
477+
466478
/** A fresh clone of this context embedded in this context. */
467479
def fresh: FreshContext = freshOver(this)
468480

@@ -949,6 +961,9 @@ object Contexts {
949961
val sources: util.HashMap[AbstractFile, SourceFile] = util.HashMap[AbstractFile, SourceFile]()
950962
val files: util.HashMap[TermName, AbstractFile] = util.HashMap()
951963

964+
/** Was best effort file used during compilation? */
965+
private[core] var usedBestEffortTasty = false
966+
952967
// Types state
953968
/** A table for hash consing unique types */
954969
private[core] val uniques: Uniques = Uniques()

0 commit comments

Comments
 (0)