Simplify putGeneric.

Author: woess

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

@@ -159,74 +159,53 @@ private static boolean assertLocationInRange(final Shape shape, final Location l
     }
 
     @TruffleBoundary
-    static boolean putGeneric(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags) {
-        Shape shape = object.getShape();
-        Property existingProperty = shape.getProperty(key);
-        return putGeneric(object, key, value, newPropertyFlags, putFlags, shape, existingProperty);
+    static boolean putGeneric(DynamicObject object, Object key, Object value, int newPropertyFlags, int mode) {
+        return putGeneric(object, key, value, newPropertyFlags, mode, null, null);
     }
 
     @TruffleBoundary
-    static boolean putGeneric(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags, Shape s, Property existingProperty) {
-        if (existingProperty == null) {
-            if (Flags.isPutIfPresent(putFlags)) {
-                return false;
-            }
-        } else {
-            if (Flags.isPutIfAbsent(putFlags)) {
-                return false;
-            } else if (!Flags.isUpdateFlags(putFlags) && existingProperty.getLocation().canStore(value)) {
-                existingProperty.getLocation().setSafe(object, value, false, false);
-                return true;
-            }
-        }
-        return putGenericSlowPath(object, key, value, newPropertyFlags, putFlags, s, existingProperty);
-    }
-
-    private static boolean putGenericSlowPath(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags,
-                    Shape initialShape, Property propertyOfInitialShape) {
+    static boolean putGeneric(DynamicObject object, Object key, Object value, int newPropertyFlags, int mode,
+                    Shape cachedShape, Property propertyOfCachedShape) {
         CompilerAsserts.neverPartOfCompilation();
         updateShape(object);
         Shape oldShape;
         Shape newShape;
         Property property;
         do {
             oldShape = object.getShape();
-            final Property existingProperty = reusePropertyLookup(key, initialShape, propertyOfInitialShape, oldShape);
+            final Property existingProperty = reusePropertyLookup(key, cachedShape, propertyOfCachedShape, oldShape);
             if (existingProperty == null) {
-                if (Flags.isPutIfPresent(putFlags)) {
+                if (Flags.isPutIfPresent(mode)) {
                     return false;
                 } else {
-                    newShape = defineProperty(oldShape, key, value, newPropertyFlags, existingProperty, putFlags);
+                    newShape = defineProperty(oldShape, key, value, newPropertyFlags, null, mode);
                     property = newShape.getProperty(key);
                 }
-            } else if (Flags.isPutIfAbsent(putFlags)) {
+            } else if (Flags.isPutIfAbsent(mode)) {
                 return false;
-            } else if (Flags.isUpdateFlags(putFlags) && newPropertyFlags != existingProperty.getFlags()) {
-                newShape = defineProperty(oldShape, key, value, newPropertyFlags, existingProperty, putFlags);
-                property = newShape.getProperty(key);
-            } else {
-                if (existingProperty.getLocation().canStore(value)) {
+            } else if (!Flags.isUpdateFlags(mode) || newPropertyFlags == existingProperty.getFlags()) {
+                if (existingProperty.getLocation().canStoreValue(value)) {
                     newShape = oldShape;
                     property = existingProperty;
                 } else {
-                    assert !Flags.isUpdateFlags(putFlags) || newPropertyFlags == existingProperty.getFlags();
-                    newShape = defineProperty(oldShape, key, value, existingProperty.getFlags(), existingProperty, putFlags);
+                    newShape = defineProperty(oldShape, key, value, existingProperty.getFlags(), existingProperty, mode);
                     property = newShape.getProperty(key);
                 }
+            } else {
+                newShape = defineProperty(oldShape, key, value, newPropertyFlags, existingProperty, mode);
+                property = newShape.getProperty(key);
             }
         } while (updateShape(object));
 
         assert object.getShape() == oldShape;
+        assert !Flags.isPutIfAbsent(mode) || oldShape != newShape;
+
         Location location = property.getLocation();
+        location.setInternal(object, value, false, oldShape, newShape);
+
         if (oldShape != newShape) {
-            DynamicObjectSupport.grow(object, oldShape, newShape);
-            location.setSafe(object, value, false, true);
             DynamicObjectSupport.setShapeWithStoreFence(object, newShape);
             updateShape(object);
-        } else if (Flags.isPutIfAbsent(putFlags)) {
-            return false;
-        } else {
-            location.setSafe(object, value, false, false);
         }
         return true;
     }