8314688: VM build without C1 fails after JDK-8313372

[xpbob]

[8314688: VM build without C1 fails after JDK-8313372]

./configure --with-jvm-features=-compiler1 --with-debug-level=release
make images JOBS=32

jvmciCompilerToVMInit.o:make/hotspot/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp:252: more undefined references to `Compiler::is_intrinsic_supported(vmIntrinsicID)' follow

---

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

• JDK-8314688: VM build without C1 fails after JDK-8313372 (Bug - P2)

Reviewers

• Yudi Zheng (@mur47x111 - no project role) ⚠️ Review applies to 6937badb
• Doug Simon (@dougxc - Reviewer)
• Hao Sun (@shqking - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15376

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back xpbob! 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]

@xpbob The following labels will be automatically applied to this pull request:

• graal
• hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 02: Full - Incremental (584aa573)
• 01: Full - Incremental (6937badb)
• 00: Full (97efc583)

[mur47x111]

Looks good to me. Thanks for fixing this!

[shqking]

Header c1/c1_Compiler.hpp at line 25 was introduced in JDK-8313372.
I suggest adding #ifdef COMPILER1 directive for this header as well.

The same to the C2 case, i.e. header opto/c2compiler.hpp.

[xpbob]

@mur47x111 @shqking
Thanks for the review,The code has been updated
add #ifdef for the header

[openjdk]

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

8314688: VM build without C1 fails after JDK-8313372

Reviewed-by: yzheng, dnsimon, haosun

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

• 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
• ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
• a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected

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 (@dougxc, @shqking) 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).

[xpbob]

@dougxc Thanks for the review

[shqking]

Thanks for your update. LGTM.

[xpbob]

/integrate

[openjdk]

@xpbob
Your change (at version 584aa57) is now ready to be sponsored by a Committer.

[TobiHartmann]

/sponsor

[openjdk]

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

• 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
• ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
• a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected

Your commit was automatically rebased without conflicts.

[openjdk]

@TobiHartmann @xpbob Pushed as commit 3e1b1bf.

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