[Truffle] Cleanup RandomPrimitiveNodes.

jruby · May 25, 2015 · b791b87 · b791b87
1 parent 23055c8
commit b791b87
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RandomPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RandomPrimitiveNodes.java
@@ -9,9 +9,10 @@
  */
 package org.jruby.truffle.nodes.rubinius;
 
-import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
+
 import org.jruby.Ruby;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyNumeric;
@@ -20,7 +21,6 @@
 import org.jruby.truffle.nodes.core.BignumNodes;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
-import org.jruby.truffle.runtime.core.RubyBignum;
 
 import java.math.BigInteger;
 
@@ -66,13 +66,13 @@ public RandomizerRandIntPrimitiveNode(RubyContext context, SourceSection sourceS
         }
 
         @Specialization
-        public long randomizerRandInt(RubyBasicObject random, Integer limit) {
-            return RandomPrimitiveHelper.randomInt(getContext().getRuntime().getCurrentContext().getRuntime(), limit);
+        public long randomizerRandInt(RubyBasicObject random, int limit) {
+            return randomizerRandLong(random, (long) limit);
         }
 
         @Specialization
-        public long randomizerRandInt(RubyBasicObject random, Long limit) {
-            return RandomPrimitiveHelper.randomInt(getContext().getRuntime().getCurrentContext().getRuntime(), limit);
+        public long randomizerRandLong(RubyBasicObject random, long limit) {
+            return RandomPrimitiveHelper.randomInt(getContext().getRuntime(), limit);
         }
     }
 
@@ -83,36 +83,29 @@ public RandomizerGenSeedPrimitiveNode(RubyContext context, SourceSection sourceS
             super(context, sourceSection);
         }
 
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         @Specialization
         public RubyBasicObject randomizerGenSeed(RubyBasicObject random) {
-            BigInteger integer = RandomPrimitiveHelper.randomSeed(getContext().getRuntime().getCurrentContext().getRuntime());
+            BigInteger integer = RandomPrimitiveHelper.randomSeed(getContext().getRuntime());
             return BignumNodes.createRubyBignum(getContext().getCoreLibrary().getBignumClass(), integer);
         }
     }
 
     static class RandomPrimitiveHelper {
 
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         public static BigInteger randomSeed(Ruby context) {
             return RubyRandom.randomSeed(context).getBigIntegerValue();
         }
 
-        @CompilerDirectives.TruffleBoundary
+        @TruffleBoundary
         public static long randomInt(Ruby context, long limit) {
             RubyFixnum fixnum = context.newFixnum(limit);
             return generateRandomInt(context, fixnum);
         }
 
-        @CompilerDirectives.TruffleBoundary
-        public static long randomInt(Ruby context, int limit) {
-            RubyFixnum fixnum = context.newFixnum(limit);
-            return generateRandomInt(context, fixnum);
-        }
-
         public static long generateRandomInt(Ruby context, RubyFixnum limit) {
-            IRubyObject params[] = new IRubyObject[1];
-            params[0] = limit;
+            IRubyObject params[] = new IRubyObject[] { limit };
             RubyNumeric num = (RubyNumeric) RubyRandom.randCommon19(context.getCurrentContext(), null, params);
             return num.getLongValue();
         }