Skip to content

8291947: riscv: fail to build after JDK-8290840 #9763

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

Closed
wants to merge 1 commit into from

Conversation

yadongw
Copy link
Contributor

@yadongw yadongw commented Aug 5, 2022

JDK-8290840 moved icache_flush from os_linux_riscv.cpp to icache_riscv.cpp, and we got 2 icache_flush there, and then caused a compilation error of "overloaded function with no contextual type information" in generate_icache_flush, which simply used the function name as a function address.

We put icache_flush in os files because it was just a linux implementation, and we saw some test failures on Hifive Unleashed when using the "portable" version of __builtin__clear_cache provided by compilers about 2 years ago. The problem doesn't exist anymore, so we can revert to the previous implementation of just using the builtin clear cache function.

Tier1 of hotspot and jdk passed on unmatched.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9763

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 5, 2022

👋 Welcome back yadongwang! 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 5, 2022
@openjdk
Copy link

openjdk bot commented Aug 5, 2022

@yadongw 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 hotspot-compiler-dev@openjdk.org label Aug 5, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 5, 2022

Webrevs

@RealFYang
Copy link
Member

Verified that riscv port can build with this fix. Looks good.

@openjdk
Copy link

openjdk bot commented Aug 5, 2022

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

8291947: riscv: fail to build after JDK-8290840

Reviewed-by: fyang, fjiang

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

  • dd7f2d9: 8290090: Change CodeBlobType from unscoped enum to enum class
  • 4c652d9: 8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
  • b0d6952: 8291823: IGV: Fix "Save selected groups"
  • 504a626: 8291799: IGV: make "Selection mode" a toggle button
  • 6e7cd76: 8291061: Improve thread safety of FileTime.toString and toInstant
  • 477f471: Merge
  • 4b3dfe1: 8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
  • 6b2184e: 8290248: Implement MaxINode::Ideal transformation

Please see this link for an up-to-date comparison between the source branch of this pull request and the master 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.

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 (@RealFYang) 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).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 5, 2022
@yadongw
Copy link
Contributor Author

yadongw commented Aug 5, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 5, 2022
@openjdk
Copy link

openjdk bot commented Aug 5, 2022

@yadongw
Your change (at version d4e11f5) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 5, 2022

Going to push as commit 88c96dd.
Since your change was applied there have been 8 commits pushed to the master branch:

  • dd7f2d9: 8290090: Change CodeBlobType from unscoped enum to enum class
  • 4c652d9: 8291952: riscv: Remove PRAGMA_NONNULL_IGNORED
  • b0d6952: 8291823: IGV: Fix "Save selected groups"
  • 504a626: 8291799: IGV: make "Selection mode" a toggle button
  • 6e7cd76: 8291061: Improve thread safety of FileTime.toString and toInstant
  • 477f471: Merge
  • 4b3dfe1: 8283276: java/io/ObjectStreamClass/ObjectStreamClassCaching.java fails with various GCs
  • 6b2184e: 8290248: Implement MaxINode::Ideal transformation

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 5, 2022
@openjdk openjdk bot closed this Aug 5, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 5, 2022
@openjdk
Copy link

openjdk bot commented Aug 5, 2022

@RealFYang @yadongw Pushed as commit 88c96dd.

💡 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 hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants