Inline DynamicObjectLibraryImpl.updateShapeImpl()

Author: eregon

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

@@ -269,15 +269,10 @@ public static boolean updateShape(DynamicObject object,
         if (cachedShape.isValid()) {
             return false;
         } else {
-            return updateShapeImpl(object);
+            return ObsolescenceStrategy.singleton().updateShape(object);
         }
     }
 
-    @TruffleBoundary
-    static boolean updateShapeImpl(DynamicObject object) {
-        return ObsolescenceStrategy.singleton().updateShape(object);
-    }
-
     @ExportMessage
     public static boolean resetShape(DynamicObject object, Shape otherShape,
                     @Bind Node node,
@@ -314,7 +309,7 @@ protected static boolean putGeneric(DynamicObject object, Object key, Object val
     private static boolean putGenericSlowPath(DynamicObject object, Object key, Object value, int newPropertyFlags, int putFlags,
                     Shape initialShape, Property propertyOfInitialShape) {
         CompilerAsserts.neverPartOfCompilation();
-        updateShapeImpl(object);
+        ObsolescenceStrategy.singleton().updateShape(object);
         Shape oldShape;
         Property existingProperty;
         Shape newShape;
@@ -345,15 +340,15 @@ private static boolean putGenericSlowPath(DynamicObject object, Object key, Obje
                     property = newShape.getProperty(key);
                 }
             }
-        } while (updateShapeImpl(object));
+        } while (ObsolescenceStrategy.singleton().updateShape(object));
 
         assert object.getShape() == oldShape;
         Location location = property.getLocation();
         if (oldShape != newShape) {
             DynamicObjectSupport.grow(object, oldShape, newShape);
             location.setSafe(object, value, false, true);
             DynamicObjectSupport.setShapeWithStoreFence(object, newShape);
-            updateShapeImpl(object);
+            ObsolescenceStrategy.singleton().updateShape(object);
         } else {
             location.setSafe(object, value, false, false);
         }
@@ -732,7 +727,7 @@ public Property getProperty(DynamicObject object, Shape cachedShape, Object key)
         @TruffleBoundary
         @Override
         public boolean setPropertyFlags(DynamicObject object, Shape cachedShape, Object key, int propertyFlags) {
-            updateShapeImpl(object);
+            ObsolescenceStrategy.singleton().updateShape(object);
             Shape oldShape = object.getShape();
             Property existingProperty = oldShape.getProperty(key);
             if (existingProperty == null) {
@@ -742,7 +737,7 @@ public boolean setPropertyFlags(DynamicObject object, Shape cachedShape, Object
                 Shape newShape = changePropertyFlags(oldShape, existingProperty, propertyFlags);
                 if (newShape != oldShape) {
                     object.setShape(newShape);
-                    updateShapeImpl(object);
+                    ObsolescenceStrategy.singleton().updateShape(object);
                 }
             }
             return true;
@@ -1750,7 +1745,7 @@ protected final boolean isValid() {
 
         protected final void maybeUpdateShape(DynamicObject store) {
             if (newShapeValidAssumption == Assumption.NEVER_VALID) {
-                updateShapeImpl(store);
+                ObsolescenceStrategy.singleton().updateShape(store);
             }
         }
 

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

@@ -54,6 +54,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.Location.LocationVisitor;
 import com.oracle.truffle.api.object.Transition.ObjectFlagsTransition;
 import com.oracle.truffle.api.object.Transition.ObjectTypeTransition;
@@ -438,6 +439,7 @@ public String getMessage() {
     private ObsolescenceStrategy() {
     }
 
+    @TruffleBoundary
     boolean updateShape(DynamicObject object) {
         boolean changed = checkForObsoleteShapeAndMigrate(object);
         // shape should be valid now, but we cannot assert this due to a possible race