JDK-8306538: Zero variant build failure after JDK-8257967

[caizixian]

This follows the same style of fix applied in #13512. I noticed this issue when cross-compiling zero slowdebug for riscv64. I confirmed locally that this PR fixes the linking errors.

---

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-8306538: Zero variant build failure after JDK-8257967

Reviewers

• Aleksey Shipilev (@shipilev - Reviewer)
• David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13557

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

• hotspot
• serviceability

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

• 00: Full (dbba32af)

[shipilev]

Looks fine and trivial.

[openjdk]

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

8306538: Zero variant build failure after JDK-8257967

Reviewed-by: shade, dholmes

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 1 new commit pushed to the master branch:

• 9c2e5b3: 8306459: s390x: Replace NULL to nullptr

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 (@shipilev, @dholmes-ora) 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).

[dholmes-ora]

I'll approve this to get a quick fix in place but:

1. I can't see why this should be specific to zero.
2. I think the better fix is that os::find_builtin_agent should be guarded by #if INCLUDE_JVMTI. Or even moved to a JVMTI file instead.

Thanks.

[caizixian]

Agreed. As discussed #13512, relevant code should be cleaned up.

[caizixian]

I think the better fix is that os::find_builtin_agent should be guarded by #if INCLUDE_JVMTI. Or even moved to a JVMTI file instead.

Right. This is also the pattern used to exclude C1/C2 specific stuff from a zero build. Perhaps we can have a separate JBS issue to track these proposed changes.

[caizixian]

/integrate

[openjdk]

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

[shipilev]

/sponsor

[openjdk]

Going to push as commit 33a7978.
Since your change was applied there has been 1 commit pushed to the master branch:

• 9c2e5b3: 8306459: s390x: Replace NULL to nullptr

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev @caizixian Pushed as commit 33a7978.

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