[GR-69326] Avoid duplicate property lookup in DynamicObjectLibrary.put.

PullRequest: graal/22034

Author: woess

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

@@ -303,21 +303,20 @@ static LocationImpl getLocation(Property existing) {
     }
 
     @TruffleBoundary
-    protected static boolean putUncached(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags) {
-        Shape s = object.getShape();
-        Property existingProperty = s.getProperty(key);
+    protected static boolean putGeneric(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags, Shape s, Property existingProperty) {
         if (existingProperty == null && Flags.isSetExisting(putFlags)) {
             return false;
         }
         if (existingProperty != null && !Flags.isUpdateFlags(putFlags) && existingProperty.getLocation().canStore(value)) {
             getLocation(existingProperty).setSafe(object, value, false, false);
             return true;
         } else {
-            return putUncachedSlow(object, key, value, newPropertyFlags, putFlags);
+            return putGenericSlowPath(object, key, value, newPropertyFlags, putFlags, s, existingProperty);
         }
     }
 
-    private static boolean putUncachedSlow(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags) {
+    private static boolean putGenericSlowPath(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags,
+                    Shape initialShape, Property propertyOfInitialShape) {
         CompilerAsserts.neverPartOfCompilation();
         updateShapeImpl(object);
         Shape oldShape;
@@ -326,7 +325,11 @@ private static boolean putUncachedSlow(DynamicObject object, Object key, Object
         Property property;
         do {
             oldShape = object.getShape();
-            existingProperty = oldShape.getProperty(key);
+            if (oldShape == initialShape) {
+                existingProperty = propertyOfInitialShape;
+            } else {
+                existingProperty = oldShape.getProperty(key);
+            }
             if (existingProperty == null) {
                 if (Flags.isSetExisting(putFlags)) {
                     return false;
@@ -720,7 +723,7 @@ public double getDoubleOrDefault(DynamicObject object, Shape cachedShape, Object
 
         @Override
         public boolean put(DynamicObject object, Shape cachedShape, Object key, Object value, int propertyFlags, int putFlags) {
-            return putUncached(object, key, value, propertyFlags, putFlags);
+            return putGeneric(object, key, value, propertyFlags, putFlags, cachedShape, cachedShape.getProperty(key));
         }
 
         @Override
@@ -1297,7 +1300,7 @@ protected boolean putImpl(DynamicObject object, Shape cachedShape, Object key, O
             Shape oldShape = cachedShape;
             MutateCacheData start = cache;
             if (start == MutateCacheData.GENERIC || !cachedShape.isValid()) {
-                return putUncached(object, key, value, propertyFlags, putFlags);
+                return putGeneric(object, key, value, propertyFlags, putFlags, cachedShape, oldProperty);
             }
             for (MutateCacheData c = start; c != null; c = c.next) {
                 if (!c.isValid()) {
@@ -1335,7 +1338,7 @@ protected boolean putIntImpl(DynamicObject object, Shape cachedShape, Object key
             Shape oldShape = cachedShape;
             MutateCacheData start = cache;
             if (start == MutateCacheData.GENERIC || !cachedShape.isValid()) {
-                return putUncached(object, key, value, propertyFlags, putFlags);
+                return putGeneric(object, key, value, propertyFlags, putFlags, cachedShape, oldProperty);
             }
             for (MutateCacheData c = start; c != null; c = c.next) {
                 if (!c.isValid()) {
@@ -1403,7 +1406,7 @@ protected boolean putLongImpl(DynamicObject object, Shape cachedShape, Object ke
             Shape oldShape = cachedShape;
             MutateCacheData start = cache;
             if (start == MutateCacheData.GENERIC) {
-                return putUncached(object, key, value, propertyFlags, putFlags);
+                return putGeneric(object, key, value, propertyFlags, putFlags, cachedShape, oldProperty);
             }
             for (MutateCacheData c = start; c != null; c = c.next) {
                 if (!c.isValid()) {
@@ -1452,7 +1455,7 @@ protected boolean putDoubleImpl(DynamicObject object, Shape cachedShape, Object
             Shape oldShape = cachedShape;
             MutateCacheData start = cache;
             if (start == MutateCacheData.GENERIC) {
-                return putUncached(object, key, value, propertyFlags, putFlags);
+                return putGeneric(object, key, value, propertyFlags, putFlags, cachedShape, oldProperty);
             }
             for (MutateCacheData c = start; c != null; c = c.next) {
                 if (!c.isValid()) {

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

@@ -122,10 +122,10 @@ public final class Shape {
 
     private final int objectArraySize;
     private final int objectArrayCapacity;
-    private final int objectFieldSize;
-    private final int primitiveFieldSize;
     private final int primitiveArraySize;
     private final int primitiveArrayCapacity;
+    private final short objectFieldSize;
+    private final short primitiveFieldSize;
 
     private final int depth;
     private final int propertyCount;
@@ -1230,10 +1230,11 @@ private Shape(LayoutImpl layout, Shape parent, Object objectType, Object sharedD
 
         this.objectArraySize = objectArraySize;
         this.objectArrayCapacity = capacityFromSize(objectArraySize);
-        this.objectFieldSize = objectFieldSize;
-        this.primitiveFieldSize = primitiveFieldSize;
         this.primitiveArraySize = primitiveArraySize;
         this.primitiveArrayCapacity = capacityFromSize(primitiveArraySize);
+        assert objectFieldSize <= ExtLocations.MAX_DYNAMIC_FIELDS && primitiveFieldSize <= ExtLocations.MAX_DYNAMIC_FIELDS;
+        this.objectFieldSize = (short) objectFieldSize;
+        this.primitiveFieldSize = (short) primitiveFieldSize;
 
         if (parent != null) {
             this.propertyCount = makePropertyCount(parent, propertyMap, transitionFromParent);

truffle/src/com.oracle.truffle.api.strings/src/com/oracle/truffle/api/strings/TStringInternalNodes.java

@@ -1354,7 +1354,7 @@ abstract static class IndexOfCodePointSetNode extends Node {
         final boolean isUTF16Or32;
 
         IndexOfCodePointSetNode(IndexOfCodePointSet.IndexOfNode[] indexOfNodes, Encoding encoding) {
-            this.indexOfNodes = insert(indexOfNodes);
+            this.indexOfNodes = indexOfNodes;
             this.encoding = encoding;
             this.isUTF16Or32 = isUTF16Or32(encoding);
         }