8351149: Remove dead IA32/X32/!AMD64 code blocks after 32-bit x86 removal #27990

anton-seoane · 2025-10-26T09:18:40Z

This PR carries out cleanup of IA32-, X32- and !AMD64-guarded code blocks after the removal of the 32-bit x86 architecture from HotSpot.

These code blocks are either not needed anymore or the guards redundant.

Please note that this changeset addresses the "complement" of JDK-8351159. This is to say, this PR targets all directories that are not cpu/x86 and os_cpu/x86.

Testing: passes tiers 1-3

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-8351149: Remove dead IA32/X32/!AMD64 code blocks after 32-bit x86 removal (Sub-task - P4)

Reviewers

Stefan Karlsson (@stefank - Reviewer)
Albert Mingkun Yang (@albertnetymk - Reviewer)
Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27990

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-10-26T09:20:30Z

👋 Welcome back aseoane! 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 · 2025-10-26T09:20:50Z

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

8351149: Remove dead IA32/X32/!AMD64 code blocks after 32-bit x86 removal

Reviewed-by: stefank, ayang, kvn

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

5ebc2c7: 8369995: Fix StringIndexOutOfBoundsException and implement extra logging and/or propagate errors in X509KeyManagerImpl
289f421: 8366488: JVM_FindClassFromClass should assert that from class is never null
69a9b4c: 8370064: Test runtime/NMT/CheckForProperDetailStackTrace.java fails on Windows when using stripped pdb files
... and 39 more: https://git.openjdk.org/jdk/compare/470eedb1e9d67058ff8d67a5b0c2250d9f9b3fa5...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.

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 (@stefank, @albertnetymk, @vnkozlov) 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).

openjdk · 2025-10-26T09:21:32Z

@anton-seoane The following labels will be automatically applied to this pull request:

hotspot
shenandoah

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 · 2025-10-27T06:37:51Z

Webrevs

01: Full - Incremental (a26d83f9)
00: Full (e36fc5ac)

stefank · 2025-10-27T09:19:24Z

src/hotspot/os/linux/os_linux.cpp

-#elif defined(AMD64)
-// Unfortunately we have to bring all these macros here from vsyscall.h
-// to be able to compile on old linuxes.
-  #define __NR_vgetcpu 2
-  #define VSYSCALL_START (-10UL << 20)
-  #define VSYSCALL_SIZE 1024
-  #define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))
-  typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache);
-  vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu);
-  retval = vgetcpu(&cpu, nullptr, nullptr);
-#endif


Should this really have been removed?

It really shouldn't have. Fixed it

anton-seoane · 2025-10-28T12:44:57Z

/integrate

openjdk · 2025-10-28T12:46:34Z

@anton-seoane
Your change (at version a26d83f) is now ready to be sponsored by a Committer.

anton-seoane · 2025-10-28T12:46:53Z

Thanks all for the reviews!

vnkozlov · 2025-10-28T17:46:15Z

src/hotspot/share/c1/c1_CodeStubs.hpp

  ConversionStub(Bytecodes::Code bytecode, LIR_Opr input, LIR_Opr result)
    : _bytecode(bytecode), _input(input), _result(result) {
-    NOT_IA32( ShouldNotReachHere(); ) // used only on x86-32
+    ShouldNotReachHere();


Should we remove this code then in separate RFE?

Yes. I have filed JDK-8370878 for it

vnkozlov

Good.

vnkozlov · 2025-10-28T17:48:35Z

/sponsor

openjdk · 2025-10-28T17:49:26Z

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

5ebc2c7: 8369995: Fix StringIndexOutOfBoundsException and implement extra logging and/or propagate errors in X509KeyManagerImpl
289f421: 8366488: JVM_FindClassFromClass should assert that from class is never null
69a9b4c: 8370064: Test runtime/NMT/CheckForProperDetailStackTrace.java fails on Windows when using stripped pdb files
... and 39 more: https://git.openjdk.org/jdk/compare/470eedb1e9d67058ff8d67a5b0c2250d9f9b3fa5...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-10-28T17:49:35Z

@vnkozlov @anton-seoane Pushed as commit 86f60f6.

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

anton-seoane added 2 commits October 24, 2025 16:43

IA32

e4488ff

X32

e36fc5a

anton-seoane mentioned this pull request Oct 26, 2025

8351159: Remaining cleanups in cpu/x86 after 32-bit x86 removal #27987

Closed

3 tasks

openjdk bot added hotspot [email protected] shenandoah [email protected] labels Oct 26, 2025

anton-seoane marked this pull request as ready for review October 27, 2025 06:32

openjdk bot added the rfr Pull request is ready for review label Oct 27, 2025

stefank suggested changes Oct 27, 2025

View reviewed changes

Apply review comments (restore mistakenly cleaned define)

a26d83f

stefank approved these changes Oct 28, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 28, 2025

albertnetymk approved these changes Oct 28, 2025

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 28, 2025

vnkozlov reviewed Oct 28, 2025

View reviewed changes

vnkozlov approved these changes Oct 28, 2025

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Oct 28, 2025

openjdk bot closed this Oct 28, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 28, 2025

8351149: Remove dead IA32/X32/!AMD64 code blocks after 32-bit x86 removal #27990

8351149: Remove dead IA32/X32/!AMD64 code blocks after 32-bit x86 removal #27990

Uh oh!

Conversation

anton-seoane commented Oct 26, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Oct 26, 2025

Uh oh!

openjdk bot commented Oct 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Oct 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mlbridge bot commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

stefank Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

anton-seoane Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

anton-seoane commented Oct 28, 2025

Uh oh!

openjdk bot commented Oct 28, 2025

Uh oh!

anton-seoane commented Oct 28, 2025

Uh oh!

vnkozlov Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

anton-seoane Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

vnkozlov commented Oct 28, 2025

Uh oh!

openjdk bot commented Oct 28, 2025

Uh oh!

openjdk bot commented Oct 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

anton-seoane commented Oct 26, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Oct 26, 2025 •

edited

Loading

openjdk bot commented Oct 26, 2025 •

edited

Loading

mlbridge bot commented Oct 27, 2025 •

edited

Loading