8257502: Builds fail with new warnings after JDK-8256254

[shipilev]

Default x86_32 and s390x builds fail after JDK-8256254, because of the new warning:

x86_32:

/home/shade/trunks/jdk/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp: In function 'void gen_special_dispatch(MacroAssembler*, const methodHandle&, const BasicType*, const VMRegPair*)':
/home/shade/trunks/jdk/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp:1291:11: error: format '%d' expects argument of type 'int', but argument 4 has type 'vmIntrinsics::ID' {aka 'vmIntrinsicID'} [-Werror=format=]
 1291 | fatal("unexpected intrinsic id %d", iid);
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~
      | |
      | vmIntrinsics::ID {aka vmIntrinsicID}
   ... (rest of output omitted)

s390x:

/home/shade/trunks/jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp: In function 'void gen_special_dispatch(MacroAssembler*, int, vmIntrinsics::ID, const BasicType*, const VMRegPair*)':
/home/shade/trunks/jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp:923:15: error: format '%d' expects argument of type 'int', but argument 5 has type 'vmIntrinsics::ID' {aka 'vmIntrinsicID'} [-Werror=format=]
  923 | "special_dispatch=%d", special_dispatch);
      | ^~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
      | |
   ... (rest of output omitted)

The fix is pretty trivial: do the same as other arches. I think it would have been caught by GH actions in #1237, if they actually ran...

Testing:

• Linux x86_32 fastdebug build
• Linux s390x fastdebug build

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• Change must be properly reviewed

Issue

• JDK-8257502: Builds fail with new warnings after JDK-8256254

Reviewers

• Jie Fu (@DamonFool - Committer)
• Thomas Stuefe (@tstuefe - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1536/head:pull/1536
$ git checkout pull/1536

[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

• 01: Full - Incremental (92c02ee)
• 00: Full (ecdff11)

[hltj]

There is a similar issue at

jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp

Line 923 in ecdff11

"special_dispatch=%d", special_dispatch);

, could you fix it together?

[DamonFool]

Build passed with this fix.
Thanks.

[shipilev]

There is similar issue at

jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp

Line 923 in ecdff11

"special_dispatch=%d", special_dispatch);

Ah. I would need to test that separately with s390x cross-compilation. Would try to do that in a separate PR.

[hltj]

There is similar issue at

jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp

Line 923 in ecdff11

"special_dispatch=%d", special_dispatch);

Ah. I would need to test that separately with s390x cross-compilation. Would try to do that in a separate PR.

Thanks, I just noticed there's another similar issue when manually trigger the Github action 'Pre-submit tests'.

[shipilev]

There is similar issue at

jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp

Line 923 in ecdff11

"special_dispatch=%d", special_dispatch);

Ah. I would need to test that separately with s390x cross-compilation. Would try to do that in a separate PR.

Thanks, I just noticed there's another similar issue when manual trigger the Github action 'Pre-submit tests'.

Thanks! So only s390x is additionally affected, I will merge the fix into this PR then.

[tstuefe]

Thanks Aleksey. LGTM.

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

8257502: Builds fail with new warnings after JDK-8256254

Reviewed-by: jiefu, 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 4 new commits pushed to the master branch:

• e0de28c: 8257424: RecordingStream does not specify the recording name
• 60f2ba9: 8257487: Include configuration name in summary
• 021dced: 8257415: ZGC: Fix barrier_data types
• aa2d36f: 8256807: C2: Not marking stores correctly as mismatched in string opts

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]

Trivial, right? So I can push as soon as tests go green?

[tstuefe]

Trivial, right? So I can push as soon as tests go green?

Please do.

[shipilev]

x86_32 build-test and s390x build passed in GH Actions. I would not wait for Windows tests to catch up.

/integrate

[openjdk]

@shipilev Since your change was applied there have been 7 commits pushed to the master branch:

• 2966d0d: 8257223: C2: Optimize RegMask::is_bound
• 3a11009: 8256830: misc tests failed with "assert(env->is_enabled(JVMTI_EVENT_OBJECT_FREE)) failed: checking"
• c859fb0: 8249836: java/io/IOException/LastErrorString.java should have bug-id as 1st word in @ignore
• e0de28c: 8257424: RecordingStream does not specify the recording name
• 60f2ba9: 8257487: Include configuration name in summary
• 021dced: 8257415: ZGC: Fix barrier_data types
• aa2d36f: 8256807: C2: Not marking stores correctly as mismatched in string opts

Your commit was automatically rebased without conflicts.

Pushed as commit eaf4db6.

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