Remove AddShapeFlagsNode.

Author: woess

truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectNodesTest.java

@@ -189,13 +189,6 @@ private DynamicObject.SetShapeFlagsNode createSetShapeFlagsNode() {
         };
     }
 
-    private DynamicObject.AddShapeFlagsNode createAddShapeFlagsNode() {
-        return switch (run) {
-            case CACHED -> DynamicObject.AddShapeFlagsNode.create();
-            case UNCACHED -> DynamicObject.AddShapeFlagsNode.getUncached();
-        };
-    }
-
     private DynamicObject.IsSharedNode createIsSharedNode() {
         return switch (run) {
             case CACHED -> DynamicObject.IsSharedNode.create();
@@ -675,15 +668,14 @@ public void testHasAddShapeFlags() {
 
         DynamicObject.GetShapeFlagsNode getShapeFlagsNode = createGetShapeFlagsNode();
         DynamicObject.SetShapeFlagsNode setShapeFlagsNode = createSetShapeFlagsNode();
-        DynamicObject.AddShapeFlagsNode addShapeFlagsNode = createAddShapeFlagsNode();
 
         DynamicObject o1 = createEmpty();
         setShapeFlagsNode.execute(o1, flags);
         assertEquals(flags, getShapeFlagsNode.execute(o1));
         assertTrue(hasShapeFlags(getShapeFlagsNode, o1, flags));
         assertTrue(hasShapeFlags(getShapeFlagsNode, o1, 0b10));
         assertFalse(hasShapeFlags(getShapeFlagsNode, o1, 0b11));
-        addShapeFlagsNode.execute(o1, 0b1);
+        addShapeFlags(getShapeFlagsNode, setShapeFlagsNode, o1, 0b1);
         assertTrue(hasShapeFlags(getShapeFlagsNode, o1, 0b11));
         assertEquals(flags | 0b1, getShapeFlagsNode.execute(o1));
     }
@@ -692,6 +684,10 @@ static boolean hasShapeFlags(DynamicObject.GetShapeFlagsNode getShapeFlagsNode,
         return (getShapeFlagsNode.execute(obj) & flags) == flags;
     }
 
+    static boolean addShapeFlags(DynamicObject.GetShapeFlagsNode getShapeFlagsNode, DynamicObject.SetShapeFlagsNode setShapeFlagsNode, DynamicObject obj, int flags) {
+        return setShapeFlagsNode.execute(obj, (getShapeFlagsNode.execute(obj) | flags));
+    }
+
     @Test
     public void testMakeShared() {
         String key = "key";

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObject.java

@@ -1369,13 +1369,10 @@ public abstract static class SetShapeFlagsNode extends Node {
          * }
          * }
          *
-         * Note that {@link AddShapeFlagsNode} is more efficient and convenient for that particular pattern.
-         *
          * @param newFlags the flags to set; must be in the range from 0 to 65535 (inclusive).
          * @return {@code true} if the object's shape changed, {@code false} if no change was made.
          * @throws IllegalArgumentException if the flags are not in the allowed range.
          * @see GetShapeFlagsNode
-         * @see AddShapeFlagsNode
          * @see Shape.Builder#shapeFlags(int)
          */
         // @formatter:on
@@ -1429,108 +1426,6 @@ public static SetShapeFlagsNode getUncached() {
         }
     }
 
-    /**
-     * Adds language-specific object shape flags.
-     *
-     * @see #execute(DynamicObject, int)
-     * @since 25.1
-     */
-    @ImportStatic(DynamicObject.class)
-    @GeneratePackagePrivate
-    @GenerateUncached
-    @GenerateInline(false)
-    public abstract static class AddShapeFlagsNode extends Node {
-
-        AddShapeFlagsNode() {
-        }
-
-        // @formatter:off
-        /**
-         * Adds language-specific object shape flags, changing the object's shape if need be.
-         *
-         * These flags may be used to tag objects that possess characteristics that need to be queried
-         * efficiently on fast and slow paths. For example, they can be used to mark objects as frozen.
-         * <p>
-         * Only the lowest 16 bits (i.e. values in the range 0 to 65535) are allowed, the remaining bits
-         * are currently reserved.
-         * <p>
-         * Equivalent to:
-         * {@snippet :
-         * @Specialization
-         * static void addFlags(DynamicObject receiver, int newFlags,
-         *                 @Cached DynamicObject.GetShapeFlagsNode getShapeFlagsNode,
-         *                 @Cached DynamicObject.SetShapeFlagsNode setShapeFlagsNode) {
-         *     setShapeFlagsNode.execute(receiver, getShapeFlagsNode.execute(receiver) | newFlags);
-         * }
-         * }
-         *
-         * <h3>Usage example:</h3>
-         *
-         * {@snippet :
-         * @Specialization
-         * static void freeze(DynamicObject receiver,
-         *                 @Cached DynamicObject.AddShapeFlagsNode addShapeFlagsNode) {
-         *     addShapeFlagsNode.execute(receiver, FROZEN);
-         * }
-         * }
-         *
-         * @param newFlags the flags to set; must be in the range from 0 to 65535 (inclusive).
-         * @return {@code true} if the object's shape changed, {@code false} if no change was made.
-         * @throws IllegalArgumentException if the flags are not in the allowed range.
-         * @see GetShapeFlagsNode
-         * @see Shape.Builder#shapeFlags(int)
-         */
-        // @formatter:on
-        public abstract boolean execute(DynamicObject receiver, int newFlags);
-
-        @SuppressWarnings("unused")
-        @Specialization(guards = {"shape == cachedShape", "flags == newFlags"}, limit = "SHAPE_CACHE_LIMIT")
-        static boolean doCached(DynamicObject receiver, int flags,
-                        @Bind("receiver.getShape()") Shape shape,
-                        @Cached("shape") Shape cachedShape,
-                        @Cached("flags") int newFlags,
-                        @Cached("shapeAddFlags(cachedShape, newFlags)") Shape newShape) {
-            if (newShape != cachedShape) {
-                receiver.setShape(newShape);
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        @Specialization(replaces = "doCached")
-        static boolean doGeneric(DynamicObject receiver, int flags,
-                        @Bind("receiver.getShape()") Shape shape) {
-            Shape newShape = shapeAddFlags(shape, flags);
-            if (newShape != shape) {
-                receiver.setShape(newShape);
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        static Shape shapeAddFlags(Shape shape, int newFlags) {
-            return shape.setFlags(shape.getFlags() | newFlags);
-        }
-
-        /**
-         * @since 25.1
-         */
-        @NeverDefault
-        public static AddShapeFlagsNode create() {
-            return DynamicObjectFactory.AddShapeFlagsNodeGen.create();
-        }
-
-        /**
-         * @since 25.1
-         */
-        @NeverDefault
-        public static AddShapeFlagsNode getUncached() {
-            return DynamicObjectFactory.AddShapeFlagsNodeGen.getUncached();
-        }
-    }
-
     /**
      * Checks whether this object is marked as shared.
      *