[Truffle] Handle other cases for bit operations on Bignums.

jruby · Oct 2, 2016 · 9851022 · 9851022
1 parent cd637b0
commit 9851022
Showing 1 changed file with 15 additions and 2 deletions.
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
@@ -436,8 +436,8 @@ public Object bitAnd(DynamicObject a, DynamicObject b) {
             return fixnumOrBignum(Layouts.BIGNUM.getValue(a).and(Layouts.BIGNUM.getValue(b)));
         }
 
-        @Specialization(guards = "!isRubyBignum(b)")
-        public Object bitAnd(VirtualFrame frame, DynamicObject a, DynamicObject b,
+        @Specialization(guards = { "!isInteger(b)", "!isLong(b)", "!isRubyBignum(b)" })
+        public Object bitAnd(VirtualFrame frame, DynamicObject a, Object b,
                              @Cached("new()") SnippetNode snippetNode) {
             return snippetNode.execute(frame, "self & bit_coerce(b)[1]", "b", b);
         }
@@ -455,6 +455,12 @@ public Object bitOr(DynamicObject a, long b) {
         public Object bitOr(DynamicObject a, DynamicObject b) {
             return fixnumOrBignum(Layouts.BIGNUM.getValue(a).or(Layouts.BIGNUM.getValue(b)));
         }
+
+        @Specialization(guards = { "!isInteger(b)", "!isLong(b)", "!isRubyBignum(b)" })
+        public Object bitAnd(VirtualFrame frame, DynamicObject a, Object b,
+                @Cached("new()") SnippetNode snippetNode) {
+            return snippetNode.execute(frame, "self | bit_coerce(b)[1]", "b", b);
+        }
     }
 
     @CoreMethod(names = "^", required = 1)
@@ -469,6 +475,13 @@ public Object bitXOr(DynamicObject a, long b) {
         public Object bitXOr(DynamicObject a, DynamicObject b) {
             return fixnumOrBignum(Layouts.BIGNUM.getValue(a).xor(Layouts.BIGNUM.getValue(b)));
         }
+
+        @Specialization(guards = { "!isInteger(b)", "!isLong(b)", "!isRubyBignum(b)" })
+        public Object bitAnd(VirtualFrame frame, DynamicObject a, Object b,
+                @Cached("new()") SnippetNode snippetNode) {
+            return snippetNode.execute(frame, "self ^ bit_coerce(b)[1]", "b", b);
+        }
+
     }
 
     @CoreMethod(names = "<<", required = 1, lowerFixnum = 1)