Improve support for macros targeting invokedynamic #9528
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
- Support macro varargs bootstrap methods - Support method handle bootstrap arguments Demonstrated with a test case that passes a Constant(symbol) through to a static bootstrap MethodHandle argument. This bootstrap also accepts a trailing varargs array of parameter names.
harpocrates
reviewed
Apr 4, 2021
| @@ -131,7 +131,8 @@ abstract class BTypesFromSymbols[G <: Global](val global: G) extends BTypes { | |||
|
|
|||
| def bootstrapMethodArg(t: Constant, pos: Position): AnyRef = t match { | |||
| case Constant(mt: Type) => methodBTypeFromMethodType(transformedType(mt), isConstructor = false).toASMType | |||
There was a problem hiding this comment.
While you are at it, this could be tweaked to also support Class constants
Suggested change
| case Constant(mt: Type) => methodBTypeFromMethodType(transformedType(mt), isConstructor = false).toASMType | |
| case Constant(t: Type) => | |
| transformedType(t) match { | |
| case mt: MethodType => methodBTypeFromMethodType(mt, isConstructor = false).toASMType | |
| case t: Type => typeToBType(t).toASMType | |
| } | |
| @@ -149,6 +150,23 @@ abstract class BTypesFromSymbols[G <: Global](val global: G) extends BTypes { | |||
| new asm.Handle(asm.Opcodes.H_INVOKESTATIC, ownerInternalName, sym.name.encoded, descriptor, isInterface) | |||
| } | |||
|
|
|||
| def handleFromMethodSymbol(sym: Symbol): asm.Handle = { | |||
There was a problem hiding this comment.
Since there is an isField on Symbol, it would be quite nice to generate a asm.Opcodes.H_GETFIELD handle for those. I don't have a good code suggestion though since I'm not sure how to unmangle the field name and its trailing whitespace (I ended up hacking the name with if (isField) sym.name.toString.init...).
There was a problem hiding this comment.
I think I'll leave this to a followup improvement.
retronym
force-pushed
the
topic/macro-indy-fixes
branch
from
59ca5f1 to
48f5a79
Compare
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.
Demonstrated with a test case that passes a Constant(symbol) through to a
static bootstrap MethodHandle argument. This bootstrap also accepts a
trailing varargs array of parameter names.