Merge PR #389: Remember object slot being allocated, and use onSpinWa…

…it to resolve old todo
smarr · Oct 12, 2022 · 591172d · 591172d · rebenchdb · Oct 12, 2022
2 parents 17014c8 + b4ef8df
commit 591172d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/som/interpreter/nodes/dispatch/ClassSlotAccessNode.java b/src/som/interpreter/nodes/dispatch/ClassSlotAccessNode.java
@@ -2,16 +2,20 @@
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.InvalidAssumptionException;
 
 import som.compiler.MixinDefinition;
 import som.compiler.MixinDefinition.SlotDefinition;
 import som.interpreter.Invokable;
+import som.interpreter.SArguments;
 import som.interpreter.nodes.InstantiationNode.ClassInstantiationNode;
 import som.interpreter.nodes.InstantiationNodeFactory.ClassInstantiationNodeGen;
 import som.interpreter.objectstorage.ObjectTransitionSafepoint;
+import som.vm.VmSettings;
 import som.vm.constants.Nil;
 import som.vmobjects.SClass;
 import som.vmobjects.SObject;
@@ -30,7 +34,8 @@
 public final class ClassSlotAccessNode extends CachedSlotRead {
   private final MixinDefinition mixinDef;
   private final SlotDefinition  slotDef;
-  private final boolean         objectSlotIsAllocated;
+
+  @CompilationFinal private boolean objectSlotIsAllocated;
 
   @Child protected DirectCallNode         superclassAndMixinResolver;
   @Child protected ClassInstantiationNode instantiation;
@@ -70,6 +75,7 @@ public SClass read(final SObject rcvr) {
     if (!objectSlotIsAllocated) {
       CompilerDirectives.transferToInterpreterAndInvalidate();
       ObjectTransitionSafepoint.INSTANCE.ensureSlotAllocatedToAvoidDeadlock(rcvr, slotDef);
+      objectSlotIsAllocated = true;
     }
 
     synchronized (rcvr) {

diff --git a/src/som/vmobjects/SClass.java b/src/som/vmobjects/SClass.java
@@ -133,7 +133,7 @@ public ObjectLayout getLayoutForInstancesToUpdateObject() {
     // Class loading can take considerable time and might be problematic here.
     // But seems better than running into a stack overflow in other places.
     while (!layout.isValid()) {
-      // TODO(JDK9): add call to Thread.onSpinWait() once moving to JDK9 support
+      Thread.onSpinWait();
       layout = instanceClassGroup.getInstanceLayout();
     }