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

8311172: Classfile.PREVIEW_MINOR_VERSION doesn't match that read from class files #14731

Closed
wants to merge 2 commits into from

Conversation

liach
Copy link
Member

@liach liach commented Jun 30, 2023

Classfile.PREVIEW_MINOR_VERSION, currently -1, is correct when passed to ClassBuilder::withVersion, but is incorrect when compared to ClassModel::minorVersion, which only sets the bits of 2 lowest bytes to 1 (65536). Discovered when trying to replace an asserted preview minor version with this constant in PreviewHiddenClass test porting in #13009, which is currently failing.

Requesting a review from @asotona.


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

Issue

  • JDK-8311172: Classfile.PREVIEW_MINOR_VERSION doesn't match that read from class files (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14731

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 30, 2023

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 30, 2023
@openjdk
Copy link

openjdk bot commented Jun 30, 2023

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

  • core-libs

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jun 30, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 30, 2023

Webrevs

Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

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

It looks good, thanks for the fix.

@openjdk
Copy link

openjdk bot commented Jul 17, 2023

@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:

8311172: Classfile.PREVIEW_MINOR_VERSION doesn't match that read from class files

Reviewed-by: asotona

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 134 new commits pushed to the master branch:

  • 1c9691b: 8312093: Incorrect javadoc comment text
  • 37ca902: 8310233: Fix THP detection on Linux
  • 81c4e8f: 8304006: jlink should create the jimage file in the native endian for the target platform
  • e8f66bf: 8310949: RISC-V: Initialize UseUnalignedAccesses
  • 19691fa: 6361826: (reflect) provide method for mapping strings to class object for primitive types
  • c84866a: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • 0d2196f: 8311992: Test java/lang/Thread/virtual/JfrEvents::testVirtualThreadPinned failed
  • f3b96f6: 8311862: RISC-V: small improvements to shift immediate instructions
  • a63f865: 8311946: add support for libgraal specific jtreg tests
  • 167d1c1: 8311986: Disable runtime/os/TestTracePageSizes.java for ShenandoahGC
  • ... and 124 more: https://git.openjdk.org/jdk/compare/77e7b6d2a135ed46ba405914b4eea7412d887705...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@asotona) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 17, 2023
@liach
Copy link
Member Author

liach commented Jul 17, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 17, 2023
@openjdk
Copy link

openjdk bot commented Jul 17, 2023

@liach
Your change (at version 64bcaeb) is now ready to be sponsored by a Committer.

@asotona
Copy link
Member

asotona commented Jul 17, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 17, 2023

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

  • afcf8e4: 8290005: com/sun/jndi/ldap/LdapCBPropertiesTest.java failling with NullPointerException
  • acf591e: 8140527: JInternalFrame has incorrect title button width
  • f6e23ae: 8310201: Reduce verbose locale output in -XshowSettings launcher option
  • a441216: 8311815: Incorrect exhaustivity computation
  • 1c9691b: 8312093: Incorrect javadoc comment text
  • 37ca902: 8310233: Fix THP detection on Linux
  • 81c4e8f: 8304006: jlink should create the jimage file in the native endian for the target platform
  • e8f66bf: 8310949: RISC-V: Initialize UseUnalignedAccesses
  • 19691fa: 6361826: (reflect) provide method for mapping strings to class object for primitive types
  • c84866a: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • ... and 128 more: https://git.openjdk.org/jdk/compare/77e7b6d2a135ed46ba405914b4eea7412d887705...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 17, 2023
@openjdk openjdk bot closed this Jul 17, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jul 17, 2023
@openjdk
Copy link

openjdk bot commented Jul 17, 2023

@asotona @liach Pushed as commit 3fb9d11.

💡 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
2 participants