Merge 5a7d4a6 into 4f7ad41

build.xml

@@ -61,7 +61,7 @@
     <property name="jvmci.home"  location="${lib.dir}/jvmci${home.ext}" />
 
     <!-- <property name="lib.url" value="https://dl.bintray.com/smarr/SOM" /> -->
-    <property name="lib.url" value="http://stefan-marr.de/dev" />
+    <property name="lib.url" value="https://stefan-marr.de/dev" />
 
     <property name="mx.cmd" value="../../mx/mx" />
 
@@ -192,7 +192,7 @@
         </exec>
     </target>
 
-    <target name="jvmci-libs">
+    <target name="jvmci-libs" unless="skip.libs">
         <get src="https://github.com/graalvm/openjdk8-jvmci-builder/releases/download/${jvmci.version}/openjdk-8u${jdk8.version}-${jvmci.version}-${kernel}.tar.gz"
              usetimestamp="true"
              dest="${lib.dir}/jvmci.tar.gz" />
@@ -292,7 +292,7 @@
 
     <target name="jacoco-lib" description="Get JaCoCo dependency">
         <travis target="jacoco-lib" start="Get JaCoCo" />
-        <get src="http://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip"
+        <get src="https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip"
             usetimestamp="true"
             dest="${lib.dir}/jacoco-${jacoco.version}.zip" />
         <unzip src="${lib.dir}/jacoco-${jacoco.version}.zip" dest="${lib.dir}/jacoco"/>

core-lib/Kernel.ns

@@ -696,9 +696,9 @@ class Kernel vmMirror: vmMirror = Object <: Value (
   )
 
   public class Vector new: size = (
-  | private firstIdx ::= 1.
-    private lastIdx  ::= 1.
-    private storage  ::= Array new: size. |
+  | protected firstIdx ::= 1.
+    protected lastIdx  ::= 1.
+    protected storage  ::= Array new: size. |
   ) (
     (* Accessing *)
     public at: index = (

src/som/compiler/MethodBuilder.java

@@ -735,6 +735,27 @@ public void addMethodDefinitionSource(final SourceSection source) {
     definition.add(source);
   }
 
+  private String stripColonsAndSourceLocation(String str) {
+    int startOfSource = str.indexOf('@');
+    if (startOfSource > -1) {
+      str = str.substring(0, startOfSource);
+    }
+    return str.replace(":", "");
+  }
+
+  public void setBlockSignature(final SourceCoordinate coord) {
+    String outerMethodName = stripColonsAndSourceLocation(getOuter().getName());
+
+    int argSize = getNumberOfArguments();
+    String blockSig = "λ" + outerMethodName + "@" + coord.startLine + "@" + coord.startColumn;
+
+    for (int i = 1; i < argSize; i++) {
+      blockSig += ":";
+    }
+
+    setSignature(symbolFor(blockSig));
+  }
+
   @Override
   public String toString() {
     MixinBuilder mixin = getMixin();

src/som/compiler/Parser.java

@@ -1688,10 +1688,6 @@ private String character() throws ParseError {
     return s;
   }
 
-  private String stripColons(final String str) {
-    return str.replace(":", "");
-  }
-
   private ExpressionNode nestedBlock(final MethodBuilder builder)
       throws ProgramDefinitionError {
     SourceCoordinate coord = getCoordinate();
@@ -1703,16 +1699,7 @@ private ExpressionNode nestedBlock(final MethodBuilder builder)
       blockPattern(builder);
     }
 
-    String outerMethodName = stripColons(builder.getOuter().getName());
-
-    // generate Block signature
-    String blockSig = "λ" + outerMethodName + "@" + coord.startLine + "@" + coord.startColumn;
-    int argSize = builder.getNumberOfArguments();
-    for (int i = 1; i < argSize; i++) {
-      blockSig += ":";
-    }
-
-    builder.setSignature(symbolFor(blockSig));
+    builder.setBlockSignature(coord);
 
     ExpressionNode expressions = blockContents(builder);
 

src/som/interpreter/actors/ReceivedRootNode.java

@@ -28,7 +28,9 @@ public abstract class ReceivedRootNode extends RootNode {
   @Child protected AbstractPromiseResolutionNode resolve;
   @Child protected AbstractPromiseResolutionNode error;
 
-  @Child protected TraceMessageNode         msgTracer = TraceMessageNodeGen.create();
+  @Child protected TraceMessageNode msgTracer =
+      VmSettings.ACTOR_TRACING ? TraceMessageNodeGen.create() : null;
+
   @Child protected MessageSerializationNode serializer;
 
   private final VM            vm;

src/som/interpreter/nodes/ContextualNode.java

@@ -21,6 +21,7 @@
  */
 package som.interpreter.nodes;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.MaterializedFrame;
@@ -78,6 +79,7 @@ protected final MaterializedFrame determineContext(final Frame frame) {
     if (i > 0) {
       boolean doBuildChain = determineContext == null;
       if (doBuildChain) {
+        CompilerDirectives.transferToInterpreterAndInvalidate();
         determineContext = buildChain(self, i);
       }