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

JDK-8234502 : Merge GenCollectedHeap and SerialHeap #16623

Closed
wants to merge 0 commits into from

Conversation

LizBing
Copy link
Contributor

@LizBing LizBing commented Nov 11, 2023


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-8234502: Merge GenCollectedHeap and SerialHeap (Enhancement - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16623

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 11, 2023

👋 Welcome back LizBing! 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 Nov 11, 2023

@LizBing 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 hotspot hotspot-dev@openjdk.org rfr Pull request is ready for review labels Nov 11, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 11, 2023

@LizBing
Copy link
Contributor Author

LizBing commented Nov 11, 2023

/label add hotspot-gc

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Nov 11, 2023
@openjdk
Copy link

openjdk bot commented Nov 11, 2023

@LizBing
The hotspot-gc label was successfully added.

@lgxbslgx
Copy link
Member

/reviewers 2 reviewer

@openjdk
Copy link

openjdk bot commented Nov 11, 2023

@lgxbslgx Only the author of the pull request or Reviewers are allowed to change the number of required reviewers.

@albertnetymk
Copy link
Member

Maybe there is some misinterpretation about the ticket description, but I'd expect class GenCollectedHeap to be removed completely with this ticket.

Could you enable GHA (https://wiki.openjdk.org/display/SKARA/Testing) to catch potential issues for all platforms? It should show sth like "19 successful checks", e.g. in #16560.

@LizBing
Copy link
Contributor Author

LizBing commented Nov 15, 2023

done!

@albertnetymk
Copy link
Member

albertnetymk commented Nov 21, 2023

The general shape looks good. I wanna took a closer look after #16492 #16554 is merged. (I believe that can reduce the diff size of this PR slightly.)

@albertnetymk
Copy link
Member

I just noticed I referred to the wrong PR number in my previous msg...

Could you resolve the conflict now that that PR is merged?

@LizBing
Copy link
Contributor Author

LizBing commented Nov 30, 2023

I just noticed I referred to the wrong PR number in my previous msg...

Could you resolve the conflict now that that PR is merged?

ok!

@openjdk
Copy link

openjdk bot commented Dec 1, 2023

@LizBing 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 serialgc
git fetch https://git.openjdk.org/jdk.git 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 Pull request has merge conflict with target branch label Dec 1, 2023
@LizBing LizBing closed this Dec 1, 2023
@LizBing
Copy link
Contributor Author

LizBing commented Dec 1, 2023

I will open another pr later.

@albertnetymk
Copy link
Member

Both reusing this PR and creating another one are fine, IMO.

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 merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants