Skip to content

8234534: Simplify CardTable code after CMS removal #2354

Closed
tschatzl wants to merge 2 commits intoopenjdk:masterfrom
tschatzl:8234534-cleanup-cardtable-after-cms
Closed

8234534: Simplify CardTable code after CMS removal #2354
tschatzl wants to merge 2 commits intoopenjdk:masterfrom
tschatzl:8234534-cleanup-cardtable-after-cms

Conversation

@tschatzl
Copy link
Contributor

@tschatzl tschatzl commented Feb 2, 2021

Hi,

can I have reviews for this cleanup that removes CMS specific code from CardTable/CardTableRS?

Note that there is still this "conc_scan" parameter passed to the card table that affects barrier code generation, for some reason also G1 barrier code generation although it should not as G1CardTable::scanned_concurrently() only used for the "normal" card table. Initial attempts showed that removing this is not straightforward, causing crashes and so I left it out for JDK-8250941 so that this change is solely about removing unused code.

Testing: tier1-4, some tier1-5 runs earlier (before some removal of hunks for files only containing copyright updates or newline changes)


Progress

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

Issue

  • JDK-8234534: Simplify CardTable code after CMS removal

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2354/head:pull/2354
$ git checkout pull/2354

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 2, 2021

👋 Welcome back tschatzl! 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.

@tschatzl tschatzl force-pushed the 8234534-cleanup-cardtable-after-cms branch from 056c70b to ec2083c Compare February 2, 2021 15:14
@openjdk
Copy link

openjdk bot commented Feb 2, 2021

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

  • hotspot

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.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Feb 2, 2021
@tschatzl tschatzl force-pushed the 8234534-cleanup-cardtable-after-cms branch from ec2083c to 1632a90 Compare February 2, 2021 15:16
@tschatzl tschatzl force-pushed the 8234534-cleanup-cardtable-after-cms branch from 1632a90 to 5aa23d7 Compare February 2, 2021 15:17
@tschatzl
Copy link
Contributor Author

tschatzl commented Feb 3, 2021

/label add hotspot-gc

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Feb 3, 2021
@openjdk
Copy link

openjdk bot commented Feb 3, 2021

@tschatzl
The hotspot-gc label was successfully added.

@tschatzl tschatzl marked this pull request as ready for review February 3, 2021 10:05
@tschatzl
Copy link
Contributor Author

tschatzl commented Feb 3, 2021

(latest tier1-4 testing still stuck on linux-aarch64, but everything else passed. I think there is no particular aarch64 specific change in there...)

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 3, 2021
@mlbridge
Copy link

mlbridge bot commented Feb 3, 2021

Webrevs

Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

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

Looks good to me, with the one minor nit I commented on and Albert's suggestions.

@openjdk
Copy link

openjdk bot commented Feb 4, 2021

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

8234534: Simplify CardTable code after CMS removal

Reviewed-by: ayang, kbarrett

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

  • be772ff: 8261023: Document why memory pretouch must be a store
  • 83357b1: 8261030: Avoid loading GenerateJLIClassesHelper at runtime
  • 992b500: 8261036: Reduce classes loaded by CleanerFactory initialization
  • e8ad8b3: 8259956: jdk.jfr.internal.ChunkInputStream#available should return the sum of remaining available bytes
  • 06b33a0: 8261107: ArrayIndexOutOfBoundsException in the ICC_Profile.getInstance(InputStream)
  • 60f440d: 6436374: Graphics.setColor(null) is not documented
  • 82028e7: 8260012: Reduce inclusion of collectedHeap.hpp and heapInspection.hpp
  • 9b7a8f1: Merge
  • 1a7040e: 8259794: Remove EA from JDK 16 version string starting with Initial RC promotion on Feb 04, 2021(B35)
  • afd5eef: 8260704: ParallelGC: oldgen expansion needs release-store for _end
  • ... and 41 more: https://git.openjdk.java.net/jdk/compare/288a4fed3f495e5bb83839564eda7d0c78751d21...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 4, 2021
@tschatzl
Copy link
Contributor Author

tschatzl commented Feb 4, 2021

All fixed as suggested. Still compiles.

@tschatzl
Copy link
Contributor Author

tschatzl commented Feb 5, 2021

Thanks @kimbarrett @albertnetymk for your reviews.

/integrate

@openjdk openjdk bot closed this Feb 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 5, 2021
@openjdk
Copy link

openjdk bot commented Feb 5, 2021

@tschatzl Since your change was applied there have been 63 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 78b0d32.

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

@tschatzl tschatzl deleted the 8234534-cleanup-cardtable-after-cms branch February 12, 2021 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot hotspot-dev@openjdk.org hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants