Skip to content

8276314: [JVMCI] check alignment of call displacement during code installation #723

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 1 commit into from

Conversation

vnkozlov
Copy link
Contributor

@vnkozlov vnkozlov commented Dec 15, 2021

Backport for parity with 11.0.15-oracle. Changes slightly different from original fix in JDK 18. There are additional changes at lines 275-276 in nativeInst_x86.cpp.

Tier1-3 passed.


Progress

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

Issue

  • JDK-8276314: [JVMCI] check alignment of call displacement during code installation

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/723/head:pull/723
$ git checkout pull/723

Update a local copy of the PR:
$ git checkout pull/723
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/723/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 723

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/723.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2021

👋 Welcome back kvn! 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 2f4b5405f0b53782f3ed5274f68b31eb968efb6d 8276314: [JVMCI] check alignment of call displacement during code installation Dec 15, 2021
@openjdk
Copy link

openjdk bot commented Dec 15, 2021

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 rfr Pull request is ready for review labels Dec 15, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2021

Webrevs

@vnkozlov
Copy link
Contributor Author

Backport was approved.

@vnkozlov
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2021

@vnkozlov This pull request has not yet been marked as ready for integration.

@vnkozlov
Copy link
Contributor Author

@GoeLin can you also formally approve it? Doug reviewed it but PR is still not marked as properly reviewed. I don't know why.

Copy link
Member

@GoeLin GoeLin 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
Copy link

openjdk bot commented Dec 22, 2021

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

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

8276314: [JVMCI] check alignment of call displacement during code installation

Reviewed-by: dnsimon, goetz

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

  • fdf21b6: 8265150: AsyncGetCallTrace crashes on ResourceMark
  • 2893731: 8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"
  • cd8ea37: 8273638: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
  • fc54784: 8258554: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
  • bf7c965: 8277385: Zero: Enable CompactStrings support
  • bd97b56: 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
  • d3c2dc0: 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx
  • ec89f1b: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
  • b07b90f: 8278309: [windows] use of uninitialized OSThread::_state
  • 86c2995: 8202142: jfr/event/io/TestInstrumentation is unstable

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 the ready Pull request is ready to be integrated label Dec 22, 2021
@GoeLin
Copy link
Member

GoeLin commented Dec 22, 2021

Here we go: "ready" -- no idea what was wrong.

@vnkozlov
Copy link
Contributor Author

Thanks!!

@vnkozlov
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 22, 2021

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

  • fdf21b6: 8265150: AsyncGetCallTrace crashes on ResourceMark
  • 2893731: 8276177: nsk/jvmti/RedefineClasses/StressRedefineWithoutBytecodeCorruption failed with "assert(def_ik->is_being_redefined()) failed: should be being redefined to get here"
  • cd8ea37: 8273638: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
  • fc54784: 8258554: javax/swing/JTable/4235420/bug4235420.java fails in GTK L&F
  • bf7c965: 8277385: Zero: Enable CompactStrings support
  • bd97b56: 8278116: runtime/modules/LoadUnloadModuleStress.java has duplicate -Xmx
  • d3c2dc0: 8278115: gc/stress/gclocker/TestGCLockerWithSerial.java has duplicate -Xmx
  • ec89f1b: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
  • b07b90f: 8278309: [windows] use of uninitialized OSThread::_state
  • 86c2995: 8202142: jfr/event/io/TestInstrumentation is unstable

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 22, 2021

@vnkozlov Pushed as commit 8989823.

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

@vnkozlov vnkozlov deleted the JDK-8276314 branch December 22, 2021 18:54
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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants