Replace bridge methods with filtered methods in Painless #88100
Merged
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
jdconrad
added
:Core/Infra/Scripting
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
rjernst
approved these changes
Jun 29, 2022
| @@ -146,6 +146,14 @@ private ArrayLengthHelper() {} | |||
| /** factory for arraylength MethodHandle (intrinsic) from Java 9 (pkg-private for tests) */ | |||
| static final MethodHandle JAVA9_ARRAY_LENGTH_MH_FACTORY; | |||
|
|
|||
| public static final MethodHandle DEF_TO_B_BYTE_IMPLICIT_HANDLE; | |||
There was a problem hiding this comment.
Maybe be more explicit in the name, use "BOXED" rather than "B". Another thought on the naming is maybe HANDLE is not needed (we don't have it on any of the other method handles here). So as an example:
DEF_TO_BOXED_BYTE_IMPLICIT_CAST
| for (int typeParameterCount = 0; typeParameterCount < javaMethod.getParameterTypes().length; ++typeParameterCount) { | ||
| Class<?> typeParameter = javaMethod.getParameterTypes()[typeParameterCount]; | ||
|
|
||
| if (typeParameter == Byte.class) { |
There was a problem hiding this comment.
It seems like there are enough cases here that you could reduce a lot of boilerplate by having Map<Class<?>, MethodHandle> instead of individual constants, and then the code here wouldn't need a chain of if/else. So instead of Def.DEF_TO_xxx you might have Def.IMPLICIT_BOXED_CASTS.get(typeParameter)
|
@rjernst Thanks for the review. Will commit as soon as CI passes. |
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.
The invokedynamic instruction does not perfectly follow the Painless casting model opting to add bridge methods where necessary to ensure symmetric behavior between compile-time and run-time casting using boxed types. This change replaces the specialized class loader and bridge methods using filtered method handles instead. This reduces the overall complexity of runtime casting.