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

8329781: Serial: Remove serialFullGC.inline.hpp #18744

Closed
wants to merge 4 commits into from

Conversation

lgxbslgx
Copy link
Member

@lgxbslgx lgxbslgx commented Apr 11, 2024

Hi all,

This patch moves the content of serialFullGC.inline.hpp to serialFullGC.cpp. Thanks for taking the time to review.

Best Regards,
-- Guoxiong


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-8329781: Serial: Remove serialFullGC.inline.hpp (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18744

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 11, 2024

👋 Welcome back gli! 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
Copy link

openjdk bot commented Apr 11, 2024

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

8329781: Serial: Remove serialFullGC.inline.hpp

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

  • e45fea5: 8329757: Crash with fatal error: DEBUG MESSAGE: Fast Unlock lock on stack
  • ece7d43: 8329416: Split relocation pointer map into read-write and read-only maps
  • 0db4290: 8330049: Remove unused AbstractLinker::linkerByteOrder
  • 5808f30: 8330026: Serial: Move some includes to vmStructs_serial.hpp
  • 31ee510: 8241503: C2: Share MacroAssembler between mach nodes during code emission
  • 0656f08: 8329469: Generational ZGC: Move the methods forwarding_[index|find|insert] from zRelocate.cpp to ZForwarding
  • 1606187: 8326947: Minimize MakeBase.gmk
  • 2e3682a: 8319678: Several tests from corelibs areas ignore VM flags
  • 63684cd: 8327250: assert(!method->is_old()) failed: Should not be installing old methods

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 changed the title JDK-8329781 8329781: Serial: Remove serialFullGC.inline.hpp Apr 11, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 11, 2024
@openjdk
Copy link

openjdk bot commented Apr 11, 2024

@lgxbslgx 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 Apr 11, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 11, 2024

Webrevs

@@ -604,11 +609,34 @@ template <class T> void SerialFullGC::mark_and_push(T* p) {
}
}

inline size_t SerialFullGC::adjust_pointers(oop obj) {
Copy link
Member

Choose a reason for hiding this comment

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

I see only a single caller of this method; maybe this method can be inlined completely and drop this api.

Copy link
Member Author

Choose a reason for hiding this comment

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

Inlined.

return obj->oop_iterate_size(&SerialFullGC::adjust_pointer_closure);
}

template <class T> inline void SerialFullGC::adjust_pointer(T* p) {
Copy link
Member

Choose a reason for hiding this comment

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

This new code should be after "void MarkAndPushClosure::do_oop(narrowOop* p) { do_oop_work(p); }" so that mark_and_push is next to its caller.

Copy link
Member Author

Choose a reason for hiding this comment

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

Moved.

Copy link
Member

Choose a reason for hiding this comment

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

The "inline" keyword can be dropped, both in hpp and cpp.

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 11, 2024
@lgxbslgx
Copy link
Member Author

Thanks for your reviews. Integrating.

/integrate

@openjdk
Copy link

openjdk bot commented Apr 12, 2024

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

  • 0f78d01: 8329658: Serial: Refactor ContiguousSpace::_next_compaction_space
  • b8f675f: 8329771: G1: Refactor G1BlockOffsetTable::verify
  • 3e9c381: 8329488: Move OopStorage code from safepoint cleanup and remove safepoint cleanup code
  • 77a217d: 8330095: RISC-V: Remove obsolete vandn_vi instruction
  • 717a07b: 8322140: javax/swing/JTable/JTableScrollPrintTest.java does not print the rows and columns of the table in Nimbus and Aqua LookAndFeel
  • aebfd53: 8329660: G1: Improve TestGCLogMessages to be more precise
  • 006a516: 8329962: Remove CardTable::invalidate
  • c7fcd62: 8330006: Serial: Extract out ContiguousSpace::block_start_const
  • 2c8b432: 8330003: Serial: Move the logic of FastEvacuateFollowersClosure to SerialHeap
  • 2c45eca: 8328879: G1: Some gtests modify global state crashing the JVM during GC after JDK-8289822
  • ... and 10 more: https://git.openjdk.org/jdk/compare/ecc603ca9b441cbb7ad27fbc2529fcb0b1da1992...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 12, 2024
@openjdk openjdk bot closed this Apr 12, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 12, 2024
@openjdk
Copy link

openjdk bot commented Apr 12, 2024

@lgxbslgx Pushed as commit f706949.

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

@lgxbslgx lgxbslgx deleted the REMOVE_INLINE branch April 12, 2024 14:13
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.

4 participants