-
Notifications
You must be signed in to change notification settings - Fork 217
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
8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap #1748
Conversation
👋 Welcome back goetz! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
Did you run tests in addition to GHA?
Thanks for the review! |
@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:
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 19 new commits pushed to the
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 |
Yes, I ran all the tests standalone. |
/integrate |
Going to push as commit 6398e46.
Your commit was automatically rebased without conflicts. |
I backport this to simplify backport of tests that use the new property name.
Resolves were simple, only the method checking the flags set does not match good:
src/hotspot/share/cds/heapShared.hpp
Skipped. is_heap_object_archiving_allowed(), the predecessor of can_write(), does not have this assertion.
src/hotspot/share/prims/whitebox.cpp
I had to adapt this.
In 17, method is_heap_object_archiving_allowed() is called in WB_IsJavaHeapArchiveSupported()
Between 17 and 18, this has been renamed to can_write().
Also, WB_IsJavaHeapArchiveSupported() has been changed to call can_use(),
where this change reverts this to call can_write().
So I leave the call as-is, this shows the desired behaviour.
test/hotspot/jtreg/runtime/cds/SharedStrings.java
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java
test/lib/jdk/test/whitebox/WhiteBox.java
Trivial resolves of the property.
test/lib/sun/hotspot/WhiteBox.java: No such file or directory
Skipped, was merged with the other WhiteBox.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1748/head:pull/1748
$ git checkout pull/1748
Update a local copy of the PR:
$ git checkout pull/1748
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1748/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1748
View PR using the GUI difftool:
$ git pr show -t 1748
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1748.diff
Webrev
Link to Webrev Comment