Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MN_HIDDEN_MEMBER and change MN_FLATTENED #18238

Merged
merged 1 commit into from Oct 6, 2023

Conversation

JasonFengJ9
Copy link
Member

@JasonFengJ9 JasonFengJ9 commented Oct 5, 2023

Add MN_HIDDEN_MEMBER and change MN_FLATTENED

MN_HIDDEN_MEMBER = 0x00400000 was introduced at ibmruntimes/openj9-openjdk-jdk@373341a
This is in conflict with the existing MN_FLATTENED = 0x00400000, // flattened field
A change resolving merging conflict from JDK Next to valhalla extension depends on this change.

Note: OpenJDK valhalla hasn't be merged with latest OpenJDK head stream yet.

Alternatively, we might wait for OpenJDK valhalla updates however the OpenJ9 valhalla extension will miss the change from the head extension and have an issue such as #18231.

FYI @hangshao0

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

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@JasonFengJ9 JasonFengJ9 added comp:vm project:valhalla Used to track Project Valhalla related work labels Oct 5, 2023
@tajila
Copy link
Contributor

tajila commented Oct 6, 2023

jenkins compile win jdk8

@tajila
Copy link
Contributor

tajila commented Oct 6, 2023

jenkins test sanity xlinux jdk21

@tajila tajila merged commit 4e1d1c6 into eclipse-openj9:master Oct 6, 2023
6 checks passed
@JasonFengJ9 JasonFengJ9 deleted the valhallaflatten branch October 6, 2023 21:54
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.

None yet

2 participants