Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Jun 29, 2023

Clean backport to strengthen the affected path: calling array_element_address with T_INT is not correct. It is harmless for 17u now, but it breaks downstreams like Lilliput JDK 17u. While this does not fix a bug, the new code does the right thing, and it matches the code in mainline better.

Additional testing:

  • Linux x86_64 fastdebug tier1
  • Linux x86_64 fastdebug tier2
  • Linux x86_64 fastdebug tier3

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object() (Enhancement - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1516/head:pull/1516
$ git checkout pull/1516

Update a local copy of the PR:
$ git checkout pull/1516
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1516/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1516

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1516.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 29, 2023

👋 Welcome back shade! 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 changed the title Backport 2ba5cc4163ccd944e2df917e5d617a78fa4ee75b 8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object() Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

8284760: Correct type/array element offset in LibraryCallKit::get_state_from_digest_object()

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 29, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 29, 2023

Webrevs

@shipilev
Copy link
Member Author

shipilev commented Jul 4, 2023

Testing is clean. Push approval is here.

/integrate

@openjdk
Copy link

openjdk bot commented Jul 4, 2023

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

  • 8d6c17d: 8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark()
  • 00c6470: 8270794: Avoid loading Klass* twice in TypeArrayKlass::oop_size()
  • 43d4d02: 8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
  • 71f17d9: 8293811: Provide a reason for PassFailJFrame.forceFail
  • 996c6f7: 8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
  • 17744ca: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 4c5dd40: 8308872: enhance logging and some exception in krb5/Config.java
  • 788d658: 8306135: Clean up and open source some AWT tests
  • 2f31b3f: 8306575: Clean up and open source four Dialog related tests
  • a72bdbf: 8303047: avoid NULL after 8301661
  • ... and 1 more: https://git.openjdk.org/jdk17u-dev/compare/a563c45894496beb4ef775fcaa0e83d5512a6441...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 4, 2023

@shipilev Pushed as commit ce054c9.

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

@shipilev shipilev deleted the JDK-8284760-get-state-digest branch July 20, 2023 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant