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

8310844: [AArch64] C1 compilation fails because monitor offset in OSR buffer is too large for immediate #137

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 8, 2024

Clean backport to fix 1.5 yrs old regression. Effectively reverts JDK-8287349.

Additional testing:

  • macos-aarch64-server-fastdebug: New test fails without a patch, passes with it
  • linux-aarch64-server-fastdebug, tier{1,2,3}

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8310844 needs maintainer approval

Issue

  • JDK-8310844: [AArch64] C1 compilation fails because monitor offset in OSR buffer is too large for immediate (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/137/head:pull/137
$ git checkout pull/137

Update a local copy of the PR:
$ git checkout pull/137
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/137/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 137

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/137.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 8, 2024

👋 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 openjdk bot changed the title Backport ade21a965f8a5fc889cd48bba76fad507bdeddf5 8310844: [AArch64] C1 compilation fails because monitor offset in OSR buffer is too large for immediate Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 8, 2024
@shipilev
Copy link
Member Author

shipilev commented Jan 8, 2024

/approval request Clean backport to fix 1.5 yrs old regression. Effectively reverts JDK-8287349. New regression test works.

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@shipilev
8310844: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 8, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 8, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

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

8310844: [AArch64] C1 compilation fails because monitor offset in OSR buffer is too large for immediate

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

  • 1a9c7ec: 8318082: ConcurrentModificationException from IndexWriter
  • b745bb5: 8319883: Zero: Use atomic built-ins for 64-bit accesses
  • a85f3f8: 8320145: Compiler should accept final variable in Record Pattern
  • 1e66488: 8321599: Data loss in AVX3 Base64 decoding
  • d4797b7: 8316693: Simplify at-requires checkDockerSupport()
  • dfc9324: 8319879: Stress mode to randomize incremental inlining decision
  • 307569f: 8319938: TestFileChooserSingleDirectorySelection.java fails with "getSelectedFiles returned empty array"
  • db1fa92: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c8caefa: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
  • e8aa37d: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • ... and 11 more: https://git.openjdk.org/jdk21u-dev/compare/966071a5f10a7a8910b2639e10c961924a07d675...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 ready Pull request is ready to be integrated and removed approval labels Jan 9, 2024
@shipilev
Copy link
Member Author

shipilev commented Jan 9, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

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

  • 1a9c7ec: 8318082: ConcurrentModificationException from IndexWriter
  • b745bb5: 8319883: Zero: Use atomic built-ins for 64-bit accesses
  • a85f3f8: 8320145: Compiler should accept final variable in Record Pattern
  • 1e66488: 8321599: Data loss in AVX3 Base64 decoding
  • d4797b7: 8316693: Simplify at-requires checkDockerSupport()
  • dfc9324: 8319879: Stress mode to randomize incremental inlining decision
  • 307569f: 8319938: TestFileChooserSingleDirectorySelection.java fails with "getSelectedFiles returned empty array"
  • db1fa92: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c8caefa: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
  • e8aa37d: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • ... and 11 more: https://git.openjdk.org/jdk21u-dev/compare/966071a5f10a7a8910b2639e10c961924a07d675...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 9, 2024

@shipilev Pushed as commit e652bb7.

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

@shipilev shipilev deleted the JDK-8310844-aarch64-c1-osr branch February 7, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants