Remove HasShapeFlagsNode.

Author: woess

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

@@ -175,13 +175,6 @@ private DynamicObject.GetShapeFlagsNode createGetShapeFlagsNode() {
         };
     }
 
-    private DynamicObject.HasShapeFlagsNode createHasShapeFlagsNode() {
-        return switch (run) {
-            case CACHED -> DynamicObject.HasShapeFlagsNode.create();
-            case UNCACHED -> DynamicObject.HasShapeFlagsNode.getUncached();
-        };
-    }
-
     private DynamicObject.ResetShapeNode createResetShapeNode() {
         return switch (run) {
             case CACHED -> DynamicObject.ResetShapeNode.create();
@@ -681,21 +674,24 @@ public void testHasAddShapeFlags() {
         final int flags = 0b101010;
 
         DynamicObject.GetShapeFlagsNode getShapeFlagsNode = createGetShapeFlagsNode();
-        DynamicObject.HasShapeFlagsNode hasShapeFlagsNode = createHasShapeFlagsNode();
         DynamicObject.SetShapeFlagsNode setShapeFlagsNode = createSetShapeFlagsNode();
         DynamicObject.AddShapeFlagsNode addShapeFlagsNode = createAddShapeFlagsNode();
 
         DynamicObject o1 = createEmpty();
         setShapeFlagsNode.execute(o1, flags);
         assertEquals(flags, getShapeFlagsNode.execute(o1));
-        assertTrue(hasShapeFlagsNode.execute(o1, flags));
-        assertTrue(hasShapeFlagsNode.execute(o1, 0b10));
-        assertFalse(hasShapeFlagsNode.execute(o1, 0b11));
+        assertTrue(hasShapeFlags(getShapeFlagsNode, o1, flags));
+        assertTrue(hasShapeFlags(getShapeFlagsNode, o1, 0b10));
+        assertFalse(hasShapeFlags(getShapeFlagsNode, o1, 0b11));
         addShapeFlagsNode.execute(o1, 0b1);
-        assertTrue(hasShapeFlagsNode.execute(o1, 0b11));
+        assertTrue(hasShapeFlags(getShapeFlagsNode, o1, 0b11));
         assertEquals(flags | 0b1, getShapeFlagsNode.execute(o1));
     }
 
+    static boolean hasShapeFlags(DynamicObject.GetShapeFlagsNode getShapeFlagsNode, DynamicObject obj, int flags) {
+        return (getShapeFlagsNode.execute(obj) & flags) == flags;
+    }
+
     @Test
     public void testMakeShared() {
         String key = "key";

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

@@ -1303,10 +1303,7 @@ public abstract static class GetShapeFlagsNode extends Node {
          * }
          * }
          *
-         * Note that {@link HasShapeFlagsNode} is more convenient for that particular pattern.
-         *
          * @return shape flags
-         * @see HasShapeFlagsNode
          * @see SetShapeFlagsNode
          * @see Shape.Builder#shapeFlags(int)
          * @see Shape#getFlags()
@@ -1344,85 +1341,6 @@ public static GetShapeFlagsNode getUncached() {
         }
     }
 
-    /**
-     * Checks if the language-specific object shape flags include the given flags.
-     *
-     * @see #execute(DynamicObject, int)
-     * @since 25.1
-     */
-    @ImportStatic(DynamicObject.class)
-    @GeneratePackagePrivate
-    @GenerateUncached
-    @GenerateInline(false)
-    public abstract static class HasShapeFlagsNode extends Node {
-
-        HasShapeFlagsNode() {
-        }
-
-        // @formatter:off
-        /**
-         * Checks if the language-specific object shape flags contains the given flags, previously set using
-         * {@link SetShapeFlagsNode} or
-         * {@link Shape.Builder#shapeFlags(int)}. If no shape flags were explicitly set, the default of
-         * false is returned.
-         *
-         * 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.
-         *
-         * <h3>Usage example:</h3>
-         *
-         * {@snippet :
-         * @ExportMessage
-         * Object writeMember(String member, Object value,
-         *                 @Cached DynamicObject.HasShapeFlagsNode hasShapeFlagsNode,
-         *                 @Cached DynamicObject.PutNode putNode)
-         *                 throws UnsupportedMessageException {
-         *     if (hasShapeFlagsNode.execute(receiver, FROZEN)) {
-         *         throw UnsupportedMessageException.create();
-         *     }
-         *     putNode.execute(this, member, value);
-         * }
-         * }
-         *
-         * @return whether the shape flags contain (all of) the given flags
-         * @see GetShapeFlagsNode
-         * @see SetShapeFlagsNode
-         * @see Shape.Builder#shapeFlags(int)
-         * @see Shape#getFlags()
-         */
-        // @formatter:on
-        public abstract boolean execute(DynamicObject receiver, int flags);
-
-        @SuppressWarnings("unused")
-        @Specialization(guards = "shape == cachedShape", limit = "1")
-        static boolean doCached(DynamicObject receiver, int flags,
-                        @Bind("receiver.getShape()") Shape shape,
-                        @Cached("shape") Shape cachedShape) {
-            return (cachedShape.getFlags() & flags) == flags;
-        }
-
-        @Specialization(replaces = "doCached")
-        static boolean doGeneric(DynamicObject receiver, int flags) {
-            return (receiver.getShape().getFlags() & flags) == flags;
-        }
-
-        /**
-         * @since 25.1
-         */
-        @NeverDefault
-        public static HasShapeFlagsNode create() {
-            return DynamicObjectFactory.HasShapeFlagsNodeGen.create();
-        }
-
-        /**
-         * @since 25.1
-         */
-        @NeverDefault
-        public static HasShapeFlagsNode getUncached() {
-            return DynamicObjectFactory.HasShapeFlagsNodeGen.getUncached();
-        }
-    }
-
     /**
      * Sets language-specific object shape flags.
      *