Clean up scala.runtime.function, refactor closure adaptation #10920
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
Instead, use the equivalent classes in the Scala 2 standard library in scala.runtime.java8. The only difference is that these classes are written in Scala instead of Java, which exposed a bug in the Scala2Unpickler: we were calling `atPhaseNoLater(picklerPhase)`, but this doesn't actually do anything in situation where the Pickler phase is not used (for example, when using the `QuoteCompiler`), this is fixed by introducing a new `atPhaseBeforeTransforms` which does the right thing. Because the `FirstTransform` phase itself might not be present, this also required fixing `Phase#next` and `Phase#prev` to work on `NoPhase`: the issue was that `myBase.NoPhase` failed with an NPE which we fix by making `NoPhase` a static object instead of a member of `PhasesBase`. Since an instace of `Phase` contains mutable state this requires making it `@sharable` to pass our tests, this is safe since we never mutate anything in `NoPhase` (this also matches what we do for `NoSymbol` and `NoDenotation`).
Since Scala 2.12, the regular scala.Function{0, 1, 2} are valid SAM
types, so these interfaces aren't needed anymore.
smarter
force-pushed
the
jfunction-cleanup-4
branch
from
62d687e to
58064cf
Compare
As described in details in `Erasure#adaptClosure`, in some situation we need to perform some transformation to make the closure implementation method type match the type of the single abstract method of the functional interface this closure implements, previously the responsability for doing this was split in three places: - The FunctionalInterfaces phase was setting the functional interface of specializable FunctionN instances to the corresponding specialized JFunction*mc* interface - The backend set the functional interface of a Unit-returning FunctionN to JProcedureN - And `adaptClosure` generated a bridge method in all other situations where some adaptation was needed. This commit centralizes all of this logic in `adaptClosure` which allows us to remove one phase, and in general makes it easier to follow what's going on.
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.
Part of #10602