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 #2117

Closed
wants to merge 1 commit into from

Conversation

dchuyko
Copy link
Member

@dchuyko dchuyko commented Jan 9, 2024

This changes reverts https://bugs.openjdk.org/browse/JDK-8293671 backport due to the correctness problems in the initial change.

Original reverting patch applies cleanly with the only exception of copyright update (already 2024) which has been excluded.

The new test fails on current 17u aarch64 and doesn't fail with the change applied.

Additional testing: jtreg tier1,2 (linux-aarch64 fastdebug)


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/jdk17u-dev.git pull/2117/head:pull/2117
$ git checkout pull/2117

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2117

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2024

👋 Welcome back dchuyko! 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 Jan 9, 2024

⚠️ @dchuyko could not find any commit with hash ade21a965f8a5fc889cd48bba76fad507bdeddf5. Please update the title with the hash for an existing commit.

@dchuyko dchuyko changed the title Backport ade21a965f8a5fc889cd48bba76fad507bdeddf5 Backport ade21a9 Jan 9, 2024
@dchuyko dchuyko changed the title Backport ade21a9 Backport ade21a965f8a5fc889cd48bba76fad507bdeddf5 Jan 9, 2024
@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 9, 2024
@openjdk
Copy link

openjdk bot commented Jan 9, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

⚠️ @dchuyko 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 9, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2024

Webrevs

@dchuyko
Copy link
Member Author

dchuyko commented Jan 9, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

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

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

openjdk bot commented Jan 10, 2024

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

  • ea6fc21: 8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries
  • 262b83c: 8322583: RISC-V: Enable fast class initialization checks
  • 0927587: 6928542: Chinese characters in RTF are not decoded
  • 26b5597: 8322725: (tz) Update Timezone Data to 2023d

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@theRealAph) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jan 10, 2024
@dchuyko
Copy link
Member Author

dchuyko commented Jan 10, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 10, 2024
@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@dchuyko
Your change (at version 6f21163) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

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

  • ea6fc21: 8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries
  • 262b83c: 8322583: RISC-V: Enable fast class initialization checks
  • 0927587: 6928542: Chinese characters in RTF are not decoded
  • 26b5597: 8322725: (tz) Update Timezone Data to 2023d

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 10, 2024

@shipilev @dchuyko Pushed as commit f194105.

💡 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
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants