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

8319532: jshell - Non-sealed declarations sometimes break a snippet evaluation #382

Closed

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Nov 20, 2023

Hi all,

This pull request contains a backport of commit 45e68ae2 from the openjdk/jdk repository.

The commit being backported was authored by Jan Lahoda on 7 Nov 2023 and was reviewed by Adam Sotona.

Thanks!


Progress

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

Issue

  • JDK-8319532: jshell - Non-sealed declarations sometimes break a snippet evaluation (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 382

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 20, 2023

👋 Welcome back jlahoda! 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 45e68ae2079336cea45dcbc39189639c06a05e0c 8319532: jshell - Non-sealed declarations sometimes break a snippet evaluation Nov 20, 2023
@openjdk
Copy link

openjdk bot commented Nov 20, 2023

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

@openjdk
Copy link

openjdk bot commented Nov 20, 2023

⚠️ @lahodaj 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 Nov 20, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 20, 2023

Webrevs

@lahodaj
Copy link
Contributor Author

lahodaj commented Nov 24, 2023

/approval request This is a relatively small bug in non-sealed handling in JShell. To keep things working in JShell, it would be nice to backport to JDK 21u. The patch is in the mainline for a bit of time, and should not have impact outside of JShell. Standard testing has been done.

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

@lahodaj
8319532: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Nov 24, 2023
@openjdk
Copy link

openjdk bot commented Nov 27, 2023

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

8319532: jshell - Non-sealed declarations sometimes break a snippet evaluation

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

  • f01df29: 8315082: [REDO] Generational ZGC: Tests crash with assert(index == 0 || is_power_of_2(index))
  • afc506e: 8319700: [AArch64] C2 compilation fails with "Field too big for insn"
  • 3df010f: 8320280: RISC-V: Avoid passing t0 as temp register to MacroAssembler::lightweight_lock/unlock
  • ecb199a: 8313616: support loading library members on AIX in os::dll_load
  • 220b36c: 8310239: Add missing cross modifying fence in nmethod entry barriers
  • d7a3ac7: 8318587: refresh libraries cache on AIX in print_vm_info
  • 0941f2c: 8318562: Computational test more than 2x slower when AVX instructions are used
  • e7bd0ab: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
  • 21a003a: 8320209: VectorMaskGen clobbers rflags on x86_64
  • 689b90d: 8318957: enhance agentlib:jdwp help output by info about allow option
  • ... and 15 more: https://git.openjdk.org/jdk21u/compare/2545f55e509fdc3a2fa6e4dec33f1b4a20a8b679...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 Nov 27, 2023
@lahodaj
Copy link
Contributor Author

lahodaj commented Nov 27, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

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

  • b42280b: 8318144: Match on enum constants with body compiles but fails with MatchException
  • f01df29: 8315082: [REDO] Generational ZGC: Tests crash with assert(index == 0 || is_power_of_2(index))
  • afc506e: 8319700: [AArch64] C2 compilation fails with "Field too big for insn"
  • 3df010f: 8320280: RISC-V: Avoid passing t0 as temp register to MacroAssembler::lightweight_lock/unlock
  • ecb199a: 8313616: support loading library members on AIX in os::dll_load
  • 220b36c: 8310239: Add missing cross modifying fence in nmethod entry barriers
  • d7a3ac7: 8318587: refresh libraries cache on AIX in print_vm_info
  • 0941f2c: 8318562: Computational test more than 2x slower when AVX instructions are used
  • e7bd0ab: 8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
  • 21a003a: 8320209: VectorMaskGen clobbers rflags on x86_64
  • ... and 16 more: https://git.openjdk.org/jdk21u/compare/2545f55e509fdc3a2fa6e4dec33f1b4a20a8b679...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 27, 2023

@lahodaj Pushed as commit 4022eac.

💡 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