[GR-30944] Insert a store-store fence between setting the value and t…

…he shape. PullRequest: graal/8813
CAFxX · Apr 26, 2021 · ca82e5c · ca82e5c
2 parents 556391b + ba4dd5a
commit ca82e5c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
@@ -113,7 +113,7 @@ default void setInt(DynamicObject store, int value) throws FinalLocationExceptio
         default void setInt(DynamicObject store, int value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
             setInt(store, value, false);
-            ACCESS.setShape(store, newShape);
+            ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 
@@ -149,7 +149,7 @@ default void setLong(DynamicObject store, long value) throws FinalLocationExcept
         default void setLong(DynamicObject store, long value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
             setLong(store, value, false);
-            ACCESS.setShape(store, newShape);
+            ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 
@@ -185,7 +185,7 @@ default void setDouble(DynamicObject store, double value) throws FinalLocationEx
         default void setDouble(DynamicObject store, double value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
             setDouble(store, value, false);
-            ACCESS.setShape(store, newShape);
+            ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 
@@ -219,7 +219,7 @@ default void setBoolean(DynamicObject store, boolean value) throws FinalLocation
         default void setBoolean(DynamicObject store, boolean value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
             setBoolean(store, value, false);
-            ACCESS.setShape(store, newShape);
+            ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 

diff --git a/...src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java b/...src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
@@ -366,7 +366,7 @@ private static boolean putUncachedSlow(DynamicObject object, Object key, Object
             } catch (IncompatibleLocationException e) {
                 throw shouldNotHappen(e);
             }
-            ACCESS.setShape(object, newShape);
+            ACCESS.setShapeWithStoreFence(object, newShape);
             updateShapeImpl(object);
         } else {
             try {
@@ -1249,7 +1249,7 @@ protected boolean putImpl(DynamicObject object, Shape cachedShape, Object key, O
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1293,7 +1293,7 @@ protected boolean putIntImpl(DynamicObject object, Shape cachedShape, Object key
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1309,7 +1309,7 @@ protected boolean putIntImpl(DynamicObject object, Shape cachedShape, Object key
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1325,7 +1325,7 @@ protected boolean putIntImpl(DynamicObject object, Shape cachedShape, Object key
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1341,7 +1341,7 @@ protected boolean putIntImpl(DynamicObject object, Shape cachedShape, Object key
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1383,7 +1383,7 @@ protected boolean putLongImpl(DynamicObject object, Shape cachedShape, Object ke
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1400,7 +1400,7 @@ protected boolean putLongImpl(DynamicObject object, Shape cachedShape, Object ke
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1442,7 +1442,7 @@ protected boolean putDoubleImpl(DynamicObject object, Shape cachedShape, Object
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1459,7 +1459,7 @@ protected boolean putDoubleImpl(DynamicObject object, Shape cachedShape, Object
                                 throw shouldNotHappen(e);
                             }
                             if (newShape != oldShape) {
-                                ACCESS.setShape(object, newShape);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             }
                             c.maybeUpdateShape(object);
                             return true;

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java
@@ -46,6 +46,7 @@
 
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.TruffleOptions;
+import com.oracle.truffle.api.memory.MemoryFence;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.ObjectType;
@@ -171,6 +172,13 @@ protected abstract static class Support extends Access {
         protected Support() {
         }
 
+        public final void setShapeWithStoreFence(DynamicObject object, Shape shape) {
+            if (shape.isShared()) {
+                MemoryFence.storeStore();
+            }
+            super.setShape(object, shape);
+        }
+
         public final void grow(DynamicObject object, Shape thisShape, Shape otherShape) {
             DynamicObjectSupport.grow(object, thisShape, otherShape);
         }

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
@@ -98,7 +98,7 @@ public void set(DynamicObject store, Object value, Shape oldShape, Shape newShap
             } catch (IncompatibleLocationException ex) {
                 throw DynamicObjectLibraryImpl.shouldNotHappen(ex);
             }
-            LayoutImpl.ACCESS.setShape(store, newShape);
+            LayoutImpl.ACCESS.setShapeWithStoreFence(store, newShape);
         } else {
             throw incompatibleLocation();
         }