SI-8087 keep annotations on mixed-in private[this] fields #4010
Conversation
This file contains 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
|
Review by @retronym – don't hesitate to think of a cleaner solution :) |
|
|
||
| val List(x, y) = bar.fields.asScala.toList.sortBy(_.name) | ||
| assertTrue((x.access & Opcodes.ACC_VOLATILE) != 0) | ||
| assertTrue((y.access & Opcodes.ACC_VOLATILE) != 0) |
There was a problem hiding this comment.
I tend to think it would be simpler to test this using Java reflection, rather than with ASM.
scala> trait T { @volatile private[this] var x = 42 }; class C extends T
defined trait T
defined class C
scala> java.lang.reflect.Modifier.isVolatile(classOf[C].getDeclaredFields.head.getModifiers)
res24: Boolean = false
scala> class C { @volatile private[this] var x = 42 }
defined class C
scala> java.lang.reflect.Modifier.isVolatile(classOf[C].getDeclaredFields.head.getModifiers)
res25: Boolean = true
Related to SI-2511 / eea7956, which fixed the same issue for non `private[this]` fields. If you have trait T { private[this] val f = 0 } class C extends T Mixin geneartes an accessor method `T.f` with owner `T`. When generating the field in `C`, the Mixin.mixinTraitMembers calls `fAccessor.accessed`. The implementation of `accessed` does a lookup for a member named `"f "` (note the space). The bug is that `private[this]` fields are not renamed to have space (`LOCAL_SUFFIX_STRING`) in their name, so the accessed was not found, and no annotations were copied from it.
|
LGTM |
retronym
added a commit
that referenced
this pull request
Oct 1, 2014
SI-8087 keep annotations on mixed-in private[this] fields
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.
Related to SI-2511 / eea7956, which fixed the same issue for non
private[this]fields.If you have
Mixin geneartes an accessor method
T.fwith ownerT. Whengenerating the field in
C, the Mixin.mixinTraitMembers callsfAccessor.accessed. The implementation ofaccesseddoes a lookupfor a member named
"f "(note the space). The bug is thatprivate[this]fields are not renamed to have space(
LOCAL_SUFFIX_STRING) in their name, so the accessed was not found,and no annotations were copied from it.