8295469: S390X: Optimized builds are broken

[shipilev]

* For target hotspot_variant-server_libjvm_objs_BUILD_LIBJVM_link:
/usr/lib/gcc-cross/s390x-linux-gnu/10/../../../../s390x-linux-gnu/bin/ld: /home/shade/trunks/jdk/build/build-all-server-optimized-s390x-linux-gnu-10/hotspot/variant-server/libjvm/objs/interp_masm_s390.o: in function `InterpreterMacroAssembler::get_monitors(RegisterImpl*)':
make/hotspot/src/hotspot/cpu/s390/interp_masm_s390.cpp:673: undefined reference to `InterpreterMacroAssembler::asm_assert_ijava_state_magic(RegisterImpl*)'
/usr/lib/gcc-cross/s390x-linux-gnu/10/../../../../s390x-linux-gnu/bin/ld: /home/shade/trunks/jdk/build/build-all-server-optimized-s390x-linux-gnu-10/hotspot/variant-server/libjvm/objs/interp_masm_s390.o: in function `InterpreterMacroAssembler::save_bcp()':
make/hotspot/src/hotspot/cpu/s390/interp_masm_s390.cpp:654: undefined reference to `InterpreterMacroAssembler::asm_assert_ijava_state_magic(RegisterImpl*)'

The fix is to enable assert-like methods only in "debug" builds, and allow diag-like printing methods in "optimized" builds.

Additional testing:

• Linux S390X {server, client, minimal, zero} x {release, fastdebug, slowdebug, optimized} make hotspot

---

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-8295469: S390X: Optimized builds are broken

Reviewers

• Thomas Stuefe (@tstuefe - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10743

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

Using diff file

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

[bridgekeeper]

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

@shipilev The following label will be automatically applied to this pull request:

• hotspot-compiler

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

[mlbridge]

Webrevs

• 00: Full (1bb6206c)

[tstuefe]

+1, trivial. Thanks for fixing.

[openjdk]

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

8295469: S390X: Optimized builds are broken

Reviewed-by: stuefe

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:

• 8c40b7d: 8292177: InitialSecurityProperty JFR event

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.

[shipilev]

Thanks!

/integrate

[openjdk]

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

• 63867c4: 8295433: EpsilonHeap doesn't need to override post_initialize()
• e7375f9: 8295468: RISC-V: Minimal builds are broken
• bd41428: 8293590: Some syntax checks performed by URL.openConnection() could be performed earlier, at URL construction
• 78fed9d: 7175397: The divider color is not changed to green when dragging for Nimbus LaF.
• 8c40b7d: 8292177: InitialSecurityProperty JFR event

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev Pushed as commit 7b2e83b.

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