Merge a6eb62e into ac34115

smarr · Dec 1, 2016 · 89072ab · 89072ab
2 parents ac34115 + a6eb62e
commit 89072ab
Show file tree

Hide file tree

Showing 69 changed files with 344 additions and 412 deletions.
diff --git a/libs/truffle b/libs/truffle
diff --git a/src/som/compiler/MixinBuilder.java b/src/som/compiler/MixinBuilder.java
@@ -46,6 +46,7 @@
 import som.interpreter.nodes.ExpressionNode;
 import som.interpreter.nodes.IsValueCheckNode;
 import som.interpreter.nodes.dispatch.Dispatchable;
+import som.interpreter.objectstorage.InitializerFieldWrite;
 import som.primitives.NewObjectPrimNodeGen;
 import som.vm.Symbols;
 import som.vmobjects.SInvokable;
@@ -313,11 +314,14 @@ public void addSlot(final SSymbol name, final AccessModifier acccessModifier,
 
     if (init != null) {
       ExpressionNode self = initializer.getSelfRead(source);
-      slotAndInitExprs.add(slot.getInitializerWriteNode(self, init, source));
+      InitializerFieldWrite write = slot.getInitializerWriteNode(self, init, source);
+      write.markAsStatement();
+      slotAndInitExprs.add(write);
     }
   }
 
   public void addInitializerExpression(final ExpressionNode expression) {
+    expression.markAsStatement();
     slotAndInitExprs.add(expression);
   }
 

