Initialize local slots with nil.

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Author: smarr

src/som/compiler/MethodGenerationContext.java

@@ -103,14 +103,19 @@ public Invokable assemblePrimitive(final Universe universe) {
 
   public Method assemble(final Universe universe, final SequenceNode expressions) {
     FrameSlot[] argSlots = new FrameSlot[arguments.size()];
+    FrameSlot[] localSlots = new FrameSlot[locals.size()];
 
     for (int i = 0; i < arguments.size(); i++) {
       argSlots[i] = frameDescriptor.findFrameSlot(arguments.get(i));
     }
 
+    for (int i = 0; i < locals.size(); i++) {
+      localSlots[i] = frameDescriptor.findFrameSlot(locals.get(i));
+    }
+
     som.interpreter.nodes.Method truffleMethod =
         new som.interpreter.nodes.Method(expressions,
-            selfSlot, argSlots, nonLocalReturnMarker);
+            selfSlot, argSlots, localSlots, nonLocalReturnMarker, universe);
 
     Method meth = universe.newMethod(signature, truffleMethod, frameDescriptor);
 

src/som/interpreter/nodes/Method.java

@@ -21,6 +21,8 @@
  */
 package som.interpreter.nodes;
 
+import som.vm.Universe;
+
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
@@ -35,17 +37,23 @@ public class Method extends RootNode {
   @Child private final SequenceNode expressions;
 
   private final FrameSlot   selfSlot;
-  @CompilationFinal private final FrameSlot[] argumentSlots;
+  @CompilationFinal private final FrameSlot[]  argumentSlots;
+  @CompilationFinal private final FrameSlot[] temporarySlots;
   private final FrameSlot   nonLocalReturnMarker;
+  private final Universe    universe;
 
   public Method(final SequenceNode expressions,
                   final FrameSlot selfSlot,
                   final FrameSlot[] argumentSlots,
-                  final FrameSlot nonLocalReturnMarker) {
+                  final FrameSlot[] temporarySlots,
+                  final FrameSlot nonLocalReturnMarker,
+                  final Universe  universe) {
     this.expressions   = expressions;
     this.selfSlot      = selfSlot;
     this.argumentSlots = argumentSlots;
+    this.temporarySlots = temporarySlots;
     this.nonLocalReturnMarker = nonLocalReturnMarker;
+    this.universe      = universe;
   }
 
   @Override
@@ -81,6 +89,10 @@ private FrameOnStackMarker initializeFrame(MaterializedFrame frame) {
       FrameOnStackMarker marker = new FrameOnStackMarker();
       frame.setObject(nonLocalReturnMarker, marker);
 
+      for (int i = 0; i < temporarySlots.length; i++) {
+        frame.setObject(temporarySlots[i], universe.nilObject);
+      }
+
       return marker;
     } catch (FrameSlotTypeException e) {
      throw new RuntimeException("Should not happen, since we only have one type currently!");