[Truffle] Add Bignum#>> specialization and refactor

jruby · Apr 26, 2016 · 808c0a8 · 808c0a8 · eregon · Apr 26, 2016
1 parent 97a9221
commit 808c0a8
Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/spec/truffle/tags/core/bignum/element_reference_tags.txt b/spec/truffle/tags/core/bignum/element_reference_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java
@@ -450,6 +450,8 @@ public Object leftShift(DynamicObject a, int b) {
     @CoreMethod(names = ">>", required = 1, lowerFixnumParameters = 0)
     public abstract static class RightShiftNode extends BignumCoreMethodNode {
 
+        public abstract Object executeRightShift(VirtualFrame frame, DynamicObject a, Object b);
+
         private final BranchProfile bLessThanZero = BranchProfile.create();
 
         @Specialization
@@ -462,22 +464,26 @@ public Object rightShift(DynamicObject a, int b) {
             }
         }
 
+        @Specialization
+        public Object rightShift(DynamicObject a, long b) {
+            if (b > Integer.MAX_VALUE || b < Integer.MIN_VALUE) {
+                return 0;
+            } else {
+                return rightShift(a, (int) b);
+            }
+        }
+
         @Specialization(guards = "isRubyBignum(b)")
         public int rightShift(DynamicObject a, DynamicObject b) {
             return 0;
         }
 
-        @Specialization(guards = {"!isRubyBignum(b)", "!isInteger(b)"})
+        @Specialization(guards = {"!isRubyBignum(b)", "!isInteger(b)", "!isLong(b)"})
         public Object rightShift(VirtualFrame frame,
                                  DynamicObject a,
                                  Object b,
                                  @Cached("new()") SnippetNode snippetNode) {
-            int bInt = (int) snippetNode.execute(frame, "Rubinius::Type.coerce_to(y, Integer, :to_int)", "y", b);
-            if (bInt >= 0) {
-                return fixnumOrBignum(Layouts.BIGNUM.getValue(a).shiftRight(bInt));
-            } else {
-                return fixnumOrBignum(Layouts.BIGNUM.getValue(a).shiftLeft(-bInt));
-            }
+            return executeRightShift(frame, a, snippetNode.execute(frame, "Rubinius::Type.coerce_to(y, Integer, :to_int)", "y", b));
         }