diff --git a/src/som/interpreter/Method.java b/src/som/interpreter/Method.java
@@ -128,7 +128,6 @@ public boolean isBlock() {
   public SourceSection getRootNodeSource() {
     ExpressionNode root = SOMNode.unwrapIfNecessary(expressionOrSequence);
     assert root.isMarkedAsRootExpression();
-    assert root.assertIsStatement();
 
     return root.getSourceSection();
   }

diff --git a/src/som/interpreter/SNodeFactory.java b/src/som/interpreter/SNodeFactory.java
@@ -99,6 +99,10 @@ public static LocalVariableWriteNode createLocalVariableWrite(
 
   public static ExpressionNode createSequence(
       final List<ExpressionNode> expressions, final SourceSection source) {
+    for (ExpressionNode statement : expressions) {
+      statement.markAsStatement();
+    }
+
     if (expressions.size() == 0) {
       return new NilLiteralNode(source);
     } else if (expressions.size() == 1) {

diff --git a/src/som/interpreter/actors/EventualSendNode.java b/src/som/interpreter/actors/EventualSendNode.java
@@ -9,7 +9,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Instrumentable;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
@@ -292,8 +291,6 @@ public final Object toNearRefWithoutResultPromise(final Object[] args) {
     protected boolean isTaggedWith(final Class<?> tag) {
       if (tag == EventualMessageSend.class) {
         return true;
-      } else if (tag == StatementTag.class) {
-        return true;
       }
       return super.isTaggedWith(tag);
     }

diff --git a/src/som/interpreter/actors/ReceivedRootNode.java b/src/som/interpreter/actors/ReceivedRootNode.java
@@ -4,7 +4,6 @@
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -76,13 +75,5 @@ public Object executeEvaluated(final VirtualFrame frame, final Object receiver,
     public Object executeGeneric(final VirtualFrame frame) {
       return null;
     }
-
-    @Override
-    protected boolean isTaggedWithIgnoringEagerness(final Class<?> tag) {
-      if (tag == StatementTag.class) {
-        return isMarkedAsRootExpression();
-      }
-      return super.isTaggedWithIgnoringEagerness(tag);
-    }
   }
 }
diff --git a/src/som/interpreter/nodes/ArgumentReadNode.java b/src/som/interpreter/nodes/ArgumentReadNode.java
@@ -2,7 +2,6 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Instrumentable;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -56,8 +55,6 @@ protected boolean isTaggedWith(final Class<?> tag) {
         return true;
       } else if (tag == LocalArgRead.class) {
         return true;
-      } else if (tag == StatementTag.class) {
-        return isMarkedAsRootExpression();
       } else {
         return super.isTaggedWith(tag);
       }
@@ -167,8 +164,6 @@ protected boolean isTaggedWith(final Class<?> tag) {
         return true;
       } else if (tag == LocalArgRead.class) {
         return true;
-      } else if (tag == StatementTag.class) {
-        return isMarkedAsRootExpression();
       } else {
         return super.isTaggedWith(tag);
       }

diff --git a/src/som/interpreter/nodes/ExpressionNode.java b/src/som/interpreter/nodes/ExpressionNode.java
@@ -73,6 +73,8 @@ public boolean assertIsStatement() {
 
   public void markAsVirtualInvokeReceiver()  { throw new UnsupportedOperationException(); }
 
+  public void markAsStatement()  { throw new UnsupportedOperationException(); }
+
   public abstract Object executeGeneric(final VirtualFrame frame);
 
   @Override

diff --git a/src/som/interpreter/nodes/InternalObjectArrayNode.java b/src/som/interpreter/nodes/InternalObjectArrayNode.java
@@ -1,7 +1,6 @@
 package som.interpreter.nodes;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
@@ -33,12 +32,4 @@ public Object[] executeObjectArray(final VirtualFrame frame) {
   public Object executeGeneric(final VirtualFrame frame) {
     return executeObjectArray(frame);
   }
-
-  @Override
-  protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return false;
-    }
-    return super.isTaggedWith(tag);
-  }
 }
diff --git a/src/som/interpreter/nodes/IsValueCheckNode.java b/src/som/interpreter/nodes/IsValueCheckNode.java
@@ -1,7 +1,6 @@
 package som.interpreter.nodes;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.instrumentation.InstrumentableFactory.WrapperNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
@@ -142,12 +141,4 @@ private boolean allFieldsContainValues(final SImmutableObject rcvr) {
   public Object executeGeneric(final VirtualFrame frame) {
     return executeEvaluated(frame, self.executeGeneric(frame));
   }
-
-  @Override
-  protected final boolean isTaggedWithIgnoringEagerness(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return false;
-    }
-    return super.isTaggedWithIgnoringEagerness(tag);
-  }
 }
diff --git a/src/som/interpreter/nodes/LocalVariableNode.java b/src/som/interpreter/nodes/LocalVariableNode.java
@@ -7,7 +7,6 @@
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.source.SourceSection;
 
 import som.compiler.Variable.Local;
@@ -55,8 +54,6 @@ public final void replaceWithIndependentCopyForInlining(final SplitterForLexical
   protected boolean isTaggedWith(final Class<?> tag) {
     if (tag == LocalVariableTag.class) {
       return true;
-    } else if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
     } else {
       return super.isTaggedWith(tag);
     }

diff --git a/src/som/interpreter/nodes/MessageSendNode.java b/src/som/interpreter/nodes/MessageSendNode.java
@@ -7,7 +7,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Instrumentable;
 import com.oracle.truffle.api.instrumentation.StandardTags.CallTag;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
@@ -81,8 +80,6 @@ protected AbstractMessageSendNode(final SourceSection source) {
     protected boolean isTaggedWith(final Class<?> tag) {
       if (tag == CallTag.class) {
         return true;
-      } else if (tag == StatementTag.class) {
-        return true;
       }
       return super.isTaggedWith(tag);
     }

diff --git a/src/som/interpreter/nodes/NonLocalVariableNode.java b/src/som/interpreter/nodes/NonLocalVariableNode.java
@@ -8,7 +8,6 @@
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.source.SourceSection;
 
 import som.interpreter.InlinerAdaptToEmbeddedOuterContext;
@@ -45,8 +44,6 @@ public final void replaceWithCopyAdaptedToEmbeddedOuterContext(
   protected boolean isTaggedWith(final Class<?> tag) {
     if (tag == LocalVariableTag.class) {
       return true;
-    } else if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
     } else {
       return super.isTaggedWith(tag);
     }

diff --git a/src/som/interpreter/nodes/OuterObjectRead.java b/src/som/interpreter/nodes/OuterObjectRead.java
@@ -6,7 +6,6 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
@@ -210,12 +209,4 @@ public SFarReference doFarReferenceDirect(final SFarReference receiver) {
 
   @Specialization(guards = "contextLevel == 0")
   public SBlock doSBlockDirect(final SBlock receiver) { return receiver; }
-
-  @Override
-  protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
-    }
-    return super.isTaggedWith(tag);
-  }
 }
diff --git a/src/som/interpreter/nodes/ResolvingImplicitReceiverSend.java b/src/som/interpreter/nodes/ResolvingImplicitReceiverSend.java
@@ -3,7 +3,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Instrumentable;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.source.SourceSection;
 
 import som.compiler.MixinBuilder.MixinDefinitionId;
@@ -93,14 +92,6 @@ protected PreevaluatedExpression specialize(final Object[] args) {
     return replacedBy;
   }
 
-  @Override
-  protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
-    }
-    return super.isTaggedWith(tag);
-  }
-
   @Override
   public String toString() {
     return "ImplicitSend(" + selector.toString() + ")";

diff --git a/src/som/interpreter/nodes/SequenceNode.java b/src/som/interpreter/nodes/SequenceNode.java
@@ -22,7 +22,6 @@
 package som.interpreter.nodes;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
@@ -67,14 +66,6 @@ public boolean isResultUsed(final ExpressionNode child) {
     return false;
   }
 
-  @Override
-  protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
-    }
-    return super.isTaggedWith(tag);
-  }
-
   @Override
   public String toString() {
     return "SeqNode[" + getSourceSection() + "]";

diff --git a/src/som/interpreter/nodes/UninitializedVariableNode.java b/src/som/interpreter/nodes/UninitializedVariableNode.java
@@ -4,7 +4,6 @@
 
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.source.SourceSection;
 
 import som.compiler.Variable.Local;
@@ -67,8 +66,6 @@ public UninitializedVariableReadNode(final UninitializedVariableReadNode node,
     protected boolean isTaggedWith(final Class<?> tag) {
       if (tag == LocalVarRead.class) {
         return true;
-      } else if (tag == StatementTag.class) {
-        return isMarkedAsRootExpression();
       } else {
         return super.isTaggedWith(tag);
       }
@@ -152,8 +149,6 @@ public UninitializedVariableWriteNode(final UninitializedVariableWriteNode node,
     protected boolean isTaggedWith(final Class<?> tag) {
       if (tag == LocalVarWrite.class) {
         return true;
-      } else if (tag == StatementTag.class) {
-        return isMarkedAsRootExpression();
       } else {
         return super.isTaggedWith(tag);
       }

diff --git a/src/som/interpreter/nodes/literals/LiteralNode.java b/src/som/interpreter/nodes/literals/LiteralNode.java
@@ -23,7 +23,6 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.Instrumentable;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
@@ -66,8 +65,6 @@ public ExpressionNode inline(final MethodBuilder builder,
   protected boolean isTaggedWith(final Class<?> tag) {
     if (tag == LiteralTag.class) {
       return true;
-    } else if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
     } else {
       return super.isTaggedWith(tag);
     }

diff --git a/src/som/interpreter/nodes/nary/EagerBinaryPrimitiveNode.java b/src/som/interpreter/nodes/nary/EagerBinaryPrimitiveNode.java
@@ -3,7 +3,6 @@
 import com.oracle.truffle.api.dsl.UnsupportedSpecializationException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableFactory.WrapperNode;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -39,9 +38,6 @@ public EagerBinaryPrimitiveNode(final SourceSection source,
 
   @Override
   protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
-    }
     assert !(primitive instanceof WrapperNode);
     return primitive.isTaggedWithIgnoringEagerness(tag);
   }

diff --git a/src/som/interpreter/nodes/nary/EagerTernaryPrimitiveNode.java b/src/som/interpreter/nodes/nary/EagerTernaryPrimitiveNode.java
@@ -3,7 +3,6 @@
 import com.oracle.truffle.api.dsl.UnsupportedSpecializationException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableFactory.WrapperNode;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -44,9 +43,6 @@ public EagerTernaryPrimitiveNode(
 
   @Override
   protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
-    }
     assert !(primitive instanceof WrapperNode);
     return primitive.isTaggedWithIgnoringEagerness(tag);
   }

diff --git a/src/som/interpreter/nodes/nary/EagerUnaryPrimitiveNode.java b/src/som/interpreter/nodes/nary/EagerUnaryPrimitiveNode.java
@@ -3,7 +3,6 @@
 import com.oracle.truffle.api.dsl.UnsupportedSpecializationException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableFactory.WrapperNode;
-import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.SourceSection;
 
@@ -34,9 +33,6 @@ public EagerUnaryPrimitiveNode(final SourceSection source, final SSymbol selecto
 
   @Override
   protected boolean isTaggedWith(final Class<?> tag) {
-    if (tag == StatementTag.class) {
-      return isMarkedAsRootExpression();
-    }
     assert !(primitive instanceof WrapperNode);
     return primitive.isTaggedWithIgnoringEagerness(tag);
   }