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

Indirect klass #19272

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Indirect klass #19272

wants to merge 4 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented May 16, 2024

Indirect klass pointers, false SA tests and something fails on windows.


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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19272

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2024

👋 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
Copy link

openjdk bot commented May 16, 2024

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk
Copy link

openjdk bot commented May 16, 2024

@coleenp The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels May 16, 2024
@openjdk
Copy link

openjdk bot commented Jun 6, 2024

@coleenp 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 indirect-klass
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 Jun 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org hotspot hotspot-dev@openjdk.org merge-conflict Pull request has merge conflict with target branch
1 participant