Skip to content
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

Jump to bottom

8233214: Remove runtime code not needed with CMS removed #574

Closed
wants to merge 3 commits into from
Closed

8233214: Remove runtime code not needed with CMS removed #574

wants to merge 3 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Oct 9, 2020 •
edited by openjdk bot

This change removes CMS code left over for ClassLoaderData walking.
Tested with Oracle platforms tier1 and built shenandoah with no errors.

Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

  • JDK-8233214: Remove runtime code not needed with CMS removed

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 9, 2020

👋 Welcome back coleenp! 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 Oct 9, 2020
@openjdk
Copy link

openjdk bot commented Oct 9, 2020

@coleenp 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 Oct 9, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 9, 2020 •
edited

Webrevs

shipilev
shipilev approved these changes Oct 9, 2020
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

This looks good to me. I meant to remove it myself this week :)

@openjdk
Copy link

openjdk bot commented Oct 9, 2020 •
edited

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

8233214: Remove runtime code not needed with CMS removed

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

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 Oct 9, 2020
stefank
stefank approved these changes Oct 9, 2020
View reviewed changes
src/hotspot/share/classfile/classLoaderData.hpp
@@ -124,7 +124,6 @@ class ClassLoaderData : public CHeapObj<mtClass> {

// Remembered sets support for the oops in the class loader data.
bool _modified_oops; // Card Table Equivalent (YC/CMS support)
bool _accumulated_modified_oops; // Mod Union Equivalent (CMS support)
Copy link
Member

Choose a reason for hiding this comment

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

Maybe remove the 'CMS support' comment on line 126?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, can remove that too.

Copy link
Contributor Author

@coleenp coleenp Oct 9, 2020 •
edited

Choose a reason for hiding this comment

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

I changed it to:
bool _modified_oops; // Card Table Equivalent

I lined up the // also.

tschatzl
tschatzl approved these changes Oct 9, 2020
View reviewed changes
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.

Good sans the "YC/CMS" comment

@coleenp
Copy link
Contributor Author

coleenp commented Oct 9, 2020

/integrate
Thanks, I think this is trivial enough to integrate.

@openjdk openjdk bot closed this Oct 9, 2020
@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 Oct 9, 2020
@openjdk
Copy link

openjdk bot commented Oct 9, 2020

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

  • 536b35b: 8254319: Shenandoah: Interpreter native-LRB needs to activate during HAS_FORWARDED
  • be26972: 8253379: [windows] Several jpackage tests failed with error code 1638
  • 52e45a3: 8229186: Improve error messages for TestStringIntrinsics failures
  • 6d2c1a6: 8254292: Update JMH devkit to 1.26
  • 2bbf8a2: 8245543: Cgroups: Incorrect detection logic on some systems (still reproducible)
  • aaa0a2a: 8254297: Zero and Minimal VMs are broken with undeclared identifier 'DerivedPointerTable' after JDK-8253180
  • 7e80c98: 8254261: fix javadocs in jdk.test.lib.Utils
  • d4b5dfd: 8253857: Shenandoah: Bugs in ShenandoahEvacOOMHandler related code
  • e9c1905: 8253740: [PPC64] Minor interpreter cleanup
  • b1448da: 8253900: SA: wrong size computation when JVM was built without AOT
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/ced46b19f70382d50a45fb54a58bcb9f742fb008...master

Your commit was automatically rebased without conflicts.

Pushed as commit 7ec9c8e.

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

@coleenp coleenp deleted the mod-union branch October 9, 2020 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shipilev shipilev shipilev approved these changes

@stefank stefank stefank approved these changes

@tschatzl tschatzl tschatzl approved these changes

Assignees
No one assigned
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
4 participants
@coleenp @shipilev @stefank @tschatzl