8281879: Serial: Merge CardGeneration into TenuredGeneration

[albertnetymk]

Mostly mechanical changes; git diff --color-moved=zebra probably helps to see the actual (small) change, such as dropping the virtual modifier, introducing small helper methods to avoid naming collision, etc.

Test: tier1-6

---

Progress

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

Issue

• JDK-8281879: Serial: Merge CardGeneration into TenuredGeneration

Reviewers

• Thomas Schatzl (@tschatzl - Reviewer)
• Ivan Walulya (@walulyai - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7482/head:pull/7482
$ git checkout pull/7482

Update a local copy of the PR:
$ git checkout pull/7482
$ git pull https://git.openjdk.java.net/jdk pull/7482/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7482

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7482.diff

[bridgekeeper]

👋 Welcome back ayang! 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]

@albertnetymk The following labels will be automatically applied to this pull request:

• hotspot-gc
• 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.

[mlbridge]

Webrevs

• 00: Full (da74a003)

[tschatzl]

Looks good. That comment about git diff --color-moved=zebra really helped.

[openjdk]

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

8281879: Serial: Merge CardGeneration into TenuredGeneration

Reviewed-by: tschatzl, iwalulya

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

• cb576da: 8283379: Memory leak in FileHeaderHelper
• 909986c: 8283217: Leak FcObjectSet in getFontConfigLocations() in fontpath.c
• b617f1d: 8283447: Remove unused LIR_Assembler::_bs
• eb4849e: 8283327: Add methods to save/restore registers when calling into the VM from C1/interpreter barrier code
• fd93015: 8283332: G1: Stricter assertion in G1BlockOffsetTablePart::forward_to_block_containing_addr
• ec62d90: 8283365: G1: Remove duplicate assertions in HeapRegion::oops_on_memregion_seq_iterate_careful
• e709cb0: 8283186: Explicitly pass a third temp register to MacroAssembler::store_heap_oop
• 83a1c90: 8282789: Create a regression test for the JTree usecase of JDK-4618767
• b451273: 8282548: Create a regression test for JDK-4330998
• 8a2d5ab: 8282270: java/awt/Robot Screen Capture tests fail after 8280861
• ... and 329 more: https://git.openjdk.java.net/jdk/compare/bc6148407e629bd99fa5a8577ebd90320610f349...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.

[albertnetymk]

Could someone from serviceability also take a look?

[walulyai]

Lgtm!

[albertnetymk]

Thanks for the review.

/integrate

[openjdk]

Going to push as commit 19d34bd.
Since your change was applied there have been 341 commits pushed to the master branch:

• 999da9b: 8282306: os::is_first_C_frame(frame*) crashes on invalid link access
• c4dc58e: 8283277: ISO 4217 Amendment 171 Update
• cb576da: 8283379: Memory leak in FileHeaderHelper
• 909986c: 8283217: Leak FcObjectSet in getFontConfigLocations() in fontpath.c
• b617f1d: 8283447: Remove unused LIR_Assembler::_bs
• eb4849e: 8283327: Add methods to save/restore registers when calling into the VM from C1/interpreter barrier code
• fd93015: 8283332: G1: Stricter assertion in G1BlockOffsetTablePart::forward_to_block_containing_addr
• ec62d90: 8283365: G1: Remove duplicate assertions in HeapRegion::oops_on_memregion_seq_iterate_careful
• e709cb0: 8283186: Explicitly pass a third temp register to MacroAssembler::store_heap_oop
• 83a1c90: 8282789: Create a regression test for the JTree usecase of JDK-4618767
• ... and 331 more: https://git.openjdk.java.net/jdk/compare/bc6148407e629bd99fa5a8577ebd90320610f349...master

Your commit was automatically rebased without conflicts.

[openjdk]

@albertnetymk Pushed as commit 19d34bd.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.