[lworld] RFR: 8378212: [lworld] Cleanup accidental diffs with master - step 1

[Tobias Hartmann]

On Wed, 18 Feb 2026 15:31:37 GMT, Tobias Hartmann <thartmann at openjdk.org> wrote:

> This reverts some accidental changes to align closer with mainline.
> 
> Thanks,
> Tobias

src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp line 1238:

> 1236: 
> 1237:     default:
> 1238:       { StubFrame f(sasm, "unimplemented entry", dont_gc_arguments, does_not_return);

We could file this as mainline issue but I don't think it's worth it.

src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp line 111:

> 109: 
> 110:   bool needs_post_barrier = val != noreg && in_heap;
> 111: 

These were the only Valhalla specific changes in this file.

src/hotspot/cpu/x86/c1_globals_x86.hpp line 41:

> 39: define_pd_global(bool, UseOnStackReplacement,          true );
> 40: define_pd_global(bool, TieredCompilation,              false);
> 41: define_pd_global(intx, CompileThreshold,               1500 );

This is a leftover from when we had TieredCompilation disabled and then re-enabled it. We accidentally changed it to `true` here.

src/hotspot/share/ci/ciFlags.cpp line 54:

> 52:   if (is_strict()) {
> 53:     st->print(",strict");
> 54:   }

Some additional printing of new properties added with Valhalla that was missed here.

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

PR Review Comment: https://git.openjdk.org/valhalla/pull/2127#discussion_r2825882207
PR Review Comment: https://git.openjdk.org/valhalla/pull/2127#discussion_r2825880724
PR Review Comment: https://git.openjdk.org/valhalla/pull/2127#discussion_r2825884147
PR Review Comment: https://git.openjdk.org/valhalla/pull/2127#discussion_r2825885333