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

8262726: AArch64: C1 StubAssembler::call_RT can corrupt stack #2787

Closed
wants to merge 1 commit into from

Conversation

@nick-arm
Copy link
Member

@nick-arm nick-arm commented Mar 2, 2021

StubAssembler::call_RT() has some code to shuffle arguments using the
stack as temporary storage. But there's a typo: the first pre(sp, 2 *
wordSize) should be pre(sp, -2 * wordSize) otherwise the pushes and pops
are unbalanced.

I think this was exposed by JDK-8259619 which fixed the conflict check
but AFAIK it only causes a problem on the Valhalla lworld branch and is
not used otherwise.

I would rather replace this code with an assert that the conflict never
occurs as we are in full control of the argument registers passed to
call_RT (the PPC port does this, for example).


Progress

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

Issue

  • JDK-8262726: AArch64: C1 StubAssembler::call_RT can corrupt stack

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2787/head:pull/2787
$ git checkout pull/2787

StubAssembler::call_RT() has some code to shuffle arguments using the
stack as temporary storage. But there's a typo: the first pre(sp, 2 *
wordSize) should be pre(sp, -2 * wordSize) otherwise the pushes and pops
are unbalanced.

I think this was exposed by JDK-8259619 which fixed the conflict check
but AFAIK it only causes a problem on the Valhalla lworld branch and is
not used otherwise.

I would rather replace this code with an assert that the conflict never
occurs as we are in full control of the argument registers passed to
call_RT (the PPC port does this, for example).
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 2, 2021

👋 Welcome back ngasson! 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.

@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Mar 2, 2021

Tested tier1 on AArch64.

@openjdk openjdk bot added the rfr label Mar 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 2, 2021

@nick-arm The following label will be automatically applied to this pull request:

  • hotspot-compiler

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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 2, 2021

Webrevs

Copy link
Contributor

@theRealAph theRealAph left a comment

Yes, looks like a simple mistake from 2013. Thanks.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 2, 2021

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

8262726: AArch64: C1 StubAssembler::call_RT can corrupt stack

Reviewed-by: aph

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

  • dd33a8e: 8262461: handle wcstombsdmp return value correctly in unix awt_InputMethod.c
  • 3b350ad: 8261710: SA DSO objects have sizes that are too large

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 label Mar 2, 2021
@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Mar 2, 2021

/integrate

@openjdk openjdk bot closed this Mar 2, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 2, 2021

@nick-arm Since your change was applied there have been 3 commits pushed to the master branch:

  • 0f6122b: 8262819: gc/shenandoah/compiler/TestLinkToNativeRBP.java fails with release VMs
  • dd33a8e: 8262461: handle wcstombsdmp return value correctly in unix awt_InputMethod.c
  • 3b350ad: 8261710: SA DSO objects have sizes that are too large

Your commit was automatically rebased without conflicts.

Pushed as commit be67aaa.

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