Simplify Scala 2 trait support #6040
Merged
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
|
test performance please |
|
performance test scheduled: 1 job(s) in queue, 1 running. |
smarter
force-pushed
the
scala2-augment-after-erasure-2
branch
from
2d12bf7 to
4739268
Compare
sjrd
reviewed
Mar 7, 2019
smarter
force-pushed
the
scala2-augment-after-erasure-2
branch
3 times, most recently
from
e2beab9 to
17e1d55
Compare
|
Performance test finished successfully: Visit http://dotty-bench.epfl.ch/6040/ to see the changes. Benchmarks is based on merging with master (7d30a83) |
Drop vestigial code related to Scala 2.11 support. In particular, we created a fake impl class in AugmentScala2Trait only to add its members to the trait in LinkScala2Impls. We now directly add the members to the trait in LinkScala2Impls. We could potentially simplify things even further by getting rid of LinkScala2Impls since the static `foo$` methods in Scala 2 traits always forward to instance methods `foo`, but that could have performance implication as detailed in scala#5928, so we keep things as-is for now, but eventually we should either switch Dotty trait encoding to also use static forwarders, or not use them at all.
smarter
force-pushed
the
scala2-augment-after-erasure-2
branch
from
17e1d55 to
d3de543
Compare
|
@smarter this merge did not pass the test |
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 8, 2019
Looks like scala#6034 and scala#6040 collided resulting in a CI failure on master.
|
Fixed in #6049 |
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.
Drop vestigial code related to Scala 2.11 support. In particular, we
created a fake impl class in AugmentScala2Trait only to add its members
to the trait in LinkScala2Impls. We now directly add the members to the
trait in LinkScala2Impls.
We could potentially simplify things even further by getting rid of
LinkScala2Impls since the static
foo$methods in Scala 2 traits alwaysforward to instance methods
foo, but that could have performanceimplication as detailed in #5928, so we keep things as-is for now, but
eventually we should either switch Dotty trait encoding to also use
static forwarders, or not use them at all.