Unblock JDK-next (JDK18) acceptance build #13890
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
Update the signature of NativeLibraries.load in native code for JDK18. Co-authored-by: Jason Feng <fengj@ca.ibm.com> Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
|
Started Personal build #11090 to validate that the above changes will unblock the JDK-next acceptance build. |
|
Started a non-promoting acceptance build with these changes https://openj9-jenkins.osuosl.org/job/Pipeline-OpenJDK-Acceptance/147/ |
|
jenkins test sanity zlinux jdk11,jdk17 |
|
jenkins compile win32 jdk8 |
JasonFengJ9
reviewed
Nov 9, 2021
keithc-ca
reviewed
Nov 10, 2021
|
All the testing I started looks good. I don't expect we'll need to re-run it all if the only changes are comments and formatting. |
0xdaryl
approved these changes
Nov 10, 2021
Setting jdk.reflect.useDirectMethodHandle to false disables the new JEP 416 changes where the reflection API is dependent on the MethodHandle API. This flag will be reenabled once OpenJ9 supports JEP 416. Related: eclipse-openj9#13852 Related: eclipse-openj9#13880 Co-authored-by: Jason Feng <fengj@ca.ibm.com> Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
babsingh
force-pushed
the
unblock_jdknext
branch
from
f3897f7
to
e192598
Compare
babsingh
commented
Nov 10, 2021
fengxue-IS
reviewed
Nov 10, 2021
MemberName.vminfoIsConsistent is only used in an assertion to validate the vmtarget and vmindex elements of MemberName. It relies on MHN.getMemberVMInfo to retrieve the vmtarget and vmindex elements of MemberName. For correct validation, MHN.getMemberVMInfo should return 0 for vmindex when the vTableIndex is 0 and ref kind is invokevirtual or invokeinterface. Otherwise, it should return -1 for vmindex. MHN.getMemberVMInfo has been updated to perform this behaviour. This in return fixes the behaviour of MemberName.vminfoIsConsistent. Closes: eclipse-openj9#13877 Co-authored-by: Jack Lu <Jack.S.Lu@ibm.com> Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
In JDK17, InjectedInvoker does not have the NESTMATE attribute. In JDK18, InjectedInvoker's definition has been updated, and it is given the NESTMATE attribute. The new changes invalidate the filter that is used to identify InjectedInvoker classes for modifying its class name. The filter has been updated to work with JDK18. Closes: eclipse-openj9#13878 Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
babsingh
force-pushed
the
unblock_jdknext
branch
from
e192598
to
0bd9baf
Compare
fengxue-IS
approved these changes
Nov 10, 2021
|
I think the test failure in https://openj9-jenkins.osuosl.org/job/Pipeline_Build_Test_JDK17_s390x_linux/200/ is #11293. |
keithc-ca
approved these changes
Nov 10, 2021
|
@tajila once you approve, pls leave the merging to me. I think we'll need to run the acceptance build again as we've already got new content, and jdknext needs to promote at the same time as this is merged or nightly builds will be broken. |
tajila
approved these changes
Nov 10, 2021
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.
1. Signature of NativeLibraries.load has changed in JDK18
Update the signature of NativeLibraries.load in native code for JDK18.
2. Set the useDirectMethodHandle Java flag to false
Setting jdk.reflect.useDirectMethodHandle to false disables the new JEP 416
changes where the reflection API is dependent on the MethodHandle API.
This flag will be reenabled once OpenJ9 supports JEP 416.
Related: #13852
Related: #13880
3. Update MHN.getMemberVMInfo to work with MemberName.vminfoIsConsistent
MemberName.vminfoIsConsistent is only used in an assertion to validate the
vmtarget and vmindex elements of MemberName. It relies on MHN.getMemberVMInfo
to retrieve the vmtarget and vmindex elements of MemberName.
For correct validation, MHN.getMemberVMInfo should return 0 for vmindex when
the vTableIndex is 0 and ref kind is invokevirtual or invokeinterface.
Otherwise, it should return -1 for vmindex. MHN.getMemberVMInfo has been
updated to perform this behaviour. This in return fixes the behaviour of
MemberName.vminfoIsConsistent.
Closes: #13877
4. InjectedInvoker behaviour modified in JDK18
In JDK17, InjectedInvoker does not have the NESTMATE attribute. In JDK18,
InjectedInvoker's definition has been updated, and it is given the NESTMATE
attribute. The new changes invalidate the filter that is used to identify
InjectedInvoker classes for modifying its class name. The filter has been
updated to work with JDK18.
Closes: #13878
Co-authored-by: Jason Feng fengj@ca.ibm.com
Co-authored-by: Jack Lu Jack.S.Lu@ibm.com
Signed-off-by: Babneet Singh sbabneet@ca.ibm.com