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

8297644: RISC-V: Compilation error when shenandoah is disabled #22

Merged
merged 1 commit into from Mar 22, 2023

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Mar 22, 2023

Please help review this backport to riscv-port-jdk17u.
Backport of JDK-8297644. Applies cleanly.
The compilation failed before the modification as follows:

Creating support/modules_libs/java.base/server/libjvm.so from 975 file(s)
/home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/riscv.ad: In member function 'virtual void MachPrologNode::emit(CodeBuffer&, PhaseRegAlloc*) const':
/home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/riscv.ad:1351:7: error: invalid use of incomplete type 'class BarrierSetAssembler'
 1351 |     bs->nmethod_entry_barrier(&_masm);
      |       ^~
In file included from /home/zifeihan/riscv-port-jdk17u/src/hotspot/share/gc/shared/modRefBarrierSet.hpp:28,
                 from /home/zifeihan/riscv-port-jdk17u/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp:29,
                 from /home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/riscv.ad:960,
                 from ad_riscv.cpp:31:
/home/zifeihan/riscv-port-jdk17u/src/hotspot/share/gc/shared/barrierSet.hpp:36:7: note: forward declaration of 'class BarrierSetAssembler'
   36 | class BarrierSetAssembler;
      |       ^~~~~~~~~~~~~~~~~~~
...
=== End of repeated output ===

No indication of failed target found.
Hint: Try searching the build log for '] Error'.
Hint: See doc/building.html#troubleshooting for assistance.

make[1]: *** [/home/zifeihan/riscv-port-jdk17u/make/Init.gmk:315: main] Error 2
make: *** [/home/zifeihan/riscv-port-jdk17u/make/Init.gmk:186: default] Error 2

Compile normally after fix.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8297644: RISC-V: Compilation error when shenandoah is disabled

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/riscv-port-jdk17u.git pull/22/head:pull/22
$ git checkout pull/22

Update a local copy of the PR:
$ git checkout pull/22
$ git pull https://git.openjdk.org/riscv-port-jdk17u.git pull/22/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/riscv-port-jdk17u/pull/22.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 2023

👋 Welcome back gcao! A progress list of the required criteria for merging this PR into riscv-port 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 changed the title Backport 4d730f561fc493a956386b053de492933933ff54 8297644: RISC-V: Compilation error when shenandoah is disabled Mar 22, 2023
@openjdk
Copy link

openjdk bot commented Mar 22, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Mar 22, 2023

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

8297644: RISC-V: Compilation error when shenandoah is disabled

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 riscv-port 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.

➡️ 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 22, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 22, 2023

Webrevs

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

OK. Thanks.

@RealFYang RealFYang merged commit 1201b31 into openjdk:riscv-port Mar 22, 2023
1 check passed
@zifeihan zifeihan deleted the backport-JDK-8297644 branch March 23, 2023 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean ready Pull request is ready to be integrated rfr Pull request is ready for review
2 participants