Split PutNode into PutNode and PutConstantNode.

Author: woess

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

@@ -126,6 +126,13 @@ private DynamicObject.PutNode createPutNode() {
         };
     }
 
+    private DynamicObject.PutConstantNode createPutConstantNode() {
+        return switch (run) {
+            case CACHED -> DynamicObject.PutConstantNode.create();
+            case UNCACHED -> DynamicObject.PutConstantNode.getUncached();
+        };
+    }
+
     private DynamicObject.CopyPropertiesNode createCopyPropertiesNode() {
         return switch (run) {
             case CACHED -> DynamicObject.CopyPropertiesNode.create();
@@ -876,19 +883,20 @@ public void testPutConstant1() {
         int v2 = 43;
         int flags = 0xf;
 
-        var setNode1 = createPutNode();
+        var putConstantNode = createPutConstantNode();
+        var putNode = createPutNode();
 
-        setNode1.putConstantWithFlags(o1, k1, v1, 0);
+        putConstantNode.putConstantWithFlags(o1, k1, v1, 0);
         assertTrue(o1.getShape().getProperty(k1).getLocation().isConstant());
         assertEquals(0, o1.getShape().getProperty(k1).getFlags());
         assertEquals(v1, uncachedGet(o1, k1));
 
-        setNode1.putConstantWithFlags(o1, k1, v1, flags);
+        putConstantNode.putConstantWithFlags(o1, k1, v1, flags);
         assertTrue(o1.getShape().getProperty(k1).getLocation().isConstant());
         assertEquals(flags, o1.getShape().getProperty(k1).getFlags());
         assertEquals(v1, uncachedGet(o1, k1));
 
-        setNode1.put(o1, k1, v2);
+        putNode.put(o1, k1, v2);
         assertFalse(o1.getShape().getProperty(k1).getLocation().isConstant());
         assertEquals(flags, o1.getShape().getProperty(k1).getFlags());
         assertEquals(v2, uncachedGet(o1, k1));
@@ -902,14 +910,15 @@ public void testPutConstant2() {
         int v2 = 43;
         int flags = 0xf;
 
-        var setNode1 = createPutNode();
+        var putConstantNode = createPutConstantNode();
+        var putNode = createPutNode();
 
-        setNode1.putConstantWithFlags(o1, k1, v1, 0);
+        putConstantNode.putConstantWithFlags(o1, k1, v1, 0);
         assertTrue(o1.getShape().getProperty(k1).getLocation().isConstant());
         assertEquals(0, o1.getShape().getProperty(k1).getFlags());
         assertEquals(v1, uncachedGet(o1, k1));
 
-        setNode1.putWithFlags(o1, k1, v2, flags);
+        putNode.putWithFlags(o1, k1, v2, flags);
         if (isNewLayout()) {
             assertFalse(o1.getShape().getProperty(k1).getLocation().isConstant());
         }

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

@@ -300,6 +300,7 @@ static class NodesFakeDynamicObjectLibrary extends DynamicObjectLibraryWrapper {
 
         final DynamicObject.GetNode getNode;
         final DynamicObject.PutNode putNode;
+        final DynamicObject.PutConstantNode putConstantNode;
         final DynamicObject.RemoveKeyNode removeKeyNode;
         final DynamicObject.SetDynamicTypeNode setDynamicTypeNode;
         final DynamicObject.GetDynamicTypeNode getDynamicTypeNode;
@@ -318,6 +319,7 @@ static class NodesFakeDynamicObjectLibrary extends DynamicObjectLibraryWrapper {
         NodesFakeDynamicObjectLibrary() {
             getNode = DynamicObject.GetNode.create();
             putNode = DynamicObject.PutNode.create();
+            putConstantNode = DynamicObject.PutConstantNode.create();
             removeKeyNode = DynamicObject.RemoveKeyNode.create();
             setDynamicTypeNode = DynamicObject.SetDynamicTypeNode.create();
             getDynamicTypeNode = DynamicObject.GetDynamicTypeNode.create();
@@ -337,6 +339,7 @@ static class NodesFakeDynamicObjectLibrary extends DynamicObjectLibraryWrapper {
         NodesFakeDynamicObjectLibrary(@SuppressWarnings("unused") String uncached) {
             getNode = DynamicObject.GetNode.getUncached();
             putNode = DynamicObject.PutNode.getUncached();
+            putConstantNode = DynamicObject.PutConstantNode.getUncached();
             removeKeyNode = DynamicObject.RemoveKeyNode.getUncached();
             setDynamicTypeNode = DynamicObject.SetDynamicTypeNode.getUncached();
             getDynamicTypeNode = DynamicObject.GetDynamicTypeNode.getUncached();
@@ -385,7 +388,7 @@ public void putWithFlags(DynamicObject object, Object key, Object value, int fla
 
         @Override
         public void putConstant(DynamicObject object, Object key, Object value, int flags) {
-            putNode.putConstantWithFlags(object, key, value, flags);
+            putConstantNode.putConstantWithFlags(object, key, value, flags);
         }
 
         @Override