Merge PR #307: Update Truffle to > vm-19.1.1

smarr · Aug 5, 2019 · 03bebb1 · 03bebb1
2 parents 34e915f + f79b756
commit 03bebb1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -3,8 +3,8 @@
     xmlns:if="ant:if"
     xmlns:jacoco="antlib:org.jacoco.ant">
 
-    <property name="jvmci.version" value="jvmci-20-b04" />
-    <property name="jdk8.version"  value="212" />
+    <property name="jvmci.version" value="jvmci-19.2-b02" />
+    <property name="jdk8.version"  value="222" />
 
     <macrodef name="travis">
         <attribute name="target" />

diff --git a/libs/black-diamonds b/libs/black-diamonds
diff --git a/libs/mx b/libs/mx
diff --git a/libs/truffle b/libs/truffle
diff --git a/src/som/interpreter/Invokable.java b/src/som/interpreter/Invokable.java
@@ -35,6 +35,7 @@ public Invokable(final String name,
     this.uninitializedBody = uninitialized;
     this.isAtomic = isAtomic;
     this.sourceSection = sourceSection;
+    expressionOrSequence.markAsRootExpression();
   }
 
   @Override

diff --git a/src/som/interpreter/Method.java b/src/som/interpreter/Method.java
@@ -54,7 +54,6 @@ public Method(final String name, final SourceSection sourceSection,
     this.block = block;
     this.methodScope = methodScope;
     assert methodScope.isFinalized();
-    expressions.markAsRootExpression();
   }
 
   @Override