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.

Sign up for GitHub

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

8299570: [JVMCI] Insufficient error handling when CodeBuffer is exhausted #1308

Closed
wants to merge 2 commits into from
Closed

8299570: [JVMCI] Insufficient error handling when CodeBuffer is exhausted #1308

wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 28, 2023 •
edited by openjdk bot
Loading

I backport this for parity with 17.0.8-oracle.

I resolved three files due to context and NULL/nullptr.

Progress

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

Issue

  • JDK-8299570: [JVMCI] Insufficient error handling when CodeBuffer is exhausted

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1308

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 28, 2023

👋 Welcome back goetz! 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 ad326fc62be9fa29438fb4b59a51c38dd94afd68 8299570: [JVMCI] Insufficient error handling when CodeBuffer is exhausted Apr 28, 2023
@openjdk
Copy link

openjdk bot commented Apr 28, 2023

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

@openjdk openjdk bot added the backport label Apr 28, 2023
shipilev
shipilev suggested changes Apr 28, 2023
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Questions! :)

src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -526,21 +529,22 @@ void NativeCallTrampolineStub::set_destination(address new_destination) {

// Generate a trampoline for a branch to dest. If there's no need for a
// trampoline, simply patch the call directly to dest.
address NativeCall::trampoline_jump(CodeBuffer &cbuf, address dest) {
void NativeCall::trampoline_jump(CodeBuffer &cbuf, address dest, JVMCI_TRAPS) {
Copy link
Member

Choose a reason for hiding this comment

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

In the original changeset, this hunk has the #if INCLUDE_JVMCI addition. Plus #endif later.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for spotting this! Fixed.

src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp Outdated
// If we generated no stub, patch this call directly to dest.
// This will happen if we don't need far branches or if there
// already was a trampoline.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, original changeset does not have a newline here?

Copy link
Member Author

@GoeLin GoeLin May 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

There was some whitespace added in this line. removed. This will fix the Pre-submit jcheck failure.

@openjdk openjdk bot added the clean label May 3, 2023
@GoeLin
Copy link
Member Author

GoeLin commented May 3, 2023

Thanks for reviewing!

@openjdk
Copy link

openjdk bot commented May 3, 2023 •
edited
Loading

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

8299570: [JVMCI] Insufficient error handling when CodeBuffer is exhausted

Reviewed-by: shade

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

  • 96adf07: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 65a02da: 8303476: Add the runtime version in the release file of a JDK image
  • 07993bf: 8287897: Augment src/jdk.internal.le/share/legal/jline.md with information on 4th party dependencies
  • 5296357: 8303822: gtestMain should give more helpful output
  • aa8c46c: 8301190: [vectorapi] The typeChar of LaneType is incorrect when default locale is tr
  • b2f16a5: 8289735: UTIL_LOOKUP_PROGS fails on pathes with space
  • a485033: 8306883: Thread stacksize is reported with wrong units in os::create_thread logging

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 3, 2023
@mlbridge
Copy link

mlbridge bot commented May 3, 2023

Webrevs

shipilev
shipilev approved these changes May 3, 2023
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine, provided testing is clean.

@GoeLin
Copy link
Member Author

GoeLin commented May 8, 2023

/integrate

@openjdk
Copy link

openjdk bot commented May 8, 2023

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

  • 86aca8b: 8302508: Add timestamp to the output TraceCompilerThreads
  • b5e6753: 8297450: ScaledTextFieldBorderTest.java fails when run with -show parameter
  • fafd082: 8289509: Improve test coverage for XPath Axes: descendant, descendant-or-self, following, following-sibling
  • 2aaf3c5: 8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
  • aee7ab6: 8292990: Improve test coverage for XPath Axes: parent
  • 20fea6c: 8244976: vmTestbase/nsk/jdi/Event/request/request001.java doesn' initialize eName
  • 05f1562: 8286398: Address possibly lossy conversions in jdk.internal.le
  • 8c54104: 8286191: misc tests fail due to JDK-8285987
  • 7dab7e5: 8285987: executing shell scripts without #! fails on Alpine linux
  • 7251548: 8283057: Update GCC to version 11.2.0 for Oracle builds on Linux
  • ... and 19 more: https://git.openjdk.org/jdk17u-dev/compare/1ba2d5310ad80ab595cb2ee7ad62cbe569d0110c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 8, 2023

@GoeLin Pushed as commit 3a0aff2.

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

@GoeLin GoeLin deleted the goetz_backport_8299570 branch May 8, 2023 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shipilev shipilev shipilev approved these changes

Assignees
No one assigned
Labels
backport clean integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GoeLin @shipilev