[sbt-bridge] Bump Zinc to 1.4.3 and upgrade to CompilerInterface2 #10607

adpi2 · 2020-12-02T15:29:24Z

This PR bumps Zinc to 1.4.3 in sbt-bridge and provides an implementation of the new xsbti.CompilerInterface2.

It fixes a bug related to CompilerInterface that the xsbti.compile.analysis.SourceInfos returned by Zinc, when the compilation is successful, are empty whereas they should contain the warnings.

It brings support for the sbt remote cache on Scala 3.

The old xsbti.CompilerInterface is kept because Mill still depends on an older version of Zinc (1.4.0-M1 which is closer to 1.3.5 than it is to 1.4.0). That's also the reason why scala3-compiler depends on Zinc 1.3.5 and not 1.4.3. As soon as Mill has upgraded to Zinc 1.4.0 or greater we will be able to fully upgrade to 1.4.3.

The CompilerClassLoader is not needed anymore by sbt-dotty but it is kept because of Mill. Once com-lihaoyi/mill#1019 is merged and released we will be able to remove the CompilerClassLoader.

The below table sums up the compatibility of future 3.0.0-M3 with sbt and Mill:

Build tool	Zinc Interface
sbt 1.3.x (sbt-dotty 0.4.5)	`CompilerInterface` (with `CompilerClassLoader`)
sbt 1.4.x (sbt-dotty 0.4.6)	`CompilerBridge extends CompilerInterface2`
Mill 0.8.x - Mill 0.9.x	`CompilerInterface` (with `CompilerClassLoader`)

[test_sbt]

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

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

sbt-bridge/resources/META-INF/services/xsbti.compile.CompilerInterface2

sbt-bridge/src/xsbt/CompilerBridge.java

sbt-bridge/src/xsbt/AbstractZincFile.java

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

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

smarter · 2020-12-08T16:07:01Z

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

    def getSource(path: String): SourceFile = getSource(path.toTermName)

+    /** AbstraFile with given path name, memoized */


Is the memoization needed here? Does the Scala 2 compiler bridge do something similar?

Following our private discussion I try to remove sourceNamed in b492fd8

doc-tool/test/dotty/tools/dottydoc/DottyDocTest.scala

smarter · 2020-12-08T16:10:22Z

project/Build.scala

