Skip to content
This repository has been archived by the owner. It is now read-only.

8268366 Incorrect calculation of has_fpu_registers in C1 linear scan #10

Closed
wants to merge 2 commits into from

Conversation

dean-long
Copy link
Member

@dean-long dean-long commented Jun 10, 2021

If there is a mismatch between bytecode use of floating point and generated IR, has_fpu_registers can get an incorrect value and result in a crash or assert. This PR adds a missing case for the computation of has_fpu_registers, restores an assert that was removed, adds a bailout for non-debug builds, and adds a test.


Progress

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

Issue

  • JDK-8268366: Incorrect calculation of has_fpu_registers in C1 linear scan

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17 pull/10/head:pull/10
$ git checkout pull/10

Update a local copy of the PR:
$ git checkout pull/10
$ git pull https://git.openjdk.java.net/jdk17 pull/10/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17/pull/10.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 10, 2021

👋 Welcome back dlong! 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 openjdk bot commented Jun 10, 2021

@dean-long 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 label Jun 10, 2021
@dean-long dean-long marked this pull request as ready for review Jun 10, 2021
@openjdk openjdk bot added the rfr label Jun 10, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 10, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Jun 11, 2021

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

8268366: Incorrect calculation of has_fpu_registers in C1 linear scan

Reviewed-by: kvn, chagedorn

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

  • 6171ae4: 8268630: ProblemList serviceability/jvmti/CompiledMethodLoad/Zombie.java on linux-aarch64
  • 01054e6: 8268470: CDS dynamic dump asserts with JFR RecordingStream
  • e39346e: 8268093: Manual Testcase: "sun/security/krb5/config/native/TestDynamicStore.java" Fails with NPE
  • cce8da2: 8268602: a couple runtime/os tests don't check exit code
  • da043e9: 8268555: Update HttpClient tests that use ITestContext to jtreg 6+1
  • a437ce8: 8268580: runtime/memory/LargePages/TestLargePagesFlags.java should be run in driver mode
  • bd9c2fa: 8268565: runtime/records/RedefineRecord.java should be run in driver mode
  • e3eef3b: 8268576: jdk/jfr/event/gc/collection/TestSystemGc.java fails

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 Jun 11, 2021
@dean-long
Copy link
Member Author

@dean-long dean-long commented Jun 11, 2021

Thanks @vnkozlov

Copy link
Member

@chhagedorn chhagedorn left a comment

Otherwise, the fix looks good.

src/hotspot/share/c1/c1_LinearScan.cpp Outdated Show resolved Hide resolved
src/hotspot/share/c1/c1_LinearScan.cpp Outdated Show resolved Hide resolved
Copy link
Member

@chhagedorn chhagedorn left a comment

Looks good, thanks for the changes!

@dean-long
Copy link
Member Author

@dean-long dean-long commented Jun 14, 2021

Thanks Christian.

@dean-long
Copy link
Member Author

@dean-long dean-long commented Jun 14, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 14, 2021

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

  • bca914b: 8268670: yield statements doesn't allow ~ or ! unary operators in expression
  • c088d09: 8268522: InstanceKlass::can_be_verified_at_dumptime() returns opposite value
  • abe20c1: 8268333: javac crashes when pattern matching switch contains default case which is not last
  • b318535: 8267579: Thread::cooked_allocated_bytes() hits assert(left >= right) failed: avoid underflow
  • fe48ea9: 8268342: java/foreign/channels/TestAsyncSocketChannels.java fails with "IllegalStateException: This segment is already closed"
  • 6171ae4: 8268630: ProblemList serviceability/jvmti/CompiledMethodLoad/Zombie.java on linux-aarch64
  • 01054e6: 8268470: CDS dynamic dump asserts with JFR RecordingStream
  • e39346e: 8268093: Manual Testcase: "sun/security/krb5/config/native/TestDynamicStore.java" Fails with NPE
  • cce8da2: 8268602: a couple runtime/os tests don't check exit code
  • da043e9: 8268555: Update HttpClient tests that use ITestContext to jtreg 6+1
  • ... and 3 more: https://git.openjdk.java.net/jdk17/compare/7b2e7d8bab890bd655093976cc9c3b0b6d00c034...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Jun 14, 2021

@dean-long Pushed as commit 702e3ff.

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

@dean-long dean-long deleted the JDK-8268366 branch Aug 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hotspot-compiler integrated
3 participants