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

8294083: RISC-V: Minimal build failed with --disable-precompiled-headers #6

Merged
merged 2 commits into from
Mar 7, 2023

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Mar 2, 2023

Please review this backport to riscv-port-jdk17u.
Backport of JDK-8294083.
Compared to the original patch, the addition of including the corresponding header (gc/shared/collectedHeap.hpp) fix the invalid use of incomplete type 'class CollectedHeap' as follows:

=== Output from failing command(s) repeated here ===
* For target hotspot_variant-minimal_libjvm_objs_c1_Runtime1_riscv.o:
/home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp: In static member function 'static OopMapSet* Runtime1::generate_code_for(Runtime1::StubID, StubAssembler*)':
/home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp:675:41: error: invalid use of incomplete type 'class CollectedHeap'
  675 |             !UseTLAB && Universe::heap()->supports_inline_contig_alloc()) {
      |                                         ^~
In file included from /home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp:38:
/home/zifeihan/riscv-port-jdk17u/src/hotspot/share/memory/universe.hpp:42:7: note: forward declaration of 'class CollectedHeap'
   42 | class CollectedHeap;
      |       ^~~~~~~~~~~~~
/home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp:804:41: error: invalid use of incomplete type 'class CollectedHeap'
  804 |         if (!UseTLAB && Universe::heap()->supports_inline_contig_alloc()) {
      |                                         ^~
In file included from /home/zifeihan/riscv-port-jdk17u/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp:38:
/home/zifeihan/riscv-port-jdk17u/src/hotspot/share/memory/universe.hpp:42:7: note: forward declaration of 'class CollectedHeap'
   42 | class CollectedHeap;
      |       ^~~~~~~~~~~~~

In addition to that, we need JDK-8295468 to fix the minimal build of fastdebug.
Testing: Minimal builds with this fix


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

Issues

  • JDK-8294083: RISC-V: Minimal build failed with --disable-precompiled-headers
  • JDK-8295468: RISC-V: Minimal builds are broken

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 2, 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 0746bcb68fde1d59e71c573aaf448bc54a0897d3 8294083: RISC-V: Minimal build failed with --disable-precompiled-headers Mar 2, 2023
@openjdk
Copy link

openjdk bot commented Mar 2, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 2, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 2, 2023

Webrevs

@zifeihan
Copy link
Member Author

zifeihan commented Mar 2, 2023

/issue 8295468

@openjdk
Copy link

openjdk bot commented Mar 2, 2023

@zifeihan
Adding additional issue to issue list: 8295468: RISC-V: Minimal builds are broken.

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.

Looks good.

@RealFYang RealFYang merged commit 3f66185 into openjdk:riscv-port Mar 7, 2023
@zifeihan zifeihan deleted the backport-JDK-8294083 branch March 10, 2023 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants