8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure #11938

albertnetymk · 2023-01-11T10:09:20Z

Simple change of merging a class into its super class.

Test: hotspot_gc

PS: git diff --color-moved=dimmed_zebra might be useful to see the diff.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure

Reviewers

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11938

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11938.diff

bridgekeeper · 2023-01-11T10:10:21Z

👋 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 · 2023-01-11T10:11:41Z

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

openjdk · 2023-01-11T10:13:49Z

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

hotspot-gc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-01-11T10:17:10Z

Webrevs

01: Full - Incremental (a715cd4d)
00: Full (bd0ba799)

tschatzl

Lgtm, please fix the indentation before pushing.

tschatzl · 2023-01-25T16:29:32Z

src/hotspot/share/gc/shared/space.cpp

+      assert(_sp->block_size(top_obj) == cast_to_oop(top_obj)->size(),
+        "Block size and object size mismatch");


Pre-existing: Indentation for the assert message is off.

Suggested change

assert(_sp->block_size(top_obj) == cast_to_oop(top_obj)->size(),

"Block size and object size mismatch");

assert(_sp->block_size(top_obj) == cast_to_oop(top_obj)->size(),

"Block size and object size mismatch");

tschatzl · 2023-01-25T16:36:09Z

src/hotspot/share/gc/shared/space.cpp

                                                   HeapWord* bottom,    \
                                                   HeapWord* top,       \
                                                   ClosureType* cl) {   \


Parameter indentation is off now with the change, also the macro continuation \ characters do not line up any more.

openjdk · 2023-01-25T16:39:47Z

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

8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure

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

30cb305: 8292170: Convert CodeRootSetTable to use ResourceHashtable
3589b80: 8300127: Serial: Remove unnecessary from-space iteration in DefNewGeneration::oop_since_save_marks_iterate
48152ef: 8287134: HttpURLConnection chunked streaming mode doesn't enforce specified size
4b0e656: 8298118: split-if optimization causes empty loop to temporarily have more than one phi
252621d: 8301063: Remove dead code from GrowableArray
b5a4744: 8300857: State return value for Types.asElement(NoType) explicitly
7e951f4: 8301092: Add benchmark for CRC32
adcfd25: 8301098: Remove dead code FileMapInfo::stop_sharing_and_unmap()
9f0887e: 8296661: Typo Found In CSSParser.java
ccf2f58: 8300806: Update googletest to v1.13.0
... and 254 more: https://git.openjdk.org/jdk/compare/5a9490a40e0fe281fc1b33d2c39a9a970d8a7b4f...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.

tschatzl

Ship it

walulyai

Lgtm!

Minor suggestion:

can you please replace DirtyCardToOopClosure__walk_mem_region_with_cl_DEFN with templates. You can do it in a follow up change if you prefer.

albertnetymk · 2023-01-26T10:41:19Z

can you please replace DirtyCardToOopClosure__walk_mem_region_with_cl_DEFN with templates. You can do it in a follow up change if you prefer.

I will look into it in another PR.

albertnetymk · 2023-01-26T11:37:57Z

Thanks for the review.

/integrate

openjdk · 2023-01-26T11:40:26Z

Going to push as commit 7725fe8.
Since your change was applied there have been 268 commits pushed to the master branch:

a9b8acb: 8300652: Parallel: Refactor oop marking stack in Full GC
15a1488: 8297437: javadoc cannot link to old docs (with old style anchors)
b0376a5: 8301069: Replace NULL with nullptr in share/libadt/
7328182: 8300958: Parallel: Remove unused MutableNUMASpace::capacity_in_words
30cb305: 8292170: Convert CodeRootSetTable to use ResourceHashtable
3589b80: 8300127: Serial: Remove unnecessary from-space iteration in DefNewGeneration::oop_since_save_marks_iterate
48152ef: 8287134: HttpURLConnection chunked streaming mode doesn't enforce specified size
4b0e656: 8298118: split-if optimization causes empty loop to temporarily have more than one phi
252621d: 8301063: Remove dead code from GrowableArray
b5a4744: 8300857: State return value for Types.asElement(NoType) explicitly
... and 258 more: https://git.openjdk.org/jdk/compare/5a9490a40e0fe281fc1b33d2c39a9a970d8a7b4f...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-01-26T11:40:43Z

@albertnetymk Pushed as commit 7725fe8.

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

merge-subtype

bd0ba79

albertnetymk force-pushed the merge-subtype branch from 7a01733 to bd0ba79 Compare January 11, 2023 10:11

openjdk bot changed the title ~~8299953~~ 8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure Jan 11, 2023

openjdk bot added the rfr Pull request is ready for review label Jan 11, 2023

openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Jan 11, 2023

tschatzl approved these changes Jan 25, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 25, 2023

review

a715cd4

tschatzl approved these changes Jan 26, 2023

View reviewed changes

walulyai approved these changes Jan 26, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 26, 2023

openjdk bot closed this Jan 26, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 26, 2023

albertnetymk deleted the merge-subtype branch January 26, 2023 11:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure #11938

8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure #11938

albertnetymk commented Jan 11, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jan 11, 2023

openjdk bot commented Jan 11, 2023

openjdk bot commented Jan 11, 2023

mlbridge bot commented Jan 11, 2023 •

edited

Loading

tschatzl left a comment

tschatzl Jan 25, 2023

tschatzl Jan 25, 2023

openjdk bot commented Jan 25, 2023 •

edited

Loading

tschatzl left a comment

walulyai left a comment

albertnetymk commented Jan 26, 2023

albertnetymk commented Jan 26, 2023

openjdk bot commented Jan 26, 2023

openjdk bot commented Jan 26, 2023

		assert(_sp->block_size(top_obj) == cast_to_oop(top_obj)->size(),
		"Block size and object size mismatch");

8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure #11938

8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure #11938

Conversation

albertnetymk commented Jan 11, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 11, 2023

openjdk bot commented Jan 11, 2023

openjdk bot commented Jan 11, 2023

mlbridge bot commented Jan 11, 2023 • edited Loading

Webrevs

tschatzl left a comment

Choose a reason for hiding this comment

tschatzl Jan 25, 2023

Choose a reason for hiding this comment

tschatzl Jan 25, 2023

Choose a reason for hiding this comment

openjdk bot commented Jan 25, 2023 • edited Loading

tschatzl left a comment

Choose a reason for hiding this comment

walulyai left a comment

Choose a reason for hiding this comment

albertnetymk commented Jan 26, 2023

albertnetymk commented Jan 26, 2023

openjdk bot commented Jan 26, 2023

openjdk bot commented Jan 26, 2023

albertnetymk commented Jan 11, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 11, 2023 •

edited

Loading

openjdk bot commented Jan 25, 2023 •

edited

Loading