Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 31, 2022

I backport this for parity with 17.0.3-oracle.

I had to adapt the tests: I removed one check from dynamicArchive/LambdaContainsOldInf.java.

This depends on JDK-8271506.


Progress

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

Issue

  • JDK-8274944: AppCDS dump causes SEGV in VM thread while adjusting lambda proxy class info

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/133/head:pull/133
$ git checkout pull/133

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 133

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/133.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 31, 2022

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/132 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 e5cd2692da6327c6fde954f86595a08fe5edf43f 8274944: AppCDS dump causes SEGV in VM thread while adjusting lambda proxy class info Jan 31, 2022
@openjdk
Copy link

openjdk bot commented Jan 31, 2022

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jan 31, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 31, 2022

Webrevs

@GoeLin GoeLin force-pushed the goetz_backport_8274944 branch from 223eb2f to c11e6b8 Compare February 1, 2022 12:36
Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

LGTM

@GoeLin GoeLin changed the base branch from pr/132 to master February 3, 2022 08:23
@openjdk-notifier
Copy link

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8271506
git fetch https://git.openjdk.java.net/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Feb 3, 2022

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

8274944: AppCDS dump causes SEGV in VM thread while adjusting lambda proxy class info

Reviewed-by: stuefe

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

  • 0b51fe2: 8271506: Add ResourceHashtable support for deleting selected entries
  • 6cacf9a: 8278381: [GCC 11] Address::make_raw() does not initialize rspec
  • c03b95d: 8279124: VM does not handle SIGQUIT during initialization
  • 45002c0: 8277497: Last column cell in the JTable row is read as empty cell
  • 592adc8: 8278604: SwingSet2 table demo does not have accessible description set for images
  • 952f9c7: 8275645: [JVMCI] avoid unaligned volatile reads on AArch64
  • 869bb36: 8280414: Memory leak in DefaultProxySelector
  • c581598: 8273381: Assert in PtrQueueBufferAllocatorTest.stress_free_list_allocator_vm
  • cb769c0: 8269616: serviceability/dcmd/framework/VMVersionTest.java fails with Address already in use error
  • ac8a550: 8280155: [PPC64, s390] frame size checks are not yet correct
  • ... and 2 more: https://git.openjdk.java.net/jdk17u-dev/compare/d34650ad398be86253346bc3e03bf808f6ed65dd...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 the ready Pull request is ready to be integrated label Feb 3, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Feb 3, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Feb 3, 2022

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

  • e459c8c: 8275874: [JVMCI] only support aligned reads in c2v_readFieldValue
  • 0b51fe2: 8271506: Add ResourceHashtable support for deleting selected entries
  • 6cacf9a: 8278381: [GCC 11] Address::make_raw() does not initialize rspec
  • c03b95d: 8279124: VM does not handle SIGQUIT during initialization
  • 45002c0: 8277497: Last column cell in the JTable row is read as empty cell
  • 592adc8: 8278604: SwingSet2 table demo does not have accessible description set for images
  • 952f9c7: 8275645: [JVMCI] avoid unaligned volatile reads on AArch64
  • 869bb36: 8280414: Memory leak in DefaultProxySelector
  • c581598: 8273381: Assert in PtrQueueBufferAllocatorTest.stress_free_list_allocator_vm
  • cb769c0: 8269616: serviceability/dcmd/framework/VMVersionTest.java fails with Address already in use error
  • ... and 3 more: https://git.openjdk.java.net/jdk17u-dev/compare/d34650ad398be86253346bc3e03bf808f6ed65dd...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 3, 2022

@GoeLin Pushed as commit 5d54bf5.

💡 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_8274944 branch February 3, 2022 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants