-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8314247: JVMCI: expected int64_t but JavaThread::_held_monitor_count is of type intx #15295
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
Conversation
|
👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
@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: 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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
|
@dougxc Is this okay with you? Otherwise, I'm not really sure how you want to fix it. |
|
|
||
| // Make sure the native type is still the type we expect. | ||
| if (cppType != null && !cppType.equals(entry.type)) { | ||
| if (cppType != null && !typeEquals(cppType, entry.type)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have conditional code in Graal (e.g. here) to deal with type changes in vmstructs so there's no need to fix it here. I'd prefer to not have this code do type aliasing like this as it might hide other changes we need to make in Graal.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, if you can fix it in Graal, that would be great. Thanks!
…is of type intx (this is temp workaround from the withdrawn openjdk/jdk#15295)
Fix graal error with @iklam's fix of making intx and int64_t synonyms. Tested with new test in jvmci tests.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15295/head:pull/15295$ git checkout pull/15295Update a local copy of the PR:
$ git checkout pull/15295$ git pull https://git.openjdk.org/jdk.git pull/15295/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 15295View PR using the GUI difftool:
$ git pr show -t 15295Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15295.diff
Webrev
Link to Webrev Comment