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

8264150: CDS dumping code calls TRAPS functions in VM thread #3277

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Mar 30, 2021

This change initializes the vtables/itables without checking constraints. After initializing but before the class is visible in the SystemDictionary, constraints are checked in a separate loop.

Tested with tier1-6 which includes jck tests.


Progress

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

Issue

  • JDK-8264150: CDS dumping code calls TRAPS functions in VM thread

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3277

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 30, 2021

👋 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 Mar 30, 2021

@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 constraints
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 Pull request has merge conflict with target branch label Mar 30, 2021
@openjdk
Copy link

openjdk bot commented Mar 30, 2021

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

  • hotspot
  • serviceability

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 serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Mar 30, 2021
@coleenp coleenp changed the title 8264150: CDS dumping code calls TRAPS functions in VM threadConstraints 8264150: CDS dumping code calls TRAPS functions in VM thread Mar 30, 2021
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Mar 30, 2021
@coleenp coleenp marked this pull request as ready for review April 1, 2021 02:06
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 1, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 1, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this one Coleen! The refactoring was a bit more extensive than I had envisaged but the end result looks good.

Thanks,
David

@openjdk
Copy link

openjdk bot commented Apr 1, 2021

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

8264150: CDS dumping code calls TRAPS functions in VM thread

Reviewed-by: dholmes, iklam

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 19 new commits pushed to the master branch:

  • 3997c99: 8264222: Use switch expression in jshell where possible
  • 39f0b27: 8176026: SA: Huge heap sizes cause a negative value to be displayed in the jhisto heap total
  • de495df: 8264413: Data is written to file header even if its CRC32 was calculated
  • 52d8a22: 8264054: Bad XMM performance on java.lang.MathBench.sqrtDouble
  • 16acfaf: 8012229: [lcms] Improve performance of color conversion for images with alpha channel
  • cb70ab0: 8263235: sanity/client/SwingSet/src/ColorChooserDemoTest.java failed throwing java.lang.NoClassDefFoundError
  • e2ec997: 8263551: Provide shared lock-free FIFO queue implementation
  • dec3447: 8264346: nullptr_t undefined in global namespace for clang+libstdc++
  • 0fa3572: 8264489: Add more logging to LargeCopyWithMark.java
  • f43d14a: 8264396: Use the blessed modifier order in jdk.internal.jvmstat
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/815248ab27208cdbcac6544397d8d9ef82648357...master

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 Pull request is ready to be integrated label Apr 1, 2021
@coleenp
Copy link
Contributor Author

coleenp commented Apr 1, 2021

Thanks David and Ioi. Yes, the refactoring was a bit more involved than anticipated.
/integrate

@openjdk openjdk bot closed this Apr 1, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 1, 2021
@openjdk
Copy link

openjdk bot commented Apr 1, 2021

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

  • 1dc75e9: 8264538: Rename SystemDictionary::parse_stream
  • 80681b5: 8264546: Dependencies: Context class is always an InstanceKlass
  • fdfa1dd: 8264306: Non deterministic generation of java/lang/invoke/MemberName.class
  • 011f6d1: 8264223: CodeHeap::verify fails extra_hops assertion in fastdebug test
  • 0696fd0: 8263496: MetalHighContrastTheme.getControlHighlight cleanup
  • 6cf1095: 8264484: Replace uses of StringBuffer with StringBuilder in jdk.hotspot.agent
  • d2df9a7: 8264331: Use the blessed modifier order in jdk.compiler
  • 0228734: 8262470: Printed GlyphVector outline with low DPI has bad quality on Windows
  • 3997c99: 8264222: Use switch expression in jshell where possible
  • 39f0b27: 8176026: SA: Huge heap sizes cause a negative value to be displayed in the jhisto heap total
  • ... and 17 more: https://git.openjdk.java.net/jdk/compare/815248ab27208cdbcac6544397d8d9ef82648357...master

Your commit was automatically rebased without conflicts.

Pushed as commit 4b19771.

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

@coleenp coleenp deleted the constraints branch April 1, 2021 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
3 participants