On Fri, 29 May 2026 07:11:28 GMT, Manuel Hässig <[email protected]> wrote:
>> This is a surprisingly clean cherry-pick of the JVMCI removal from mainline >> with minor additional Valhalla related cleanups. The few conflicts were >> mostly trivial to resolve. The non-tivial conflicts were in >> `src/hotspot/cpu/aarch64//gc/shared/barrierSetNMethod_aarch64.cpp`, and >> `src/hotspot/share/runtime/deoptimization.*`. >> >> The full list of conflicts: >> >> src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp >> src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp >> src/hotspot/cpu/x86/macroAssembler_x86.cpp >> src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp >> src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp >> src/hotspot/share/code/nmethod.cpp >> src/hotspot/share/compiler/compileBroker.cpp >> src/hotspot/share/oops/fieldInfo.hpp >> src/hotspot/share/oops/methodData.hpp >> src/hotspot/share/runtime/deoptimization.cpp >> src/hotspot/share/runtime/deoptimization.hpp >> src/java.base/share/classes/module-info.java >> test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java >> test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java >> test/hotspot/jtreg/runtime/clinit/ClassInitBarrier.java >> >> >> Testing: >> - [ ] tier1,tier2,tier3,valhalla-comp-stress >> - [ ] tier1,tier2,tier3 with `--enable-preview` >> >> --------- >> - [x] I confirm that I make this contribution in accordance with the >> [OpenJDK Interim AI Policy](https://openjdk.org/legal/ai). > > Manuel Hässig has updated the pull request incrementally with one additional > commit since the last revision: > > Use INTRINSIC_TRAP instead of the removed trap rule src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp line 112: > 110: _verified_alt1_guard(nullptr), > 111: _verified_alt2_guard(nullptr) { > 112: { We don't need two scopes here any more. ------------- PR Review Comment: https://git.openjdk.org/valhalla/pull/2482#discussion_r3322853466
