Always run the compiler with a bootstrapped dotty-library #4833
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smarter
force-pushed
the
build-stuff
branch
8 times, most recently
from
609d949 to
f2f2da6
Compare
smarter
requested review from
nicolasstucki
and removed request for
allanrenucci
| ) | ||
|
|
||
| lazy val bootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq( | ||
| packageAll := { | ||
| packageAll.in(`dotty-compiler`).value ++ Seq( | ||
| "dotty-compiler" -> packageBin.in(Compile).value.getAbsolutePath, | ||
| "dotty-library" -> packageBin.in(`dotty-library-bootstrapped`, Compile).value.getAbsolutePath | ||
| "dotty-compiler" -> packageBin.in(Compile).value.getAbsolutePath |
There was a problem hiding this comment.
Why is the library not packaged in this case?
There was a problem hiding this comment.
It is, note that we call packageAll.in(dotty-compiler).value a line above, which ends up getting the map from the non-bootstrapped version.
|
|
||
| oldOptions.updated(i + 1, s"$sbtIo:$zincApiInfo:$oldValue") | ||
| } | ||
| ) |
There was a problem hiding this comment.
Is there any way to add a test for this?
There was a problem hiding this comment.
If this wasn't correct, compilation would crash with a message saying we're trying to unpickle Scala 2 symbols from a JAR which is not on the whitelist
The non-bootstrapped dotty-library may not be binary compatible with the compiler, this hasn't affected us so far because the non-bootstrapped dotty-library has always been compiled with Scala 2, but in the future it will be compiled by an old version of Dotty itself. To enforce this, I added a new flag -Yscala2-unpickler and set it so that scala-library is the only jar from which we're allowed to unpickle Scala 2 symbols in both the build and the tests.
The tests that import things defined in the dotty-compiler jar should only be run with a bootstrapped compiler.
Previously they were in dotty-compiler, which means that running `-Ycheck:reentrant` on a non-bootstrapped compiler would try to load symbols from the non-bootstrapped compiler itself.
Blaisorblade
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jul 29, 2018
`lazyValsSepComp` was dropped in c9f1754 without motivation. After readding it, `dotty-compiler-bootstrapped/testCompilation lazyValsSep` didn't find it; adding the forgotten `checkCompile` call fixed this as well.
Blaisorblade
added a commit
to dotty-staging/dotty
that referenced
this pull request
Jul 29, 2018
`lazyValsSepComp` was dropped in c9f1754 without motivation. After readding it, `dotty-compiler-bootstrapped/testCompilation lazyValsSep` didn't find it; adding the forgotten `checkCompile` call fixed this as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The non-bootstrapped dotty-library may not be binary compatible with the
compiler, this hasn't affected us so far because the non-bootstrapped
dotty-library has always been compiled with Scala 2, but in the future
it will be compiled by an old version of Dotty itself.
To enforce this, I added a new flag -Yscala2-unpickler and set it so
that scala-library is the only jar from which we're allowed to unpickle
Scala 2 symbols in both the build and the tests.