8293937: x86: Drop LP64 conditions from clearly x86_32 code

[shipilev]

Noticed this when porting Loom on x86_32. There are *_x86_32.cpp files that use _LP64 as if it matters for them. It does not make sense, as in those files we always have !_LP64. We can drop the conditionals and clean the code.

Proof of completeness:

$ ack LP64 src/hotspot/ | grep _32
src/hotspot/cpu/x86/register_x86.hpp:386:                          NOT_LP64( 8 + ) // FILL0-FILL7 in x86_32.ad
src/hotspot/cpu/x86/vm_version_x86.hpp:733:    return LP64_ONLY(true) NOT_LP64(false); // not implemented on x86_32

---

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-8293937: x86: Drop LP64 conditions from clearly x86_32 code

Reviewers

• Vladimir Kozlov (@vnkozlov - Reviewer)
• Thomas Stuefe (@tstuefe - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10305

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10305.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 (999fedc2)

[vnkozlov]

Good

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

8293937: x86: Drop LP64 conditions from clearly x86_32 code

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

• dfb9c06: 8293535: jdk/javadoc/doclet/testJavaFX/TestJavaFxMode.java fail with jfx
• f42caef: 8293550: Optionally add get-task-allow entitlement to macos binaries
• 5feca68: 8293840: RISC-V: Remove cbuf parameter from far_call/far_jump/trampoline_call
• 39cd163: 8293578: Duplicate ldc generated by javac
• 7765942: 8290367: Update default value and extend the scope of com.sun.jndi.ldap.object.trustSerialData system property
• 11e7d53: 8293819: sun/util/logging/PlatformLoggerTest.java failed with "RuntimeException: Retrieved backing PlatformLogger level null is not the expected CONFIG"

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.

[tstuefe]

Looks good.

I never really thought about how this bifurcation works in x86. So, this is build magic, it just avoids x86_64 files for 32bit builds and vice versa?

[shipilev]

So, this is build magic, it just avoids x86_64 files for 32bit builds and vice versa?

Yes:

jdk/make/hotspot/lib/CompileJvm.gmk

Lines 128 to 132 in b1ed40a

	ifeq ($(call isTargetCpu, x86), true)
	JVM_EXCLUDE_PATTERNS += x86_64
	else ifeq ($(call isTargetCpu, x86_64), true)
	JVM_EXCLUDE_PATTERNS += x86_32
	endif

[shipilev]

/integrate

[openjdk]

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

• b1ed40a: 8293466: libjsig should ignore non-modifying sigaction calls
• b6ff8fa: 8292073: NMT: remove unused constructor parameter from MallocHeader
• cfd44bb: 8293218: serviceability/tmtools/jstat/GcNewTest.java fails with "Error in the percent calculation"
• 01e7b88: 8290917: x86: Memory-operand arithmetic instructions have too low costs
• 4b8399b: 8293251: Use stringStream::base() instead of as_string() when applicable
• a8f0f57: 8278165: Clarify that ZipInputStream does not access the CEN fields for a ZipEntry
• 746f5f5: 8293816: CI: ciBytecodeStream::get_klass() is not consistent
• 4b297c1: 8293892: Add links to JVMS 19 and 20 from ClassFileFormatVersion enum constants
• dfb9c06: 8293535: jdk/javadoc/doclet/testJavaFX/TestJavaFxMode.java fail with jfx
• f42caef: 8293550: Optionally add get-task-allow entitlement to macos binaries
• ... and 4 more: https://git.openjdk.org/jdk/compare/141d5f5deec488531e410af875c781f4b70490da...master

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev Pushed as commit 357a2cc.

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