8295268: Optimized builds are broken due to incorrect assert_is_rfp shortcuts

[shipilev]

Fails on many platforms, for example arm32:

/home/shade/trunks/jdk/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp:36:36: error: expected ';' at end of member declaration
   36 | static void assert_is_rfp(VMReg r) PRODUCT_RETURN
      | ^

The reason is that PRODUCT_RETURN + DEBUG_ONLY are not unity: in "optimized" builds, we have !PRODUCT and !DEBUG.

  static void assert_is_rfp(VMReg r) PRODUCT_RETURN
                                     DEBUG_ONLY({ Unimplemented(); })

---

Progress

• [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• [x] Change must not contain extraneous whitespace
• [x] Commit message must refer to an issue

Issue

• JDK-8295268: Optimized builds are broken due to incorrect assert_is_rfp shortcuts

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10696

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

Using diff file

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

[bridgekeeper[bot]]

:wave: 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[bot]]

@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[bot]]

Webrevs

• 00: Full (f6bbf595)

[shipilev]

Any takers? Thanks.

[openjdk[bot]]

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

8295268: Optimized builds are broken due to incorrect assert_is_rfp shortcuts

Reviewed-by: jiefu

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

• 529cc48f355523fd162470b416a5081869adcf0e: 8295396: RISC-V: Cleanup useless CompressibleRegions
• 692cdab2be7dfc6e12b127f8e2c97bc41536cb84: 8295016: Make the arraycopy_epilogue signature consistent with its usage
• 21a825e059170e3a069b9f0982737c5839e6dae2: 8288387: GetLocalXXX/SetLocalXXX spec should require suspending target thread
• 8d751de3198675b22704cdccafaff2fc0fdd3f59: 8295231: Move all linking of native libraries to make
• f300ec8631b781938e6e96165ba23cda14a20f24: 8294546: document where javac differs when invoked via launcher and ToolProvider
• b269c51d10c353d9b7143b2239beb23c01352182: 8295395: Linux Alpha Zero builds fail after JDK-8292591
• ae60599e2ba75d80c3b4279903137b2c549f8066: 8295023: Interpreter(AArch64): Implement -XX:+PrintBytecodeHistogram and -XX:+PrintBytecodePairHistogram options
• 4d37ef2d545c016e6c3ad52171ea961d4406726f: 8295262: Build binutils out of source tree
• 0919a3a0c198a5234b5ed9a3bb999564d2382a56: 8294186: AArch64: VectorMaskToLong failed on SVE2 machine with -XX:UseSVE=1
• ec2981b83bc3ef6977b5f16d5222eb49b0ea49ad: 8293711: Factor out size parsing functions from arguments.cpp
• ... and 84 more: https://git.openjdk.org/jdk/compare/4435d56d3fa232748b22eeb6f2894cc8dc937ccf...master

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]

LGTM

Thank you! Trivial, or?

[DamonFool]

LGTM

Thank you! Trivial, or?

Yes, I think it's trivial. Thanks.

[shipilev]

Thanks!

/integrate

[openjdk[bot]]

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

• 0b7d811c98cb45a822b7ef56e5ee99d1b5483e78: 8294730: Add @throws and @implNote clauses to BigInteger::isProblablePrime and BigInteger::nextProblablePrime
• 4434cbb719db37880b48474ba342f300ed4828a8: 8295264: Fix PaX check on RISC-V
• a8c18ebc152842281b22534507b4a09612ea3498: 8295257: Remove implicit noreg temp register arguments in aarch64 MacroAssembler
• 6553065cab9ecb14390da8ec34e49aba940b213f: 8295273: Remove unused argument in [load/store]_sized_value on aarch64 and riscv
• b06f1b149c8f8a49d4e42c4b782a4b3a22aa79f6: 8294594: Fix cast-function-type warnings in signal handling code
• 71aa8210910dbafe30eccc772eaa7747f46be0cd: 8295176: some langtools test pollutes source tree
• bca7ab3c1109e6cff9b50ecdd3045cb0ae8f6953: 8295412: support latest VS2022 MSC_VER in abstract_vm_version.cpp
• c33ca0c5edd60454c58916cb588e5b2cfcc7b36a: 6229853: BasicTextAreaUI:create incompletely documents the possible returned View types
• 358ac07255cc640cbcb9b0df5302d97891a34087: 8294254: [macOS] javax/swing/plaf/aqua/CustomComboBoxFocusTest.java failure
• 490fcd0c2547cb4e564363f0cd121c777c3acc02: 8293833: Error mixing types with -XX:+UseCMoveUnconditionally -XX:+UseVectorCmov
• ... and 94 more: https://git.openjdk.org/jdk/compare/4435d56d3fa232748b22eeb6f2894cc8dc937ccf...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@shipilev Pushed as commit e7a964b4dbbdd21eba87dc94eb3680e9553f5039.

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