Skip to content

Conversation

@coleenp
Copy link
Contributor

@coleenp coleenp commented Aug 15, 2023

Fix graal error with @iklam's fix of making intx and int64_t synonyms. Tested with new test in jvmci tests.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8314247: JVMCI: expected int64_t but JavaThread::_held_monitor_count is of type intx (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15295/head:pull/15295
$ git checkout pull/15295

Update a local copy of the PR:
$ git checkout pull/15295
$ git pull https://git.openjdk.org/jdk.git pull/15295/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15295

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15295.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 15, 2023

👋 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 openjdk bot added the rfr Pull request is ready for review label Aug 15, 2023
@openjdk
Copy link

openjdk bot commented Aug 15, 2023

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

  • graal
  • hotspot-compiler

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 graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels Aug 15, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 15, 2023

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Aug 15, 2023

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

8314247: JVMCI: expected int64_t but JavaThread::_held_monitor_count is of type intx

Reviewed-by: 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Aug 15, 2023
@coleenp
Copy link
Contributor Author

coleenp commented Aug 15, 2023

@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)) {
Copy link
Member

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.

Copy link
Contributor Author

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!

@coleenp coleenp closed this Aug 15, 2023
@coleenp coleenp deleted the graal branch August 15, 2023 21:18
iklam added a commit to openjdk/leyden that referenced this pull request Aug 24, 2023
…is of type intx (this is temp workaround from the withdrawn openjdk/jdk#15295)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

graal graal-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants