Skip to content

Conversation

@dougxc
Copy link
Member

@dougxc dougxc commented May 30, 2023

This PR fixes JVMCI code installation such that if a Dependencies::call_site_target_value failure is detected (e.g. because the target of a MutableCallSite was changed concurrently with the JVMCI compilation), the decompilation count for the method is not incremented.

That is, this PR does for JVMCI what JDK-8173338 did for CI.


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-8308954: [JVMCI] code installation increments decompile_count for call_site_target_value failures

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14222

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2023

👋 Welcome back dnsimon! 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
Copy link

openjdk bot commented May 30, 2023

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

  • graal
  • hotspot-compiler

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 graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels May 30, 2023
@dougxc dougxc marked this pull request as ready for review June 1, 2023 11:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 1, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 1, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 1, 2023

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

8308954: [JVMCI] code installation increments decompile_count for call_site_target_value failures

Reviewed-by: never

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

  • 0ab0963: 8308469: [PPC64] Implement alternative fast-locking scheme
  • ec55539: 8309138: Fix container tests for jdks with symlinked conf dir
  • e827164: 8309146: extend JDI StackFrame.setValue() and JDWP StackFrame.setValues minimal support for virtual threads
  • be36096: 8302822: Method/Field/Constructor/RecordComponent::getGenericInfo() is not thread safe
  • c6f20db: 8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
  • d987176: 8307794: Test for HSS/LMS Signature Verification
  • 050425b: 8298127: HSS/LMS Signature Verification
  • a6109bf: 8308856: jdk.internal.classfile.impl.EntryMap::nextPowerOfTwo math problem
  • 6adc242: 8308943: jdk.internal.le build fails on AIX
  • 39f6d80: 8307990: jspawnhelper must close its writing side of a pipe before reading from it
  • ... and 49 more: https://git.openjdk.org/jdk/compare/1f1f604071dc2fca4849eb6ce251d5f18b443e16...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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 1, 2023
@dougxc
Copy link
Member Author

dougxc commented Jun 1, 2023

Thanks for the review Tom.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 1, 2023

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

  • 0ab0963: 8308469: [PPC64] Implement alternative fast-locking scheme
  • ec55539: 8309138: Fix container tests for jdks with symlinked conf dir
  • e827164: 8309146: extend JDI StackFrame.setValue() and JDWP StackFrame.setValues minimal support for virtual threads
  • be36096: 8302822: Method/Field/Constructor/RecordComponent::getGenericInfo() is not thread safe
  • c6f20db: 8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
  • d987176: 8307794: Test for HSS/LMS Signature Verification
  • 050425b: 8298127: HSS/LMS Signature Verification
  • a6109bf: 8308856: jdk.internal.classfile.impl.EntryMap::nextPowerOfTwo math problem
  • 6adc242: 8308943: jdk.internal.le build fails on AIX
  • 39f6d80: 8307990: jspawnhelper must close its writing side of a pipe before reading from it
  • ... and 49 more: https://git.openjdk.org/jdk/compare/1f1f604071dc2fca4849eb6ce251d5f18b443e16...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 1, 2023

@dougxc Pushed as commit 2bb1972.

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

@dougxc dougxc deleted the JDK-8308954 branch August 20, 2024 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants