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

8277428: G1: Move and inline G1STWIsAliveClosure::do_object_b #6470

Closed

Conversation

Hamlin-Li
Copy link

@Hamlin-Li Hamlin-Li commented Nov 19, 2021

This is a trivial patch to move G1STWIsAliveClosure::do_object_b definition to the right file g1CollectedHeap.inline.hpp.


Progress

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

Issue

  • JDK-8277428: G1: Move and inline G1STWIsAliveClosure::do_object_b

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6470

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 19, 2021

👋 Welcome back mli! 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 label Nov 19, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 19, 2021

@Hamlin-Li 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 label Nov 19, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 19, 2021

Webrevs

Copy link
Contributor

@tschatzl tschatzl left a comment

Without checking performance, I think the definition should be moved to g1CollectedHeap.inline.hpp, not the .cpp file (and includes fixed up).

It's used on every reference for a few operations.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 19, 2021

@Hamlin-Li this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout move-G1STWIsAliveClosure-do_object_b
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict label Nov 19, 2021
@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Nov 19, 2021

Thanks Thomas.

Not sure if this method be inlined in original code, but I inline it anyway as you suggested.

@openjdk openjdk bot removed the merge-conflict label Nov 19, 2021
@Hamlin-Li Hamlin-Li changed the title 8277428: G1: Move G1STWIsAliveClosure::do_object_b definition back to g1CollectedHeap.cpp 8277428: G1: Move and inline G1STWIsAliveClosure::do_object_b Nov 19, 2021
@kstefanj
Copy link
Contributor

@kstefanj kstefanj commented Nov 19, 2021

A lot of the changes to include g1CollectedHeap.inline.hpp look strange to me, are they really needed? And the normal hpp-files that now include it are wrong, we should never have normal hpp-files including inline.hpp-files.

@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Nov 22, 2021

Thanks Stefan, I remove the unnecessary inline includes.

Copy link
Contributor

@tschatzl tschatzl left a comment

Lgtm.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 22, 2021

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

8277428: G1: Move and inline G1STWIsAliveClosure::do_object_b

Reviewed-by: tschatzl, sjohanss

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 22 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 label Nov 22, 2021
Copy link
Contributor

@kstefanj kstefanj left a comment

👍

@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Nov 22, 2021

Thansk @tschatzl @kstefanj for your reviews.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 22, 2021

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

  • 32839ba: 8266593: vmTestbase/nsk/jvmti/PopFrame/popframe011 fails with "assert(java_thread == _state->get_thread()) failed: Must be"
  • 8051041: 8277534: Remove unused ReferenceProcessor::has_discovered_references
  • 3f847fe: 8277385: Zero: Enable CompactStrings support
  • ca31ed5: 8275448: [REDO] AArch64: Implement string_compare intrinsic in SVE
  • 4ff4301: 8224922: Access JavaFileObject from Element(s)
  • 0a9e76c: 8277485: Zero: Fix fast{i,f}access_0 bytecodes handling
  • 1c215f3: 8272773: Configurable card table card size
  • 1d7cef3: 8276662: Scalability bottleneck in SymbolTable::lookup_common()
  • c79a485: 8277494: [BACKOUT] JDK-8276150 Quarantined jpackage apps are labeled as "damaged"
  • 2ab43ec: 8273544: Increase test coverage for snippets
  • ... and 13 more: https://git.openjdk.java.net/jdk/compare/b15e6f076afe5ac68e9af68756860d0b25adea4b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 22, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 22, 2021

@Hamlin-Li Pushed as commit d427c79.

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

@Hamlin-Li Hamlin-Li deleted the move-G1STWIsAliveClosure-do_object_b branch Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc integrated
3 participants