Merge PR #194: Update Truffle to state of 2017-11-09

smarr · Nov 22, 2017 · dedcc86 · dedcc86
2 parents 40d678c + b742d10
commit dedcc86
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/libs/mx b/libs/mx
diff --git a/libs/truffle b/libs/truffle
diff --git a/src/som/compiler/SourcecodeCompiler.java b/src/som/compiler/SourcecodeCompiler.java
@@ -46,8 +46,8 @@ public final SomLanguage getLanguage() {
   public MixinDefinition compileModule(final Source source,
       final StructuralProbe structuralProbe)
       throws ProgramDefinitionError {
-    Parser parser = new Parser(
-        source.getCode(), source.getLength(), source, structuralProbe, language);
+    Parser parser = new Parser(source.getCharacters().toString(), source.getLength(), source,
+        structuralProbe, language);
     return compile(parser, source);
   }
 

diff --git a/src/som/primitives/arithmetic/AdditionPrim.java b/src/som/primitives/arithmetic/AdditionPrim.java
@@ -3,7 +3,6 @@
 import java.math.BigInteger;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.ExactMath;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
@@ -19,7 +18,7 @@
 public abstract class AdditionPrim extends ArithmeticPrim {
   @Specialization(rewriteOn = ArithmeticException.class)
   public final long doLong(final long left, final long argument) {
-    return ExactMath.addExact(left, argument);
+    return Math.addExact(left, argument);
   }
 
   @Specialization

diff --git a/src/som/primitives/arithmetic/MultiplicationPrim.java b/src/som/primitives/arithmetic/MultiplicationPrim.java
@@ -3,7 +3,6 @@
 import java.math.BigInteger;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.ExactMath;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
@@ -17,7 +16,7 @@
 public abstract class MultiplicationPrim extends ArithmeticPrim {
   @Specialization(rewriteOn = ArithmeticException.class)
   public final long doLong(final long left, final long right) {
-    return ExactMath.multiplyExact(left, right);
+    return Math.multiplyExact(left, right);
   }
 
   @Specialization

diff --git a/src/som/primitives/arithmetic/SubtractionPrim.java b/src/som/primitives/arithmetic/SubtractionPrim.java
@@ -3,7 +3,6 @@
 import java.math.BigInteger;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.ExactMath;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
@@ -17,7 +16,7 @@
 public abstract class SubtractionPrim extends ArithmeticPrim {
   @Specialization(rewriteOn = ArithmeticException.class)
   public final long doLong(final long left, final long right) {
-    return ExactMath.subtractExact(left, right);
+    return Math.subtractExact(left, right);
   }
 
   @Specialization

diff --git a/src/tools/debugger/FrontendConnector.java b/src/tools/debugger/FrontendConnector.java
@@ -212,7 +212,7 @@ private static TaggedSourceCoordinate[] createSourceSections(final Source source
   private void sendSource(final Source source,
       final Map<Source, Map<SourceSection, Set<Class<? extends Tags>>>> loadedSourcesTags,
       final Set<RootNode> rootNodes) {
-    SourceData data = new SourceData(source.getCode(), source.getMimeType(),
+    SourceData data = new SourceData(source.getCharacters().toString(), source.getMimeType(),
         source.getName(), source.getURI().toString(),
         createSourceSections(source, loadedSourcesTags, instrumenter, rootNodes),
         SourceMessage.createMethodDefinitions(rootNodes));

diff --git a/src/tools/dym/JsonWriter.java b/src/tools/dym/JsonWriter.java
@@ -60,7 +60,7 @@ private <U> Map<U, String> createIdMap(final Set<U> set, final String idPrefix)
   private JSONObjectBuilder sourceToJson(final Source s, final String id) {
     JSONObjectBuilder builder = JSONHelper.object();
     builder.add("id", id);
-    builder.add("sourceText", s.getCode());
+    builder.add("sourceText", s.getCharacters().toString());
     builder.add("mimeType", s.getMimeType());
     builder.add("name", s.getName());
     builder.add("uri", s.getURI().toString());