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

Jump to bottom

8254611: x86_32: Call to IRT::at_unwind clobbers rthread after JDK-8253180 #615

Closed
wants to merge 1 commit into from
Closed

8254611: x86_32: Call to IRT::at_unwind clobbers rthread after JDK-8253180 #615

wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Oct 12, 2020 •
edited

There are massive x86_32 tier1 failures, bisection points to JDK-8253180. I think I know why this happens: in InterpreterMacroAssembler::remove_activation, there is a new call_VM to InterpreterRuntime::at_unwind, which broke the rthread (rcx) that x86_32 needs later. x86_64 is not affected, because it carries it in r15_thread.

Attention @fisk.

Additional testing:

  • x86_32 tier1

Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

  • JDK-8254611: x86_32: Call to IRT::at_unwind clobbers rthread after JDK-8253180

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 12, 2020

👋 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
Copy link

openjdk bot commented Oct 12, 2020

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Oct 12, 2020
@shipilev shipilev marked this pull request as ready for review October 12, 2020 19:27
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 12, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 12, 2020

Webrevs

fisk
fisk approved these changes Oct 12, 2020
View reviewed changes
Copy link
Contributor

@fisk fisk left a comment

Choose a reason for hiding this comment

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

Oops. Looks good Aleksey - thanks for fixing. Obviously another solution is to not perform the call on 32 bit x86, as the stack watermark barriers are not supported yet there. But perhaps if someone wants to have a stab at that, it could be good to do roughly the same thing now. With that said - ship it!

@openjdk
Copy link

openjdk bot commented Oct 12, 2020 •
edited

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

8254611: x86_32: Call to IRT::at_unwind clobbers rthread after JDK-8253180

Reviewed-by: eosterlund

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

  • c9ca1bb: 8254364: Remove leading _ from struct/union declarations in jvmti.h
  • e49232a: 8254599: CDS dump should not warn about hidden classes
  • b464213: 8252407: Build failure with gcc-8+ and asan
  • 2a4328b: 8254610: Problem list test compiler/debug/TestStressCM.java
  • bff586f: 8254269: simplify Node::disconnect_inputs
  • d7128e7: 8254090: Collectors.toUnmodifiableList exposes shared secret
  • df1f132: 8253563: Change sun.security.jca.Providers.threadLists to be ThreadLocal
  • c7f0064: 8253899: Make IsClassUnloadingEnabled signature match specification
  • aad3cf4: 8254234: Add test library stream object builder
  • 4184959: 8252374: Add a new factory method to concatenate a sequence of BodyPublisher instances into a single publisher.
  • ... and 2 more: https://git.openjdk.java.net/jdk/compare/a6c23b7753b9196befdd0f995faf5c77249c4247...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 Oct 12, 2020
@shipilev
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Oct 13, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 13, 2020
@openjdk
Copy link

openjdk bot commented Oct 13, 2020

@shipilev Since your change was applied there have been 12 commits pushed to the master branch:

  • c9ca1bb: 8254364: Remove leading _ from struct/union declarations in jvmti.h
  • e49232a: 8254599: CDS dump should not warn about hidden classes
  • b464213: 8252407: Build failure with gcc-8+ and asan
  • 2a4328b: 8254610: Problem list test compiler/debug/TestStressCM.java
  • bff586f: 8254269: simplify Node::disconnect_inputs
  • d7128e7: 8254090: Collectors.toUnmodifiableList exposes shared secret
  • df1f132: 8253563: Change sun.security.jca.Providers.threadLists to be ThreadLocal
  • c7f0064: 8253899: Make IsClassUnloadingEnabled signature match specification
  • aad3cf4: 8254234: Add test library stream object builder
  • 4184959: 8252374: Add a new factory method to concatenate a sequence of BodyPublisher instances into a single publisher.
  • ... and 2 more: https://git.openjdk.java.net/jdk/compare/a6c23b7753b9196befdd0f995faf5c77249c4247...master

Your commit was automatically rebased without conflicts.

Pushed as commit 90de289.

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

@shipilev shipilev deleted the JDK-8254611-x86-clobbered-rthread branch October 13, 2020 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fisk fisk fisk approved these changes

Assignees
No one assigned
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
2 participants
@shipilev @fisk