Skip to content

valhalla jdk-23+1 bringup - #19423

Merged
hangshao0 merged 1 commit into
eclipse-openj9:masterfrom
JasonFengJ9:valhallamerge
May 3, 2024
Merged

valhalla jdk-23+1 bringup#19423
hangshao0 merged 1 commit into
eclipse-openj9:masterfrom
JasonFengJ9:valhallamerge

Conversation

@JasonFengJ9

@JasonFengJ9 JasonFengJ9 commented Apr 30, 2024

Copy link
Copy Markdown
Member

valhalla jdk-23+1 bringup

Removed jdk.internal.value.PrimitiveClass references, and updated Access for APIs;
Removed Modifier.VALUE references;
Renamed Unsafe methods isFlattenedArray() to isFlatArray(), isFlattened() to isFlatField(), and updated the references;
Added stub methods JVM_IsImplicitlyConstructibleClass(), JVM_IsNullRestrictedArray() and JVM_NewNullRestrictedArray();
Renamed MN_FLATTENED to MN_FLAT_FIELD according to java.lang.invoke.MethodHandleNatives, also added MN_NULL_RESTRICTED, and updated MN_REFERENCE_KIND_SHIFT and MN_REFERENCE_KIND_MASK;
Added fieldalias for java.lang.reflect.Field.flags.

Required by

Signed-off-by: Jason Feng fengj@ca.ibm.com

@hangshao0

Copy link
Copy Markdown
Contributor

@theresa-m, this is the change required in OpenJ9 to let us merge in the latest Valhalla change in the extension repo. I've added you as reviewer.

Once this change is merged, there might be some updates needed for Valhalla tests which are based on the obsolete spec. You mighty have already identified or fixed some of them when working with lw5 before.

Comment thread jcl/src/java.base/share/classes/java/lang/Class.java Outdated
Comment thread jcl/src/java.base/share/classes/java/lang/Class.java Outdated
Comment thread jcl/src/java.base/share/classes/java/lang/Class.java Outdated
Comment thread jcl/src/java.base/share/classes/java/lang/Object.java Outdated
Comment thread jcl/src/java.base/share/classes/java/lang/Class.java Outdated
@hangshao0

Copy link
Copy Markdown
Contributor

Jenkins compile zlinuxval jdknext depends ibmruntimes/openj9-openjdk-jdk.valuetypes#11

@hangshao0

Copy link
Copy Markdown
Contributor

Jenkins compile winval jdknext depends ibmruntimes/openj9-openjdk-jdk.valuetypes#11

Removed jdk.internal.value.PrimitiveClass references, and updated Access
for APIs;
Removed Modifier.VALUE references;
Renamed Unsafe methods isFlattenedArray() to isFlatArray(),
isFlattened() to isFlatField(), and updated the references;
Added stub methods JVM_IsImplicitlyConstructibleClass(),
JVM_IsNullRestrictedArray() and JVM_NewNullRestrictedArray();
Renamed MN_FLATTENED to MN_FLAT_FIELD according to
java.lang.invoke.MethodHandleNatives, also added MN_NULL_RESTRICTED, and
updated MN_REFERENCE_KIND_SHIFT and MN_REFERENCE_KIND_MASK;
Added fieldalias for java.lang.reflect.Field.flags.

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@JasonFengJ9

Copy link
Copy Markdown
Member Author

Resolved the merging conflict.

@hangshao0

Copy link
Copy Markdown
Contributor

Jenkins compile zlinux jdknext

@hangshao0

Copy link
Copy Markdown
Contributor

Launched an internal Valhalla build to test the changes. There is a failure. @JasonFengJ9 is looking at that.

@JasonFengJ9

Copy link
Copy Markdown
Member Author
18:04:59  /home/jenkins/workspace/Build_JDKnext_x86-64_linux_valhalla_Personal/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp:208:8: error: 'found' was not declared in this scope
18:04:59    208 |   if (!found) {

Failed at test code compilation.

@JasonFengJ9

JasonFengJ9 commented May 2, 2024

Copy link
Copy Markdown
Member Author

Launched an internal personal build - passed

@hangshao0 hangshao0 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@hangshao0
hangshao0 merged commit 3992b31 into eclipse-openj9:master May 3, 2024
@hangshao0

Copy link
Copy Markdown
Contributor

FYI @hzongaro @a7ehuo
With this PR and ibmruntimes/openj9-openjdk-jdk.valuetypes#11 merged, we brought in the latest Valhalla changes from OpenJDK.

@JasonFengJ9
JasonFengJ9 deleted the valhallamerge branch May 3, 2024 14:16
Comment thread runtime/oti/j9nonbuilder.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp:vm project:valhalla Used to track Project Valhalla related work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants