jruby · Dec 20, 2014 · Dec 20, 2014 · Dec 20, 2014 · Dec 20, 2014 · Dec 20, 2014
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
@@ -28,7 +28,7 @@ public static abstract class BignumCoreMethodNode extends CoreMethodNode {
 
         public BignumCoreMethodNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            fixnumOrBignum = new FixnumOrBignumNode();
+            fixnumOrBignum = new FixnumOrBignumNode(context);
         }
 
         public BignumCoreMethodNode(BignumCoreMethodNode prev) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.nodes.core;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.runtime.RubyContext;
@@ -19,9 +20,18 @@
 
 public class FixnumOrBignumNode extends Node {
 
+    public FixnumOrBignumNode(RubyContext context) {
+        this.context = context;
+    }
+
+    private final RubyContext context;
+
     private final BranchProfile lowerProfile = BranchProfile.create();
-    private final BranchProfile integerProfile = BranchProfile.create();
-    private final BranchProfile longProfile = BranchProfile.create();
+    private final BranchProfile integerFromBignumProfile = BranchProfile.create();
+    private final BranchProfile longFromBignumProfile = BranchProfile.create();
+
+    private final BranchProfile integerFromDoubleProfile = BranchProfile.create();
+    private final BranchProfile longFromDoubleProfile = BranchProfile.create();
 
     private final BranchProfile bignumProfile = BranchProfile.create();
     private final BranchProfile checkLongProfile = BranchProfile.create();
@@ -33,37 +43,38 @@ public Object fixnumOrBignum(RubyBignum value) {
             final long longValue = value.longValue();
 
             if (longValue >= Integer.MIN_VALUE && longValue <= Integer.MAX_VALUE) {
-                integerProfile.enter();
+                integerFromBignumProfile.enter();
                 return (int) longValue;
             } else {
-                longProfile.enter();
+                longFromBignumProfile.enter();
                 return longValue;
             }
         } else {
             return value;
         }
     }
 
-    public Object fixnumOrBignum(RubyContext context, double value) {
+    public Object fixnumOrBignum(double value) {
         if (value > Integer.MIN_VALUE && value < Integer.MAX_VALUE) {
-            // TODO(CS): reusing profiles might not be a good idea
-            integerProfile.enter();
-
+            integerFromDoubleProfile.enter();
             return (int) value;
         }
 
         checkLongProfile.enter();
 
         if (value > Long.MIN_VALUE && value < Long.MAX_VALUE) {
-            // TODO(CS): reusing profiles might not be a good idea
-            longProfile.enter();
-
+            longFromDoubleProfile.enter();
             return (long) value;
         }
 
         bignumProfile.enter();
 
-        return new RubyBignum(context.getCoreLibrary().getBignumClass(), new BigDecimal(value).toBigInteger());
+        return new RubyBignum(context.getCoreLibrary().getBignumClass(), doubleToBigInteger(value));
+    }
+
+    @CompilerDirectives.TruffleBoundary
+    private static BigInteger doubleToBigInteger(double value) {
+        return new BigDecimal(value).toBigInteger();
     }
 
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
@@ -563,7 +563,7 @@ public abstract static class RoundNode extends CoreMethodNode {
 
         public RoundNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            fixnumOrBignum = new FixnumOrBignumNode();
+            fixnumOrBignum = new FixnumOrBignumNode(context);
         }
 
         public RoundNode(RoundNode prev) {
@@ -576,10 +576,12 @@ public Object round(double n) {
             // Algorithm copied from JRuby - not shared as we want to branch profile it
 
             if (Double.isInfinite(n)) {
+                CompilerDirectives.transferToInterpreter();
                 throw new RaiseException(getContext().getCoreLibrary().floatDomainError("Infinity", this));
             }
 
             if (Double.isNaN(n)) {
+                CompilerDirectives.transferToInterpreter();
                 throw new RaiseException(getContext().getCoreLibrary().floatDomainError("NaN", this));
             }
 
@@ -603,7 +605,7 @@ public Object round(double n) {
                 }
             }
 
-            return fixnumOrBignum.fixnumOrBignum(getContext(), f);
+            return fixnumOrBignum.fixnumOrBignum(f);
         }
 
     }
@@ -615,7 +617,7 @@ public abstract static class ToINode extends CoreMethodNode {
 
         public ToINode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            fixnumOrBignum = new FixnumOrBignumNode();
+            fixnumOrBignum = new FixnumOrBignumNode(context);
         }
 
         public ToINode(ToINode prev) {
@@ -633,7 +635,7 @@ public Object toI(double value) {
                 throw new RaiseException(getContext().getCoreLibrary().floatDomainError("NaN", this));
             }
 
-            return fixnumOrBignum.fixnumOrBignum(getContext(), value);
+            return fixnumOrBignum.fixnumOrBignum(value);
         }
 
     }

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java
@@ -34,8 +34,8 @@ public class GeneralDivModNode extends Node {
     public GeneralDivModNode(RubyContext context) {
         assert context != null;
         this.context = context;
-        fixnumOrBignumQuotient = new FixnumOrBignumNode();
-        fixnumOrBignumRemainder = new FixnumOrBignumNode();
+        fixnumOrBignumQuotient = new FixnumOrBignumNode(context);
+        fixnumOrBignumRemainder = new FixnumOrBignumNode(context);
     }
 
     public RubyArray execute(int a, int b) {

diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -705,7 +705,7 @@ private void logScriptResolutionFailure(String path) {
     public static void checkGraalVersion() {
         if (Options.TRUFFLE_RUNTIME_VERSION_CHECK.load()) {
             final String graalVersion = System.getProperty("graal.version", "unknown");
-            final String expectedGraalVersion = "0.6";
+            final String expectedGraalVersion = "0.7-dev";
 
             if (graalVersion.equals("unknown")) {
                 return;

diff --git a/tool/build-graal-bundles.sh b/tool/build-graal-bundles.sh
@@ -52,16 +52,20 @@ function pack {
 
     tar -zxf $buildname || exit $?
     chmod -R +w graalvm-jdk1.8.0
+
     cp -r graalvm-jdk1.8.0 jruby-$version || exit $?
     rm -rf jruby-$version/graalvm-jdk1.8.0/src.zip jruby-$version/graalvm-jdk1.8.0/demo jruby-$version/graalvm-jdk1.8.0/include jruby-$version/graalvm-jdk1.8.0/sample || exit $?
     targetname=jruby-dist-$version+graal-$1-x86_64-bin.tar.gz
     tar -zcf $targetname jruby-$version || exit $?
     shasum -a 1 $targetname > $targetname.sha1 || exit $?
+
+    rm -rf jruby-master || exit $?
+
     cp -r jruby-$version jruby-master || exit $?
     targetname=jruby-dist-master+graal-$1-x86_64-bin.tar.gz
     tar -zcf $targetname jruby-master || exit $?
     shasum -a 1 $targetname > $targetname.sha1 || exit $?
 }
 
-pack "linux" "b132" "0.5"
-pack "macosx" "b132" "0.5"
+pack "linux" "b132" "0.6"
+pack "macosx" "b132" "0.6"