@@ -489,7 +490,7 @@ object Build {
      // get libraries onboard
      libraryDependencies ++= Seq(
        "org.scala-lang.modules" % "scala-asm" % "7.3.1-scala-1", // used by the backend
-        Dependencies.`compiler-interface`,
+        Dependencies.oldCompilerInterface, // we stick to the old version to avoid deprecation warnings


What's the plan for removing these warnings? Should we open an issue to keep track of it?

The plan is to upgrade the version of Zinc in Mill. Then use the new Zinc API in the compiler. I have a branch with those changes in my fork that has passed the CI, except for Mill community projects.

I'll open an issue as soon as this is merged.

sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java

sbt-bridge/src/xsbt/CompilerInterface.java

smarter · 2020-12-08T16:15:31Z

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

@@ -521,15 +526,34 @@ object DottyPlugin extends AutoPlugin {
      scalaLibraryJar,
      dottyLibraryJar,
      compilerJar,
-      allJars
+      allJars,
+      appConfiguration.value
    )
  }

  // Adapted from private mkScalaInstance in sbt
  def makeScalaInstance(


Does the updated sbt-dotty plugin still work with previous versions of dotty?

Yes it does!

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

sjrd

I'm a bit lost in all the code of the bridge itself. But the areas that I do understand look good to me (besides smarter's comments).

adpi2 · 2020-12-09T22:28:49Z

@smarter this is ready for review.
Two tests are failing for unrelated reasons:

the scripted source-dependencies/synthetic-companion because of test_sbt broken in CI: Synthetic apply in private companion object #10728 (reproducible on current master)
the idempotency from tastyBootstrap/tests failed that is also broken on the CI of master (but passing locally...)

smarter · 2020-12-10T16:55:14Z

@nicolasstucki: can you have a look at the tasty-related changes?

nicolasstucki

Otherwise the TASTy loading logic looks good

nicolasstucki · 2020-12-11T11:53:38Z

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

+  protected def fromTastySetup(files: List[AbstractFile])(using Context): Context =
+    if ctx.settings.fromTasty.value then
+      val newEntries: List[String] = files
+        .filter(_.exists)


We should report an error if the file does not exist. Is this done somewhere else now?

Thanks! I've just added the error report!

smarter

LGTM! The last commit can be removed now that #10728 has been closed.

smarter · 2020-12-11T17:15:35Z

Once this is merged I'll take care of release a new sbt-dotty.

adpi2 · 2020-12-11T18:10:43Z

Thanks! I've just rebased and removed the last commit.

adpi2 marked this pull request as draft December 2, 2020 15:29

adpi2 force-pushed the sbt-bridge branch 8 times, most recently from 6973f0f to c6fa4c6 Compare December 5, 2020 08:53

adpi2 changed the title ~~[sbt-bridge] Upgrade to CompilerInterface2~~ [sbt-bridge] Bump Zinc to 1.4.3 and upgrade to CompilerInterface2 Dec 5, 2020

adpi2 requested a review from sjrd December 5, 2020 09:17

adpi2 marked this pull request as ready for review December 5, 2020 09:17

adpi2 requested a review from smarter December 7, 2020 09:01

smarter requested changes Dec 7, 2020

View reviewed changes

smarter assigned adpi2 Dec 7, 2020

adpi2 force-pushed the sbt-bridge branch 2 times, most recently from bad60ff to 528d3b6 Compare December 8, 2020 11:57

adpi2 requested a review from smarter December 8, 2020 12:41

adpi2 force-pushed the sbt-bridge branch from 168a416 to 6bd38c7 Compare December 8, 2020 15:44

smarter requested changes Dec 8, 2020

View reviewed changes

sjrd reviewed Dec 8, 2020

View reviewed changes

adpi2 force-pushed the sbt-bridge branch 5 times, most recently from 6bd6929 to b492fd8 Compare December 9, 2020 20:12

adpi2 requested review from smarter and sjrd December 9, 2020 22:28

adpi2 added the M3:high-prio label Dec 10, 2020

smarter requested a review from nicolasstucki December 10, 2020 16:55

adpi2 removed the request for review from sjrd December 10, 2020 20:05

nicolasstucki reviewed Dec 11, 2020

View reviewed changes

adpi2 force-pushed the sbt-bridge branch from 24d8242 to 422fd73 Compare December 11, 2020 12:42

smarter approved these changes Dec 11, 2020

View reviewed changes

adpi2 force-pushed the sbt-bridge branch from 422fd73 to bc1f8cf Compare December 11, 2020 18:07

adpi2 added 3 commits December 11, 2020 19:08

[sbt-dotty] use sbt loader as parent of scala instance loader

77e053d

[sbt-bridge] Upgrade to CompilerInterface2

5185d4d

Expose AbstractFile only in Run

ef81ccf

adpi2 force-pushed the sbt-bridge branch from bc1f8cf to ef81ccf Compare December 11, 2020 18:08

smarter merged commit e8d748e into scala:master Dec 12, 2020

smarter mentioned this pull request Dec 13, 2020

current nightly dotty is crashed with sbt projec #10772

Closed

This was referenced Dec 14, 2020

Merge DottyPlugin in sbt sbt/sbt#6080

Closed

Follow-up on Zinc upgrade #10816

Closed

Kordyjan added this to the 3.0.0 milestone Aug 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[sbt-bridge] Bump Zinc to 1.4.3 and upgrade to CompilerInterface2 #10607

[sbt-bridge] Bump Zinc to 1.4.3 and upgrade to CompilerInterface2 #10607

adpi2 commented Dec 2, 2020 •

edited

Loading

smarter Dec 8, 2020

adpi2 Dec 9, 2020 •

edited

Loading

smarter Dec 8, 2020

adpi2 Dec 9, 2020

smarter Dec 8, 2020

adpi2 Dec 9, 2020

sjrd left a comment

adpi2 commented Dec 9, 2020

smarter commented Dec 10, 2020

nicolasstucki left a comment

nicolasstucki Dec 11, 2020

adpi2 Dec 11, 2020

smarter left a comment

smarter commented Dec 11, 2020

adpi2 commented Dec 11, 2020

		def getSource(path: String): SourceFile = getSource(path.toTermName)

		/** AbstraFile with given path name, memoized */

[sbt-bridge] Bump Zinc to 1.4.3 and upgrade to CompilerInterface2 #10607

[sbt-bridge] Bump Zinc to 1.4.3 and upgrade to CompilerInterface2 #10607

Conversation

adpi2 commented Dec 2, 2020 • edited Loading

smarter Dec 8, 2020

Choose a reason for hiding this comment

adpi2 Dec 9, 2020 • edited Loading

Choose a reason for hiding this comment

smarter Dec 8, 2020

Choose a reason for hiding this comment

adpi2 Dec 9, 2020

Choose a reason for hiding this comment

smarter Dec 8, 2020

Choose a reason for hiding this comment

adpi2 Dec 9, 2020

Choose a reason for hiding this comment

sjrd left a comment

Choose a reason for hiding this comment

adpi2 commented Dec 9, 2020

smarter commented Dec 10, 2020

nicolasstucki left a comment

Choose a reason for hiding this comment

nicolasstucki Dec 11, 2020

Choose a reason for hiding this comment

adpi2 Dec 11, 2020

Choose a reason for hiding this comment

smarter left a comment

Choose a reason for hiding this comment

smarter commented Dec 11, 2020

adpi2 commented Dec 11, 2020

adpi2 commented Dec 2, 2020 •

edited

Loading

adpi2 Dec 9, 2020 •

edited

Loading