Valhalla support to merge latest OpenJDK contents - #22641
Conversation
e3a992f to
72c9c40
Compare
|
@theresa-m could you have a look? |
theresa-m
left a comment
There was a problem hiding this comment.
It looks like ValueClass.newNullRestrictedArray has been replaced by ValueClass.newNullRestrictedAtomicArray and ValueClass.newNullRestrictedNonAtomicArray. Instead of removing the tests that rely on newNullRestrictedArray I suggest replacing them all with newNullRestrictedAtomicArray for now. Once newNullRestrictedNonAtomicArray is implemented the tests can be updated to use the correct one.
72c9c40 to
f01b1fe
Compare
f01b1fe to
49e76a2
Compare
49e76a2 to
8b484a2
Compare
|
Please open a pull request at https://github.com/ibmruntimes/openj9-openjdk-jdk.valuetypes with the content required for this change. |
|
There are more tests that can be enabled. The flattened field tests should mostly work except those that relied on classes with the implicit creation annotation. Something like theresa-m@119430d |
581fdac to
10366c7
Compare
|
I think this looks good, but I'd like to hear from @theresa-m, especially with respect to the test code. When everyone is happy, this should be rebased to avoid implicit merges. |
theresa-m
left a comment
There was a problem hiding this comment.
Looks good to me. Thanks for making these changes.
|
@hzongaro could you review the JIT change? |
|
@hzongaro - A friendly reminder that this awaits your review.
|
hzongaro
left a comment
There was a problem hiding this comment.
Sorry for my delay in reviewing these changes. I'm approving the JIT changes, and I have opened a follow up issue #22769 for someone on the JIT team to go back and add JIT recognition of newly introduced methods for creating non-atomic arrays, etc.
|
Please rebase to avoid implicit merges. |
Updated Access APIs according to Valhalla JavaLangAccess; Added Unsafe.getAndSetReference/getAndSetReferenceAcquire/getAndSetReferenceRelease/notifyStrictStaticAccess stub methods; Removed Unsafe.uninitializedDefaultValue/newArrayInstance; Removed @ImplicitlyConstructible; Removed JVM_IsImplicitlyConstructibleClass/JVM_NewNullRestrictedArray; Added JVM_CopyOfSpecialArray/JVM_IsAtomicArray/JVM_NewNullRestrictedNonAtomicArray stub methods; Updated VALUE_TYPES_MAJOR_VERSION; Replaced ValueClass.newNullRestrictedArray() with ValueClass.newNullRestrictedAtomicArray(); Added @strict annotations; Removed CheckedType/NormalCheckedType/NullRestrictedCheckedType, ValueClass isImplicitlyConstructible references; Disabled tests expecting implicitly constructible classes as inputs; Keep the array initialization temporarily; Updated test build setup. Co-authored-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com> Signed-off-by: Jason Feng <fengj@ca.ibm.com>
10366c7 to
6e69c6b
Compare
|
Rebased |
|
Jenkins test sanity amac jdk25,jdknext |
|
https://openj9-jenkins.osuosl.org/job/Test_openjdknext_j9_sanity.functional_aarch64_mac_Personal_testList_0/51/consoleFull This is #22746 |
Valhalla support to merge latest OpenJDK contents
Updated
AccessAPIs according to ValhallaJavaLangAccess;Added
Unsafe.getAndSetReference/getAndSetReferenceAcquire/getAndSetReferenceRelease/notifyStrictStaticAccessstub methods;Removed
Unsafe.uninitializedDefaultValue/newArrayInstance;Removed
@ImplicitlyConstructible;Removed
JVM_IsImplicitlyConstructibleClass/JVM_NewNullRestrictedArray;Added
JVM_CopyOfSpecialArray/JVM_IsAtomicArray/JVM_NewNullRestrictedNonAtomicArraystub methods;Updated
VALUE_TYPES_MAJOR_VERSION;Replaced
ValueClass.newNullRestrictedArray()withValueClass.newNullRestrictedAtomicArray();Added
@Strict annotations;Removed
CheckedType/NormalCheckedType/NullRestrictedCheckedType,ValueClassisImplicitlyConstructible` references;Disabled tests expecting implicitly constructible classes as inputs;
Keep the array initialization temporarily;
Updated test build setup.
Related to
A personal build JDKnext_x86-64_linux_valhalla
Co-authored-by: Theresa Mammarella Theresa.T.Mammarella@ibm.com
Signed-off-by: Jason Feng fengj@ca.ibm.com