OJDK MH Support for JDK8 #14937
Merged
OJDK MH Support for JDK8 #14937
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
babsingh
force-pushed
the
ojdk_mhs_jdk8_v1
branch
4 times, most recently
from
1ef750d
to
b58a6ed
Compare
babsingh
force-pushed
the
ojdk_mhs_jdk8_v1
branch
from
b58a6ed
to
0ffb5dc
Compare
|
@fengxue-IS Can you please review this PR? |
|
All the pending JDK8 OJDK-MH failures, which will be seen after merging this PR, are linked to #14541. |
fengxue-IS
reviewed
May 3, 2022
fengxue-IS
approved these changes
May 5, 2022
Based upon current support, VarHandle specifc code should only be enabled for JDK11 and onwards. Enabling it for JDK8 leads to the VarHandle class not-found errors. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
tajila
reviewed
May 19, 2022
babsingh
force-pushed
the
ojdk_mhs_jdk8_v1
branch
from
f854c1c
to
43878d4
Compare
tajila
reviewed
May 21, 2022
jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleResolver.java
Outdated
Show resolved
Hide resolved
babsingh
force-pushed
the
ojdk_mhs_jdk8_v1
branch
from
43878d4
to
98a97c3
Compare
In JDK8, ... 1. MethodHandleNatives.linkCallSite does not accept indexInCP as the second parameter. This should resolve a compilation error. 2. resolveInvokeDynamic should throw the original error wrapped in a BootstrapMethodError if method-type evaluation, from the descriptor string, fails. 3. Testing indicates that inaccessibleTypeCheck is not needed in JDK8, and it also leads to compilation errors. So, this check has been removed from resolveInvokeDynamic and sendResolveMethodHandle. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
1. MethodHandleNatives.resolve has a different signature. Account for behaviour changes across JDK8, 11 and 17+. 2. Assume speculativeResolve to be false in MethodHandleNatives.resolve if it is not included in the parameter list. 3. MethodHandleNatives.getConstant only exists for JDK8. It returns false suggesting that OpenJ9 does not support the corresponding feature. 4. MethodHandleNatives.copyOutBootstrapArguments only exists in JDK11+. 5. MethodHandleNatives.clearCallSiteContext only exists in JDK11+. 6. Spread long single lines across multiple lines. Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
babsingh
force-pushed
the
ojdk_mhs_jdk8_v1
branch
from
98a97c3
to
6fb316a
Compare
|
Jenkins test sanity win jdk8 |
|
Jenkins test sanity plinux jdk17 |
tajila
approved these changes
May 25, 2022
keithc-ca
reviewed
May 25, 2022
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.
Disable VarHandle specific OJDK MH code in Java 8
Based upon current support, VarHandle specifc code should only be
enabled for JDK11 and onwards. Enabling it for JDK8 leads to the
VarHandle class not-found errors.
MethodHandleResolver changes to support OJDK MHs in JDK8
In JDK8, ...
parameter. This should resolve a compilation error.
BootstrapMethodError if method-type evaluation, from the descriptor string,
fails.
it also leads to compilation errors. So, this check has been removed from
resolveInvokeDynamic and sendResolveMethodHandle.
MHN changes to support OJDK MHs in JDK8
behaviour changes across JDK8, 11 and 17+.
if it is not included in the parameter list.
suggesting that OpenJ9 does not support the corresponding feature.
Closes: #14556
Signed-off-by: Babneet Singh sbabneet@ca.ibm.com