Set slot kind

Author: fniephaus

src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/StartContextRootNode.java

@@ -10,6 +10,8 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeInfo;
@@ -29,12 +31,14 @@
 import de.hpi.swa.trufflesqueak.nodes.interrupts.CheckForInterruptsQuickNode;
 import de.hpi.swa.trufflesqueak.shared.SqueakLanguageConfig;
 import de.hpi.swa.trufflesqueak.util.FrameAccess;
+import de.hpi.swa.trufflesqueak.util.MiscUtils;
 
 @NodeInfo(language = SqueakLanguageConfig.ID)
 public final class StartContextRootNode extends AbstractRootNode {
     @CompilationFinal private int initialPC;
     @CompilationFinal private int initialSP;
-    @CompilationFinal private int numArgs;
+    @CompilationFinal private byte numTempSlots;
+    @CompilationFinal private byte tempStackSlotStartIndex;
     @CompilationFinal private Assumption doesNotNeedThisContext;
 
     @Child private CheckForInterruptsQuickNode interruptHandlerNode;
@@ -76,7 +80,7 @@ public Object execute(final VirtualFrame frame) {
     private void ensureInitialized(final VirtualFrame frame) {
         if (doesNotNeedThisContext == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            numArgs = FrameAccess.getNumArguments(frame);
+            final int numArgs = FrameAccess.getNumArguments(frame);
             final CompiledCodeObject code = getCode();
             doesNotNeedThisContext = code.getDoesNotNeedThisContextAssumption();
             if (!FrameAccess.hasClosure(frame)) {
@@ -89,6 +93,8 @@ private void ensureInitialized(final VirtualFrame frame) {
                 initialSP = closure.getNumTemps();
                 assert numArgs == closure.getNumArgs() + closure.getNumCopied();
             }
+            numTempSlots = MiscUtils.toByteExact(initialSP - numArgs);
+            tempStackSlotStartIndex = MiscUtils.toByteExact(FrameAccess.toStackSlotIndex(frame, numArgs));
         }
     }
 
@@ -102,9 +108,11 @@ private void initializeFrame(final VirtualFrame frame) {
 
         // TODO: avoid nilling out of temp slots to allow slot specializations
         // Initialize remaining temporary variables with nil in newContext.
-        for (int i = 0; i < initialSP - numArgs; i++) {
-            final int stackSlotIndex = FrameAccess.toStackSlotIndex(frame, numArgs + i);
-            frame.setObject(stackSlotIndex, NilObject.SINGLETON);
+        final FrameDescriptor descriptor = frame.getFrameDescriptor();
+        for (int i = 0; i < numTempSlots; i++) {
+            final int slotIndex = tempStackSlotStartIndex + i;
+            descriptor.setSlotKind(slotIndex, FrameSlotKind.Object);
+            frame.setObject(slotIndex, NilObject.SINGLETON);
         }
     }
 

src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/util/MiscUtils.java

@@ -324,6 +324,11 @@ public static byte[] toBytes(final String value) {
         return value.getBytes();
     }
 
+    public static byte toByteExact(final int value) {
+        assert (byte) value == value;
+        return (byte) value;
+    }
+
     /** Similar to {@link Math#toIntExact(long)}, but uses an assertion. */
     public static int toIntExact(final long value) {
         assert (int) value == value;