[Backport] [Oracle GraalVM] [GR-71376] Backport to 23.1: Fix potential crash with DynamicObjectLibrary.removeKey.

[elkorchi]

What would you like to backport?

Oracle GraalVM backported commits:
(oracle/graal@ddb6907dc00)
(oracle/graal@397718fc2ce)

Describe the motivation for the backport.

Backported to Oracle GraalVM for JDK 21, fix version: graalvm-23.1.10

[bulasevich]

backport issues

1. (oracle/graal@ddb6907dc00)

The change:

commit ace57dc9099134da3bd8e1a1484d25a611b6cbe3
Author: Andreas Woess <andreas.woess@oracle.com>
Date:   Mon Nov 10 15:12:18 2025 +0100

    Always clear the source location when moving values between locations.

Cherry-pick merge issues

It is a context, not a change. Todo: apply local code
<<<<<<< HEAD:truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
                Collections.sort(moves);
=======
                moves.sort(Move::compareTo);
>>>>>>> ddb6907dc00 (Always clear the source location when moving values between locations.):truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibraryImpl.java

Need to mix: old header, new EMPTY_ARRAY field
<<<<<<< HEAD:truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
        Move(LocationImpl fromLoc, LocationImpl toLoc, int fromOrd, int toOrd) {
            this.fromLoc = fromLoc;
=======
        private static final Move[] EMPTY_ARRAY = new Move[0];

        Move(Location fromLoc, Location toLoc, int fromOrd, int toOrd) {
            assert fromLoc != toLoc;
            this.fromLoc = Objects.requireNonNull(fromLoc);
>>>>>>> ddb6907dc00 (Always clear the source location when moving values between locations.):truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibraryImpl.java

Todo: accept new (changed) code
<<<<<<< HEAD:truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
            performSet(obj, performGet(obj));
=======
            if (toLoc != null) {
                performSet(obj, performGet(obj));
            }
            /*
             * It does not matter for correctness whether we clear after the get or set. Clearing
             * after the set might be slightly preferable w.r.t. store ordering.
             */
            clear(obj);
>>>>>>> ddb6907dc00 (Always clear the source location when moving values between locations.):truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibraryImpl.java

Todo: accept new (changed) code
<<<<<<< HEAD:truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
                ACCESS.trimToSize(object, shapeBefore, shapeAfter);
                ACCESS.setShape(object, shapeAfter);
=======

                DynamicObjectSupport.trimToSize(object, shapeBefore, shapeAfter);
>>>>>>> ddb6907dc00 (Always clear the source location when moving values between locations.):truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibraryImpl.java

Todo: accept new (changed) empty code
<<<<<<< HEAD:truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
                ACCESS.setShape(object, shapeAfter);
=======
>>>>>>> ddb6907dc00 (Always clear the source location when moving values between locations.):truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibraryImpl.java

Following compilation issues hints we are in trouble:

/home/boris/graal-21/graal/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java:396: error: cannot find symbol
        Location removedPropertyLoc = removedProperty.getLocation();
                                      ^
  symbol:   variable removedProperty
  location: class DynamicObjectLibraryImpl
/home/boris/graal-21/graal/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java:399: error: cannot find symbol
            moves.add(new Move(removedPropertyLoc, null, removedPropertyLoc.getOrdinal(), Integer.MIN_VALUE));
                                                                           ^
  symbol:   method getOrdinal()
  location: variable removedPropertyLoc of type Location
/home/boris/graal-21/graal/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java:544: error: setShape(Shape) is not public in DynamicObject; cannot be accessed from outside package
            object.setShape(shapeAfter);
                  ^
3 errors

Issue#1 missing Optimize DynamicObjectLibrary.removeKey change on graalvm-community-jdk21u that adds prepareRemove parameter

-    static RemovePlan prepareRemove(ShapeImpl shapeBefore, ShapeImpl shapeAfter) {
+    static RemovePlan prepareRemove(ShapeImpl shapeBefore, ShapeImpl shapeAfter, Property removedProperty) {

Issue#2 missing Merge LocationImpl in Location change that brings Location.getOrdinal function

--- truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java
+    abstract int getOrdinal();

Issue#3 missing Move dynamic object implementation into api package change that makes possible package private calls in between DynamicObjectLibraryImpl and DynamicObject

truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java   
-->
truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObjectLibraryImpl.java

2. (oracle/graal@397718fc2ce)

The change:

commit 397718fc2ce5a30285a72b551d2196d0c87f5b09
Author: Andreas Woess <andreas.woess@oracle.com>
Date:   Tue Nov 11 18:12:16 2025 +0100

    Implement clear() for primitive locations.

The change is not applicable to current graalvm-community-jdk21u:

• ExtLocations.java does not exist (missing Add extended dynamic object layout.)
• clear does not belong to Location.java (missing Merge LocationImpl in Location)