Skip to content

8297271: AccessFlag.maskToAccessFlags should be specific to class file version #24760

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

Closed
wants to merge 31 commits into from

Conversation

liach
Copy link
Member

@liach liach commented Apr 18, 2025

Take the class file version to reject flags not yet defined, redefined, or obsoleted. This is useful for clients like javap to report the correct undefined flags for different class file versions.

A preparatory patch for javap to pass around the ClassFileFormatVersion to parse flags is available at #24955.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8297741 to be approved

Issues

  • JDK-8297271: AccessFlag.maskToAccessFlags should be specific to class file version (Enhancement - P3)
  • JDK-8297741: AccessFlag.maskToAccessFlags should be specific to class file version (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24760/head:pull/24760
$ git checkout pull/24760

Update a local copy of the PR:
$ git checkout pull/24760
$ git pull https://git.openjdk.org/jdk.git pull/24760/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24760

View PR using the GUI difftool:
$ git pr show -t 24760

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24760.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 18, 2025

👋 Welcome back liach! A progress list of the required criteria for merging this PR into pr/23095 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 18, 2025

@liach This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8297271: AccessFlag.maskToAccessFlags should be specific to class file version

Reviewed-by: rriggs

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 6 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels Apr 18, 2025
@openjdk
Copy link

openjdk bot commented Apr 18, 2025

@liach The following labels will be automatically applied to this pull request:

  • core-libs
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Apr 18, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 18, 2025

Webrevs

@ExE-Boss
Copy link

With this, the Class‑File API needs to be updated to pass the current class file format version to the calls of AccessFlag​.maskToAccessFlags(…).

@liach
Copy link
Member Author

liach commented Apr 19, 2025

That is tracked in a separate bug linked as a dependent on this issue.

@openjdk
Copy link

openjdk bot commented Apr 23, 2025

@liach this pull request can not be integrated into pr/23095 due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout feature/af-cffv-parse
git fetch https://git.openjdk.org/jdk.git pr/23095
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/23095"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Apr 23, 2025
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Apr 26, 2025
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/23095 to master April 30, 2025 00:42
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout feature/af-cffv-parse
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Apr 30, 2025

⚠️ @liach This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed csr Pull request needs approved CSR before integration labels Apr 30, 2025
@liach liach changed the base branch from master to pr/24955 April 30, 2025 18:00
@liach liach marked this pull request as ready for review April 30, 2025 18:13
@openjdk openjdk bot added rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch labels Apr 30, 2025
Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

lgtm

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/24955 to master April 30, 2025 21:59
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout feature/af-cffv-parse
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Apr 30, 2025
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Apr 30, 2025
@liach
Copy link
Member Author

liach commented Apr 30, 2025

Did a trivial merge and reran the sanity tests for javap and AccessFlag.

@liach liach requested a review from RogerRiggs April 30, 2025 22:09
@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 1, 2025
@liach
Copy link
Member Author

liach commented May 1, 2025

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented May 1, 2025

Going to push as commit bee273d.
Since your change was applied there have been 7 commits pushed to the master branch:

  • 34807df: 8355779: When no "signature_algorithms_cert" extension is present we do not apply certificate scope constraints to algorithms in "signature_algorithms" extension
  • 7b31762: 8354235: Test javax/net/ssl/SSLSocket/Tls13PacketSize.java failed with java.net.SocketException: An established connection was aborted by the software in your host machine
  • 0cd0afb: 8355913: RISC-V: improve hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
  • ... and 4 more: https://git.openjdk.org/jdk/compare/e36756b264000fe2deb95ec8f68d1571fd7653f9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 1, 2025
@openjdk openjdk bot closed this May 1, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 1, 2025
@openjdk
Copy link

openjdk bot commented May 1, 2025

@liach Pushed as commit bee273d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants