Do not create companions that will be dropped later. #1117
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
|
@odersky please review. |
DarkDimius
force-pushed
the
dont-create-companions
branch
from
7471f09 to
1129f90
Compare
|
/rebuild |
|
Single test failed: TASTY pickling with [error] java.lang.OutOfMemoryError: GC overhead limit exceeded Fix passes all the test on my machine and is ready for review. |
| @@ -46,6 +47,12 @@ class LazyVals extends MiniPhaseTransform with IdentityDenotTransformer { | |||
| * before this phase starts processing same tree */ | |||
| override def runsAfter = Set(classOf[Mixin]) | |||
|
|
|||
| def isCompanionNeeded(cls: ClassSymbol)(implicit ctx: Context): Boolean = { | |||
| println("testing " + cls) | |||
There was a problem hiding this comment.
I assume you'll drop the println before merging?
There was a problem hiding this comment.
Thanks for noticing.
DarkDimius
force-pushed
the
dont-create-companions
branch
from
1129f90 to
e5ca61a
Compare
|
I think DropEmptyCompanions.scala should be deleted too, otherwise it's easy to think that it's still in use. |
|
@smarter There are actually some other phases as well which are still in transfrom even though they are not used. We could get rid of them all maybe, or rename to .scala.disabled (?) |
DarkDimius
force-pushed
the
dont-create-companions
branch
from
fbad29b to
7f00598
Compare
Fix blocker bug reported in scala#1114 I dislike this fix as now phase needs to know in advance if it will ever need a companion for the class. On the bright side, this change makes it clear which phases need companions
DarkDimius
force-pushed
the
dont-create-companions
branch
from
6db2ef6 to
0f4d74d
Compare
|
rebased. |
|
LGTM |
odersky
added a commit
that referenced
this pull request
Feb 20, 2016
Do not create companions that will be dropped later.
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.
Fix blocker bug reported in #1114
I dislike this fix as now phase needs to know in advance
if it will ever need a companion for the class.
On the bright side, this change makes it clear
which phases need companions