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

8269578: [lworld] fix AArch64 build after JDK-8267824 #467

Closed
wants to merge 1 commit into from

Conversation

@nick-arm
Copy link
Member

@nick-arm nick-arm commented Jun 29, 2021

Replace ConstantPoolCacheEntry::is_inline_type_shift with
is_null_free_inline_type_shift and change inline_type to
null_free_inline_type in a few other places to match x86.


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8269578: [lworld] fix AArch64 build after JDK-8267824

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 467

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

Using diff file

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

Replace ConstantPoolCacheEntry::is_inline_type_shift with
is_null_free_inline_type_shift and change inline_type to
null_free_inline_type in a few other places to match x86.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 29, 2021

👋 Welcome back ngasson! A progress list of the required criteria for merging this PR into lworld 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 openjdk bot commented Jun 29, 2021

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

8269578: [lworld] fix AArch64 build after JDK-8267824

Reviewed-by: fparain, shade

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 lworld 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@fparain) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 29, 2021

Webrevs

Copy link
Collaborator

@fparain fparain left a comment

Looks good to me (I'm not an aarch64 expert, but changes seem to align aarch64 code with the changes made to the x86 code).

Fred

Copy link
Contributor

@shipilev shipilev left a comment

This is nice! I meant to address this build failure this week. It builds on aarch64 machine for me. There are seem to be some unrelated C2 test failures.

@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Jun 30, 2021

There are seem to be some unrelated C2 test failures.

The ones I know about are:

compiler/valhalla/inlinetypes/TestLWorld.java

Assertion failure in OopFlow::build_oop_map(). I raised JDK-8264340 for this.

compiler/valhalla/inlinetypes/TestArrays.java
compiler/valhalla/inlinetypes/TestNullableArrays.java

Fail to find some expected patterns in the opto assembly output. This should be trivial to fix - just need to adjust the regexps to match the AArch64 output - but conflicts with #457.

Did you see any other failures?

@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Jun 30, 2021

Thanks for the reviews @fparain, @shipilev

@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Jun 30, 2021

/integrate

@openjdk openjdk bot added the sponsor label Jun 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 30, 2021

@nick-arm
Your change (at version fc6f1f6) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Contributor

@shipilev shipilev commented Jun 30, 2021

Did you see any other failures?

No, only those. I think this PR should be integrated first anyhow.

@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Jul 5, 2021

Can I get a sponsor for this one please?

@rwestrel
Copy link
Collaborator

@rwestrel rwestrel commented Jul 6, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

Going to push as commit 37ea410.
Since your change was applied there has been 1 commit pushed to the lworld branch:

  • b3b7fb2: 8269792: [lworld] Duplicate/redundant CONSTANT_Class_info entry in constant pool

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 6, 2021

@rwestrel @nick-arm Pushed as commit 37ea410.

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

@nick-arm
Copy link
Member Author

@nick-arm nick-arm commented Jul 6, 2021

Thanks @rwestrel!

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