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

8275868: ciReplay: Inlining fails with "unloaded signature classes" due to wrong protection domains #6159

Closed
wants to merge 1 commit into from

Conversation

chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Oct 28, 2021

Replay compilation can fail to inline a method which was inlined in the normal run due to unresolved classes in the signature of an inlinee. The reason is that ciReplay is not resolving Java API classes with the protection domain of the holder class of the method to be replay compiled. Compiler replay is currently only resolving classes without a protection domain (i.e. an empty handle):

CompileReplay(const char* filename, TRAPS) {
_thread = THREAD;
_loader = Handle(_thread, SystemDictionary::java_system_loader());
_protection_domain = Handle();

A more detailed description can be found in the description of JDK-8275868.

This patch fixes that and takes the protection domain of the holder class of the method to be compiled to resolve all other classes used for ciReplay. The unloaded classes check is done in ciMethod::has_unloaded_classes_in_signature() and bypasses the whitelist introduced by JDK-8262912. However, this is fine since the inlining decision is enforced by the inlining information in the replay file.

To test the various scenarios mentioned in the description of JDK-8275868, I've added some support to use DumpReplay to not require a crash. I parse the inlining information from the hotspot log file to check that ciReplay applies the same inlining decisions as the normal run.

Thanks,
Christian


Progress

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

Issue

  • JDK-8275868: ciReplay: Inlining fails with "unloaded signature classes" due to wrong protection domains

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6159

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 28, 2021

👋 Welcome back chagedorn! 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 Oct 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 28, 2021

@chhagedorn The following label will be automatically applied to this pull request:

  • hotspot-compiler

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-compiler label Oct 28, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 28, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Good.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 28, 2021

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

8275868: ciReplay: Inlining fails with "unloaded signature classes" due to wrong protection domains

Reviewed-by: kvn, dlong, thartmann

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

  • 158831e: 8274320: os::fork_and_exec() should be using posix_spawn
  • bf2e9ee: 8275080: G1CollectedHeap::expand() returns the wrong value
  • b7104ba: 8196017: java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java fails
  • 6875678: 8273831: PrintServiceLookup spawns 2 threads in the current classloader, getting orphaned
  • 5bbc8d3: 8274621: NullPointerException because listenAddress[0] is null
  • 5021a12: 8274855: vectorapi tests failing with assert(!vbox->is_Phi()) failed
  • fe6a202: 8271356: Modify jdb to treat an empty command as a repeat of the previous command
  • cef9db9: 8276039: Remove unnecessary qualifications of java_lang_Class::
  • 13265f9: 8274750: java/io/File/GetXSpace.java failed: '/dev': 191488 != 190976
  • 5facaa2: 8276128: (bf) Remove unused constant ARRAY_BASE_OFFSET from Direct-X-Buffer
  • ... and 170 more: https://git.openjdk.java.net/jdk/compare/9d191fce55fa70d6a2affc724fad57b0e20e4bde...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 label Oct 28, 2021
@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Oct 29, 2021

Thanks Vladimir and Dean for your reviews!

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good to me too. Nice test!

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Nov 1, 2021

Thanks Tobias for your review!

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Nov 1, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 1, 2021

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

  • 158831e: 8274320: os::fork_and_exec() should be using posix_spawn
  • bf2e9ee: 8275080: G1CollectedHeap::expand() returns the wrong value
  • b7104ba: 8196017: java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java fails
  • 6875678: 8273831: PrintServiceLookup spawns 2 threads in the current classloader, getting orphaned
  • 5bbc8d3: 8274621: NullPointerException because listenAddress[0] is null
  • 5021a12: 8274855: vectorapi tests failing with assert(!vbox->is_Phi()) failed
  • fe6a202: 8271356: Modify jdb to treat an empty command as a repeat of the previous command
  • cef9db9: 8276039: Remove unnecessary qualifications of java_lang_Class::
  • 13265f9: 8274750: java/io/File/GetXSpace.java failed: '/dev': 191488 != 190976
  • 5facaa2: 8276128: (bf) Remove unused constant ARRAY_BASE_OFFSET from Direct-X-Buffer
  • ... and 170 more: https://git.openjdk.java.net/jdk/compare/9d191fce55fa70d6a2affc724fad57b0e20e4bde...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 1, 2021

@chhagedorn Pushed as commit 5bb1992.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler integrated
4 participants