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

8268553: [lworld] CI must return secondary mirror when accessing CONSTANT_Class with Q-signature #442

Closed
wants to merge 1 commit into from

Conversation

fparain
Copy link
Collaborator

@fparain fparain commented Jun 10, 2021

Please review this small change in CI to return the secondary mirror when accessing a CONSTANT_Class_info entry containing a Q-signature.
This change fixes all compiler tests failures in the lqagain branch but the ones depending on intrinsics (Class::getSuperclass intrinsic and Class::isAssignableFrom intrinsics need to be fixed in a separate changeset).

Thank you,

Fred


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8268553: [lworld] CI must return secondary mirror when accessing CONSTANT_Class with Q-signature

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 442

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 10, 2021

👋 Welcome back fparain! A progress list of the required criteria for merging this PR into lqagain 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 Jun 10, 2021

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

8268553: [lworld] CI must return secondary mirror when accessing CONSTANT_Class with Q-signature

Reviewed-by: mchung, roland

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 642 new commits pushed to the lqagain 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 lqagain branch, type /integrate in a new comment.

@mlbridge
Copy link

mlbridge bot commented Jun 10, 2021

Webrevs

Copy link
Member

@mlchung mlchung left a comment

It looks right to me.

Copy link
Collaborator

@rwestrel rwestrel left a comment

Looks good to me.

@fparain
Copy link
Collaborator Author

fparain commented Jun 23, 2021

Mandy, Roland,

Thank you for your reviews,

Fred

@fparain
Copy link
Collaborator Author

fparain commented Jun 23, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jun 23, 2021

Going to push as commit 4d064ba.
Since your change was applied there have been 642 commits pushed to the lqagain branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 23, 2021

@fparain Pushed as commit 4d064ba.

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

@@ -697,7 +697,15 @@ ciConstant ciEnv::get_constant_by_index_impl(const constantPoolHandle& cpool,
}
assert (klass->is_instance_klass() || klass->is_array_klass(),
"must be an instance or array klass ");
return ciConstant(T_OBJECT, klass->java_mirror());
if (tag.is_unresolved_klass()) {
Copy link
Member

@TobiHartmann TobiHartmann Jul 9, 2021

Choose a reason for hiding this comment

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

This is too strict because klass->is_loaded() can be true even if tag.is_unresolved_klass(). This leads to C2 adding uncommon traps to trigger resolution in the interpreter. However, I've observed cases were the interpreter never resolved the constant and tag.is_unresolved_klass() remained true, leading to continuous deoptimizations in C2 compiled code. I'm not sure if that is expected behavior or if there is a bug in the interpreter but the CI code should be fixed in any case. I'll do that with JDK-8267932.

Copy link
Collaborator Author

@fparain fparain Jul 19, 2021

Choose a reason for hiding this comment

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

Do you have an example where the interpreter never resolves the entry?

@fparain fparain deleted the lq_ci branch Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants