On Thu, 28 May 2026 17:08:38 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). This pull request has now been integrated. Changeset: 804858f5 Author: Manuel Hässig <[email protected]> Committer: Tobias Hartmann <[email protected]> URL: https://git.openjdk.org/valhalla/commit/804858f5c1cbf4f5ee4a18cbe260367e769fab95 Stats: 82612 lines in 811 files changed: 21 ins; 81698 del; 893 mod 8385581: [lworld] Remove the experimental JVMCI feature 8382708: [lworld] JVMCI support for Value Objects 8372605: [lworld] compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJava*.java fail with --enable-preview Reviewed-by: thartmann ------------- PR: https://git.openjdk.org/valhalla/pull/2482
