8255213: Shenandoah build fails without JFR after JDK-8255036

[DamonFool]

Hi all,

Please review the one-line fix of Shenandoah build failure without JFR.

Thanks.
Best regards,
Jie

---

Progress

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

Testing

	Linux x32	Linux x64	Windows x64	macOS x64
Build	✔️ (1/1 passed)	✔️ (5/5 passed)	✔️ (2/2 passed)	✔️ (2/2 passed)
Test (tier1)		✔️ (9/9 passed)	❌ (1/9 failed)	✔️ (9/9 passed)

Failed test task

• Windows x64 (hs/tier1 compiler)

Issue

• JDK-8255213: Shenandoah build fails without JFR after JDK-8255036

Reviewers

• Aleksey Shipilev (@shipilev - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/794/head:pull/794
$ git checkout pull/794

[bridgekeeper]

👋 Welcome back jiefu! 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.

[DamonFool]

/issue add JDK-8255213
/test
/label add hotspot-gc
/cc hotspot-gc

[openjdk]

@DamonFool This issue is referenced in the PR title - it will now be updated.

[openjdk]

@DamonFool
The hotspot-gc label was successfully added.

[openjdk]

@DamonFool The hotspot-gc label was already applied.

[mlbridge]

Webrevs

• 02: Full - Incremental (d29d4e0)
• 01: Full - Incremental (dad21ff)
• 00: Full (5d0ffcb)

[shipilev]

I think you can drop the #include "gc/shenandoah/shenandoahHeap.hpp" then, as .inline.hpp is supposed to transitively include it.

[DamonFool]

Good idea.
Updated.
Thanks.

[shipilev]

Looks fine, assuming nopch builds come clean. (They should, but still wait for them?)

[openjdk]

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

8255213: Shenandoah build fails without JFR after JDK-8255036

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

• cc50c8d: 8255196: Remove unused G1FullGCCompactionPoint::merge()
• ae72b52: 8255047: Add HotSpot UseDebuggerErgo flags
• 211bb62: 8255124: KeepAliveStreamCleaner may crash with java.lang.IllegalMonitorStateException: current thread is not owner
• 299e115: 8198395: Test javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java fails in mach5
• a5b7bc5: 7156347: javax/swing/JList/6462008/bug6462008.java fails
• b25d894: 8252204: AArch64: Implement SHA3 accelerator/intrinsic

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[DamonFool]

@shipilev

One more build error occurred if nopch and -jfr.

/home/jvm/jiefu/open/jdk/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp: In member function 'void ShenandoahBarrierSetC2::insert_pre_barrier(GraphKit*, Node*, Node*, Node*, bool) const':
/home/jvm/jiefu/open/jdk/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp:376:27: error: 'java_lang_ref_Reference' has not been declared
       otype->get_con() != java_lang_ref_Reference::referent_offset()) {
                           ^~~~~~~~~~~~~~~~~~~~~~~
/home/jvm/jiefu/open/jdk/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp:416:32: error: 'java_lang_ref_Reference' has not been declared
   Node* referent_off = __ ConX(java_lang_ref_Reference::referent_offset());
                                ^~~~~~~~~~~~~~~~~~~~~~~

I've updated the patch to fix it.
Could you please review it again?
Thanks.

[DamonFool]

Hi @shipilev ,
Do you think this change is trivial?
Or shall we wait for one more review?
Thanks.

[shipilev]

I believe you can integrate.

[DamonFool]

/integrate

[openjdk]

@DamonFool Since your change was applied there have been 17 commits pushed to the master branch:

• fe74f3c: 8255224: x86_32 tests fail with "bad AD file" after JDK-8223051
• 64dc4b1: 8255225: compiler/aot tests fail on Windows with NPE during artifact resolution
• a824781: 8255210: [Vector API] jdk/incubator/vector/Int256VectorTests.java crashes on AVX512 machines
• 2ca7a08: 8255268: 32-bit failures in runtime/Metaspace/elastic
• d8d9197: 8242559: Clean the "libawt_xawt" library from code for headless mode
• ff5f226: 8255086: Update the root locale display names
• 8afdcae: 8255031: Update java/util/prefs/AddNodeChangeListener.java to report more failure info
• 0aa3c92: 8255262: Remove use of legacy custom @SPEC tag
• a0b687b: 8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations
• f279ddf: 8248411: [aarch64] Insufficient error handling when CodeBuffer is exhausted
• ... and 7 more: https://git.openjdk.java.net/jdk/compare/7d3d4daefdd5c534d1622e39721950a158d8b269...master

Your commit was automatically rebased without conflicts.

Pushed as commit 8e5dff0.

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