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

8315698: Crash when comparing BasicType as int after JDK-8310577 #15568

Closed
wants to merge 4 commits into from

Conversation

djelinski
Copy link
Member

@djelinski djelinski commented Sep 5, 2023

Please review this patch that fixes the handling of result type parameter in call_stub on x64.

Since 5a82fa3 the parameter only needs one byte, and Windows ABI does not require the caller to clear the remaining bytes of the parameter register.

Clang clears the remainder of the register in release mode, but does not clear it in debug mode.
MSVC... It's complicated. Apparently MSVC-generated code clears the high bytes of the parameter register here.

This patch fixes the crashes with clang. (MSVC) Windows-x64 and (gcc) Linux-x64 builds still work, tiers 1-3 report no new failures.


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-8315698: Crash when comparing BasicType as int after JDK-8310577 (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15568

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 5, 2023

👋 Welcome back djelinski! 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 8315698 8315698: Java crash during startup Sep 5, 2023
@openjdk
Copy link

openjdk bot commented Sep 5, 2023

@djelinski 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 Sep 5, 2023
@djelinski djelinski marked this pull request as ready for review September 5, 2023 16:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 5, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 5, 2023

Webrevs

@djelinski djelinski changed the title 8315698: Java crash during startup 8315698: Crash when comparing BasicType as int Sep 5, 2023
@dean-long
Copy link
Member

I don't think there's much advantage to using an 8-bit value in the assembly code. How about changing the CallStub typedef to take "int" like the assembly code expects? That way all platforms are fixed, not just x86.

@djelinski
Copy link
Member Author

@dean-long Thanks for the suggestion. I updated the code.

@openjdk
Copy link

openjdk bot commented Sep 6, 2023

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

8315698: Crash when comparing BasicType as int after JDK-8310577

Reviewed-by: dlong, kvn, coleenp

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

  • 86a18f5: 8314604: j.text.DecimalFormat behavior regarding patterns is not clear
  • bd47781: 8315554: C1: Replace "cmp reg, 0" with "test reg, reg" on x86
  • 25e85db: 8307468: CDS Lambda Proxy classes are regenerated in dynamic dump
  • 024133b: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • 62a953f: 8315689: G1: Remove unused init_hash_seed
  • cfc1489: 8315579: SPARC64 builds are broken after JDK-8304913
  • f6c203e: 8314949: linux PPC64 Big Endian: Implementation of Foreign Function & Memory API
  • a01b3fb: 8288660: JavaDoc should be more helpful if it doesn't recognize a tag
  • ba1a463: 8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes?
  • a258fc4: 8315648: Add test for JDK-8309979 changes
  • ... and 26 more: https://git.openjdk.org/jdk/compare/3094fd1ac5153289434515d9b718bc5d6885b7dc...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 Sep 6, 2023
@djelinski djelinski changed the title 8315698: Crash when comparing BasicType as int 8315698: Crash when comparing BasicType as int after JDK-8310577 Sep 6, 2023
Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Looks good to me too.

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Thank you for finding and fixing this.

@djelinski
Copy link
Member Author

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Sep 7, 2023

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

  • b05198a: 8315600: Open source few more headless Swing misc tests
  • 4127fbb: 8315606: Open source few swing text/html tests
  • 9402548: 8268719: Force execution (and source) code page used when compiling on Windows
  • 86a18f5: 8314604: j.text.DecimalFormat behavior regarding patterns is not clear
  • bd47781: 8315554: C1: Replace "cmp reg, 0" with "test reg, reg" on x86
  • 25e85db: 8307468: CDS Lambda Proxy classes are regenerated in dynamic dump
  • 024133b: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • 62a953f: 8315689: G1: Remove unused init_hash_seed
  • cfc1489: 8315579: SPARC64 builds are broken after JDK-8304913
  • f6c203e: 8314949: linux PPC64 Big Endian: Implementation of Foreign Function & Memory API
  • ... and 29 more: https://git.openjdk.org/jdk/compare/3094fd1ac5153289434515d9b718bc5d6885b7dc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 7, 2023

@djelinski Pushed as commit ab28300.

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

@djelinski djelinski deleted the stubgenerator-basictype branch September 7, 2023 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
4 participants