RFR: 8356122: Client build fails after JDK-8350209

[Aleksey Shipilev]

See bug for samples of build failures. I reproduced and fixed both with this PR.

Additional testing:
 - [x] Linux x86_64 client release build
 - [x] Linux x86_64 client fastdebug build

-------------

Commit messages:
 - Fix

Changes: https://git.openjdk.org/jdk/pull/25030/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=25030&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8356122
  Stats: 2 lines in 1 file changed: 2 ins; 0 del; 0 mod
  Patch: https://git.openjdk.org/jdk/pull/25030.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/25030/head:pull/25030

PR: https://git.openjdk.org/jdk/pull/25030