Add MN_HIDDEN_MEMBER and change MN_FLATTENED - #18238
Merged
Merged
Conversation
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
JasonFengJ9
added
comp:vm
project:valhalla
tajila
approved these changes
Oct 6, 2023
Contributor
|
jenkins compile win jdk8 |
Contributor
|
jenkins test sanity xlinux jdk21 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Add
MN_HIDDEN_MEMBERand changeMN_FLATTENEDMN_HIDDEN_MEMBER = 0x00400000was introduced at ibmruntimes/openj9-openjdk-jdk@373341aThis 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