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

8266426: ZHeapIteratorOopClosure does not handle native access properly #3838

Closed
wants to merge 4 commits into from

Conversation

@albertnetymk
Copy link
Member

@albertnetymk albertnetymk commented May 3, 2021

Change the inheritance hierarchy of ZHeapIteratorOopClosure so that we can know whether we are loading oops from in-heap or outside-heap (only CLD iteration).


Progress

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

Issue

  • JDK-8266426: ZHeapIteratorOopClosure does not handle native access properly

Reviewers

Contributors

  • Per Liden <pliden@openjdk.org>
  • Erik Österlund <eosterlund@openjdk.org>
  • Stefan Karlsson <stefank@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3838

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 3, 2021

👋 Welcome back ayang! 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.

Loading

@openjdk openjdk bot added the rfr label May 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 3, 2021

@albertnetymk 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.

Loading

@openjdk openjdk bot added the hotspot-gc label May 3, 2021
@albertnetymk
Copy link
Member Author

@albertnetymk albertnetymk commented May 3, 2021

/contributor add pliden
/contributor add eosterlund

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 3, 2021

@albertnetymk
Contributor Per Liden <pliden@openjdk.org> successfully added.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 3, 2021

@albertnetymk
Contributor Erik Österlund <eosterlund@openjdk.org> successfully added.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 3, 2021

Webrevs

Loading

Copy link
Member

@stefank stefank left a comment

This adds an non-trivial is_in call to each visited oop*. I'd like to see if this could instead be solved by letting the used closure "know" when it scans CLDs, and only in that case use NativeAccess.

Loading

@albertnetymk
Copy link
Member Author

@albertnetymk albertnetymk commented May 4, 2021

/contributor add stefank

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 4, 2021

@albertnetymk
Contributor Stefan Karlsson <stefank@openjdk.org> successfully added.

Loading

Copy link
Member

@stefank stefank left a comment

Looks good

Loading

pliden
pliden approved these changes May 6, 2021
Copy link
Contributor

@pliden pliden left a comment

Looks good.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 6, 2021

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

8266426: ZHeapIteratorOopClosure does not handle native access properly

Co-authored-by: Per Liden <pliden@openjdk.org>
Co-authored-by: Erik Österlund <eosterlund@openjdk.org>
Co-authored-by: Stefan Karlsson <stefank@openjdk.org>
Reviewed-by: stefank, pliden

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 136 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.

Loading

@openjdk openjdk bot added the ready label May 6, 2021
stefank
stefank approved these changes May 6, 2021
@albertnetymk
Copy link
Member Author

@albertnetymk albertnetymk commented May 6, 2021

Thank you very much for the help on creating this patch.

/integrate

Loading

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

@openjdk openjdk bot commented May 6, 2021

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

  • 2438498: 8252758: Lanai: Optimize index calculation while copying glyphs
  • eb3b96d: 8266496: WBIsKlassAliveClosure.do_klass() fails for hidden classes
  • 51f5adf: 8265047: Inconsistent warning message in jcmd VM.log
  • ea30bd6: 8263362: Avoid division by 0 in java/awt/font/TextJustifier.java justify
  • 0f9852c: 8266168: -Wmaybe-uninitialized happens in check_code.c
  • a86ee9b: 8266545: 8261169 broke Harfbuzz build with gcc 7 and 8
  • 2dd5667: 8266018: Shenandoah: fix an incorrect assert
  • 22ca62c: 8266542: Remove broken -XX:-UseLoopSafepoints flag
  • 7835cdb: 8265915: adjust state_unloading_cycle compuation order in nmethod::is_unloading
  • 20ad428: 8180568: Refactor javax/crypto shell tests to plain java tests
  • ... and 128 more: https://git.openjdk.java.net/jdk/compare/e325a750ac795181f14b278fcd171170dbb3bbd5...master

Your commit was automatically rebased without conflicts.

Pushed as commit 47d4438.

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

Loading

@albertnetymk albertnetymk deleted the iterator branch May 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants