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

[JDK-8345428] Adapt JDK-8347147: [REDO] AccessFlags can be u2 in metadata #10271

Merged
merged 2 commits into from
Jan 8, 2025

Conversation

graalvmbot
Copy link
Collaborator

@graalvmbot graalvmbot commented Dec 9, 2024

openjdk/jdk#22968 makes AccessFlags an unsigned short

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Dec 9, 2024
@graalvmbot graalvmbot force-pushed the galahad-dev/JDK-8345428 branch 2 times, most recently from 9d1e3a0 to 2cd4529 Compare December 18, 2024 09:23
helper.emitFinalReturn(JavaKind.Int, new AndNode(accessFlags, ConstantNode.forInt(config.jvmAccWrittenFlags)));
if (JavaVersionUtil.JAVA_SPEC == 21) {
helper.emitFinalReturn(JavaKind.Int, new AndNode(accessFlags, ConstantNode.forInt(config.jvmAccWrittenFlags)));
} else {
Copy link
Member

Choose a reason for hiding this comment

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

I removed ACC_WRITTEN_FLAGS also. All the access flags are the ones written in the classfile now.

Copy link
Member

Choose a reason for hiding this comment

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

I see that now - it's checking against JDK 21.

@coleenp
Copy link
Member

coleenp commented Jan 7, 2025

I checked in the Hotspot version for this change just now.

@graalvmbot graalvmbot force-pushed the galahad-dev/JDK-8345428 branch from 2cd4529 to 1dcfc12 Compare January 8, 2025 10:04
@graalvmbot graalvmbot changed the title [JDK-8345428] Adapt JDK-8339113: AccessFlags can be u2 in metadata [JDK-8345428] Adapt JDK-8347147: [REDO] AccessFlags can be u2 in metadata Jan 8, 2025
@graalvmbot graalvmbot force-pushed the galahad-dev/JDK-8345428 branch from 1dcfc12 to 2c9d063 Compare January 8, 2025 20:05
@graalvmbot graalvmbot closed this Jan 8, 2025
@graalvmbot graalvmbot merged commit a83a690 into galahad Jan 8, 2025
4 of 13 checks passed
@graalvmbot graalvmbot deleted the galahad-dev/JDK-8345428 branch January 8, 2025 21:26
@Sanne
Copy link
Contributor

Sanne commented Jan 10, 2025

Hello team,
I was building from master today and native-image isn't working at all without these patches; I think they should also be applied to mainline asap?
Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants