Stop emitting fields for inlined fields. #1890
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
nicolasstucki
force-pushed
the
remove-inlined-fields
branch
from
828d2a0 to
12d0189
Compare
odersky
requested changes
Jan 10, 2017
| ctx.scala2Mode (stay compatible with Scala2 for now) */ | ||
| } | ||
| val sym = vdef.symbol | ||
| skipBlocks(vdef.rhs) match { |
There was a problem hiding this comment.
No that's not right. The right hand side can also be an Ident and a Select with ConstantType.
There was a problem hiding this comment.
I think the right body is:
val sym = vdef.symbol
sym.info match {
case info: ConstantType if isFinalInlinableVal(sym) => sym.flags |= Inline
case _ =>
}
|
Also, I think it's cleaner to revert the original commit(s) of #1879 and then add the new changes. |
odersky
approved these changes
Jan 10, 2017
|
Ok, I will revert the changes and clean up the history. |
nicolasstucki
force-pushed
the
remove-inlined-fields
branch
from
fc7bd7c to
6e3065f
Compare
nicolasstucki
force-pushed
the
remove-inlined-fields
branch
from
6e3065f to
1cb50ca
Compare
|
Reverted 63d68bf and reimplemented cleanly. |
|
LTTM 👍 |
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.
Also move final val inlining logic to Inline as mentioned in #1879.