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

8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0 #540

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Apr 29, 2024

Fixes the JDK 21 regression. Simple fix.

Additional testing:

  • MacOS AArch64 server fastdebug, jdk/jshell passes

Progress

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

Issue

  • JDK-8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0 (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 540

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 29, 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
Copy link

openjdk bot commented Apr 29, 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:

8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0

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

  • 3bb8eee: 8317809: Insertion of free code blobs into code cache can be very slow during class unloading
  • a4d8d06: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
  • 87d5da4: 8328822: C2: "negative trip count?" assert failure in profile predicate code
  • 3892078: 8324121: SIGFPE in PhaseIdealLoop::extract_long_range_checks
  • 3ab3f52: 8326974: ODR violation in macroAssembler_aarch64.cpp
  • 5d5c678: 8319713: Parallel: Remove PSAdaptiveSizePolicy::should_full_GC
  • 56a9090: 8312014: [s390x] TestSigInfoInHsErrFile.java Failure
  • c922c50: 8322962: Upcall stub might go undetected when freezing frames
  • cbd30c9: 8325095: C2: bailout message broken: ResourceArea allocated string used after free
  • 75ac9e8: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
  • ... and 6 more: https://git.openjdk.org/jdk21u-dev/compare/262cacb2385af4e0e2ee3a4e1f763b68e3101f28...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 changed the title Backport 87e864bf21d71daae4e001ec4edbb4ef1f60c36d 8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0 Apr 29, 2024
@openjdk
Copy link

openjdk bot commented Apr 29, 2024

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

@shipilev
Copy link
Member Author

/approval request Fixes the JDK 21 regression. Applies cleanly, simple fix. There are no regression tests, but the jshell tests (AFAICS, the largest jline user) pass. Risk is low: fixes a simple problem with a simple patch.

@openjdk
Copy link

openjdk bot commented Apr 29, 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 Apr 29, 2024
@openjdk
Copy link

openjdk bot commented Apr 29, 2024

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

@openjdk openjdk bot added the approval label Apr 29, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 29, 2024

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels May 3, 2024
@shipilev
Copy link
Member Author

shipilev commented May 6, 2024

/integrate

@openjdk
Copy link

openjdk bot commented May 6, 2024

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

  • d459ae9: 8329850: [AIX] Allow loading of different members of same shared library archive
  • 835d016: 8330094: RISC-V: Save and restore FRM in the call stub
  • 3bb8eee: 8317809: Insertion of free code blobs into code cache can be very slow during class unloading
  • a4d8d06: 8328744: Parallel: Parallel GC throws OOM before heap is fully expanded
  • 87d5da4: 8328822: C2: "negative trip count?" assert failure in profile predicate code
  • 3892078: 8324121: SIGFPE in PhaseIdealLoop::extract_long_range_checks
  • 3ab3f52: 8326974: ODR violation in macroAssembler_aarch64.cpp
  • 5d5c678: 8319713: Parallel: Remove PSAdaptiveSizePolicy::should_full_GC
  • 56a9090: 8312014: [s390x] TestSigInfoInHsErrFile.java Failure
  • c922c50: 8322962: Upcall stub might go undetected when freezing frames
  • ... and 8 more: https://git.openjdk.org/jdk21u-dev/compare/262cacb2385af4e0e2ee3a4e1f763b68e3101f28...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 6, 2024

@shipilev Pushed as commit 021372c.

💡 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
1 participant