jdk
jdk copied to clipboard
openjdk
8330694: Rename 'HeapRegion' to 'G1HeapRegion'
follow up 8267941
Progress
- [x] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
Issue
- JDK-8330694: Rename 'HeapRegion' to 'G1HeapRegion' (Enhancement - P4)
Reviewers
- Kim Barrett (@kimbarrett - Reviewer) ⚠️ Review applies to 4fe5badc
- Thomas Schatzl (@tschatzl - Reviewer) ⚠️ Review applies to dafdc775
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18871/head:pull/18871
$ git checkout pull/18871
Update a local copy of the PR:
$ git checkout pull/18871
$ git pull https://git.openjdk.org/jdk.git pull/18871/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 18871
View PR using the GUI difftool:
$ git pr show -t 18871
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18871.diff
Webrev
:wave: Welcome back LizBing! 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.
![bridgekeeper[bot] avatar](https://avatars.githubusercontent.com/u/41768318?v=4 "Published by a pub.dev verified publisher"){kind=small}
@LizBing 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:
8330694: Rename 'HeapRegion' to 'G1HeapRegion'
Reviewed-by: cjplummer, kbarrett, tschatzl
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 13 new commits pushed to the master branch:
- 05f13e75ee4407ba9213c69b33c6032aa87c9e95: 8329667: [macos] Issue with JTree related fix for JDK-8317771
- 7bf1989f59695c3d08b4bd116fb4c022cf9661f4: 8320575: generic type information lost on mandated parameters of record's compact constructors
- 253508b03a3de4dab00ed7fb57e9f345d8aed1a4: 8332303: Better JMX interoperability with older JDKs, after removing Subject Delegation
- ebc520e83f503eeb4e5af6d5aef62df9227af4f7: 8332841: GenShen: Pull shared members from control thread into common base class
- 236432dbdb9bab4aece54c2fea08f055e5dbf97e: 8332084: Ensure JdkConsoleImpl.restoreEcho visibility in a shutdown hook
- b3b33667ad3bdb7be868fb165a1ea53054947cd0: 8332631: Update nsk.share.jpda.BindServer to don't use finalization
- f66a58661459bf64212ec332540c12d5d691270f: 8332641: Update nsk.share.jpda.Jdb to don't use finalization
- cd3e4c03661f770ebeefcd3637d56589243ac0a9: 8326734: text-decoration applied to lost when mixed with or
- c2cca2ab443ff87f689810b747985adfdbfbe54a: 8330647: Two CDS tests fail with -UseCompressedOops and UseSerialGC/UseParallelGC
- 6d2aeb82bc6f8b6894bf3777162be0efb2826397: 8332745: Method::is_vanilla_constructor is never used
- ... and 3 more: https://git.openjdk.org/jdk/compare/6a35311468222f9335b43d548df2ecb80746b389...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.
As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@plummercj, @kimbarrett, @tschatzl) but any other Committer may sponsor as well.
➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).
@LizBing The following labels will be automatically applied to this pull request:
-
graal -
hotspot -
serviceability
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.
Webrevs
- 12: Full (01f06d4d)
- 11: Full - Incremental (c240897a)
- 10: Full - Incremental (dafdc775)
- 09: Full - Incremental (65a4bbf9)
- 08: Full - Incremental (b007eb01)
- 07: Full - Incremental (80eeb443)
- 06: Full (4d175e27)
- 05: Full - Incremental (92d0df4d)
- 04: Full (f4e066c4)
- 03: Full - Incremental (a76a71de)
- 02: Full - Incremental (f02334fd)
- 01: Full - Incremental (cae3efd0)
- 00: Full (4fe5badc)
mach5 higher tier SA tests are fine. What are your plans for the remaining SA renames (would highly recommend to add) and the G1HeapRegion related helper classes?
mach5 higher tier SA tests are fine. What are your plans for the remaining SA renames (would highly recommend to add) and the G1HeapRegion related helper classes?
I suggest the related helper classes be done in further followups, not make this change even larger.
mach5 higher tier SA tests are fine. What are your plans for the remaining SA renames (would highly recommend to add) and the G1HeapRegion related helper classes?
I suggest the related helper classes be done in further followups, not make this change even larger.
Fine with me, will file an issue about the helper classes.
In SA I see references to heapRegionIterate() that possibly should be renamed.
I noticed that the HeapRegionManager and HeapRegionClosure classes were not renamed (in the hotspot source). Is this intentional or an oversite?
OK, I will do all the SA part here. However, I do think that the other classes named 'HeapRegion*' in the hotspot source should be dealt with in follow-up PRs.
I noticed that the HeapRegionManager and HeapRegionClosure classes were not renamed (in the hotspot source). Is this intentional or an oversite?
OK, I will do all the SA part here. However, I do think that the other classes named 'HeapRegion*' in the hotspot source should be dealt with in follow-up PRs.
I think there was a misunderstanding here. I was not asking you to rename these in SA. I was asking why they were not renamed in hotspot. If you want to do them in a follow-up then that is ok, but both hotspot and SA should be done together. So that means either undoing the most recent SA change or applying the same rename change to hotspot.
Should we also rename 'HeapRegionType' to 'G1HeapRegionType', then rename the current 'G1HeapRegionType' to 'G1 HeapRegionTypeEnum'?
For this PR the SA renames should match the hotspot renames. It looks like you have not renamed this in hotspot yet so it should not be renamed in SA either.
@LizBing Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.
@LizBing Your change (at version 01f06d4d68667f79666231bceb0c9b40a9b5b902) is now ready to be sponsored by a Committer.
Going to push as commit 985b9ce79a2d620a8b8675d1ae6c9730d72a757f.
Since your change was applied there have been 13 commits pushed to the master branch:
- 05f13e75ee4407ba9213c69b33c6032aa87c9e95: 8329667: [macos] Issue with JTree related fix for JDK-8317771
- 7bf1989f59695c3d08b4bd116fb4c022cf9661f4: 8320575: generic type information lost on mandated parameters of record's compact constructors
- 253508b03a3de4dab00ed7fb57e9f345d8aed1a4: 8332303: Better JMX interoperability with older JDKs, after removing Subject Delegation
- ebc520e83f503eeb4e5af6d5aef62df9227af4f7: 8332841: GenShen: Pull shared members from control thread into common base class
- 236432dbdb9bab4aece54c2fea08f055e5dbf97e: 8332084: Ensure JdkConsoleImpl.restoreEcho visibility in a shutdown hook
- b3b33667ad3bdb7be868fb165a1ea53054947cd0: 8332631: Update nsk.share.jpda.BindServer to don't use finalization
- f66a58661459bf64212ec332540c12d5d691270f: 8332641: Update nsk.share.jpda.Jdb to don't use finalization
- cd3e4c03661f770ebeefcd3637d56589243ac0a9: 8326734: text-decoration applied to lost when mixed with or
- c2cca2ab443ff87f689810b747985adfdbfbe54a: 8330647: Two CDS tests fail with -UseCompressedOops and UseSerialGC/UseParallelGC
- 6d2aeb82bc6f8b6894bf3777162be0efb2826397: 8332745: Method::is_vanilla_constructor is never used
- ... and 3 more: https://git.openjdk.org/jdk/compare/6a35311468222f9335b43d548df2ecb80746b389...master
Your commit was automatically rebased without conflicts.
@kimbarrett @LizBing Pushed as commit 985b9ce79a2d620a8b8675d1ae6c9730d72a757f.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.