Skip to content

8271946: Cleanup leftovers in Space and subclasses #5031

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

Closed
wants to merge 2 commits into from

Conversation

rkennke
Copy link
Contributor

@rkennke rkennke commented Aug 6, 2021

There are a number of methods in (Compactible)Space that seem trivially implemented. E.g. obj_size(), adjust_obj_size(), scanned_block_is_obj() etc. I believe they are leftovers from CMS (not sure) but looks like they can be replaced by obj->size() or removed altogether. Also, the the related templated methods scan_and_forward(), scan_and_adjust_pointers() and scan_and_compact() can be directly and mechanically inlined into their callers. It makes the code more readable.

Testing:

  • hotspot_gc
  • tier1
  • tier2

Progress

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

Issue

  • JDK-8271946: Cleanup leftovers in Space and subclasses

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5031

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 6, 2021

👋 Welcome back rkennke! 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 openjdk bot added the rfr Pull request is ready for review label Aug 6, 2021
@openjdk
Copy link

openjdk bot commented Aug 6, 2021

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

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Aug 6, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 6, 2021

Webrevs

@rkennke rkennke marked this pull request as draft August 6, 2021 12:40
@rkennke rkennke marked this pull request as ready for review August 6, 2021 12:41
@openjdk openjdk bot added rfr Pull request is ready for review and removed rfr Pull request is ready for review labels Aug 6, 2021
Comment on lines -315 to -319
// - scan_limit()
// - scanned_block_is_obj()
// - scanned_block_size()
// - adjust_obj_size()
// - obj_size()
Copy link
Member

Choose a reason for hiding this comment

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

The entire surrounding comment needs to be updated now that these functions have been removed.

@openjdk
Copy link

openjdk bot commented Aug 7, 2021

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

8271946: Cleanup leftovers in Space and subclasses

Reviewed-by: stefank, 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 144 new commits pushed to the master branch:

  • db9834f: 8258951: java/net/httpclient/HandshakeFailureTest.java failed with "RuntimeException: Not found expected SSLHandshakeException in java.io.IOException"
  • a81e5e9: 8272654: Mark word accesses should not use Access API
  • 4bd37c3: 8272708: [Test]: Cleanup: test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java no longer needs ocspEnabled
  • ddcd851: 8272602: [macos] not all KEY_PRESSED events sent when control modifier is used
  • d007be0: 8272700: [macos] Build failure with Xcode 13.0 after JDK-8264848
  • f4be211: 8270041: Consolidate oopDesc::cas_forward_to() and oopDesc::forward_to_atomic()
  • b40e8f0: 8271951: Consolidate preserved marks overflow stack in SerialGC
  • 7eccbd4: 8266519: Cleanup resolve() leftovers from BarrierSet et al
  • 9569159: 8272674: Logging missing keytab file in Krb5LoginModule
  • 51c1b9a: 8272616: Strange code in java.text.DecimalFormat#applyPattern
  • ... and 134 more: https://git.openjdk.java.net/jdk/compare/685fc3c677cd0e71ef4443214ae14c7eed355140...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 Aug 7, 2021
@rkennke
Copy link
Contributor Author

rkennke commented Aug 19, 2021

Ping? Anybody else who wants to approve this? Thanks!

Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

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

Lgtm.

@rkennke
Copy link
Contributor Author

rkennke commented Aug 20, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Aug 20, 2021

Going to push as commit 92bde67.
Since your change was applied there have been 144 commits pushed to the master branch:

  • db9834f: 8258951: java/net/httpclient/HandshakeFailureTest.java failed with "RuntimeException: Not found expected SSLHandshakeException in java.io.IOException"
  • a81e5e9: 8272654: Mark word accesses should not use Access API
  • 4bd37c3: 8272708: [Test]: Cleanup: test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java no longer needs ocspEnabled
  • ddcd851: 8272602: [macos] not all KEY_PRESSED events sent when control modifier is used
  • d007be0: 8272700: [macos] Build failure with Xcode 13.0 after JDK-8264848
  • f4be211: 8270041: Consolidate oopDesc::cas_forward_to() and oopDesc::forward_to_atomic()
  • b40e8f0: 8271951: Consolidate preserved marks overflow stack in SerialGC
  • 7eccbd4: 8266519: Cleanup resolve() leftovers from BarrierSet et al
  • 9569159: 8272674: Logging missing keytab file in Krb5LoginModule
  • 51c1b9a: 8272616: Strange code in java.text.DecimalFormat#applyPattern
  • ... and 134 more: https://git.openjdk.java.net/jdk/compare/685fc3c677cd0e71ef4443214ae14c7eed355140...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 20, 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 Aug 20, 2021
@openjdk
Copy link

openjdk bot commented Aug 20, 2021

@rkennke Pushed as commit 92bde67.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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