jruby · Oct 31, 2014 · Oct 31, 2014
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FixnumLowerNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/FixnumLowerNode.java
@@ -16,6 +16,7 @@
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.control.PassthroughNode;
 import org.jruby.truffle.runtime.UndefinedPlaceholder;
+import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyBasicObject;
 import org.jruby.truffle.runtime.core.RubyFixnum;
 import org.jruby.truffle.runtime.core.RubyRange;
@@ -107,7 +108,8 @@ public Object execute(VirtualFrame frame) {
             return value;
         }
 
-        throw new UnsupportedOperationException(value.getClass().getName());
+        throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(
+                value, getContext().getCoreLibrary().getIntegerClass(), this));
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
@@ -1187,21 +1187,49 @@ public LeftShiftNode(LeftShiftNode prev) {
             fixnumOrBignum = prev.fixnumOrBignum;
         }
 
-        @Specialization
-        public Object leftShift(int a, int b) {
-            return leftShift((long) a, b);
+        @Specialization(guards = "canShiftIntoInt")
+        public int leftShift(int a, int b) {
+            if (b > 0) {
+                bAboveZeroProfile.enter();
+
+                return a << b;
+            } else {
+                bNotAboveZeroProfile.enter();
+                if (-b >= Integer.SIZE) {
+                    return 0;
+                } else {
+                    return a >> -b;
+                }
+            }
+        }
+
+        @Specialization(guards = "canShiftIntoLong")
+        public long leftShift(long a, int b) {
+            if (b > 0) {
+                bAboveZeroProfile.enter();
+
+                return a << b;
+            } else {
+                bNotAboveZeroProfile.enter();
+
+                if (-b >= Long.SIZE) {
+                    return 0;
+                } else {
+                    return a >> -b;
+                }
+            }
         }
 
         @Specialization
-        public Object leftShift(long a, int b) {
+        public Object leftShiftWithOverflow(long a, int b) {
             if (b > 0) {
                 bAboveZeroProfile.enter();
 
-                if (Long.SIZE - Long.numberOfLeadingZeros(a) + b > Long.SIZE - 1) {
+                if (canShiftIntoLong(a, b)) {
+                    return a << b;
+                } else {
                     useBignumProfile.enter();
                     return fixnumOrBignum.fixnumOrBignum(SlowPathBigInteger.shiftLeft(BigInteger.valueOf(a), b));
-                } else {
-                    return a << b;
                 }
             } else {
                 bNotAboveZeroProfile.enter();
@@ -1214,6 +1242,14 @@ public Object leftShift(long a, int b) {
             }
         }
 
+        static boolean canShiftIntoInt(int a, int b) {
+            return Integer.numberOfLeadingZeros(a) - b > 0;
+        }
+
+        static boolean canShiftIntoLong(long a, int b) {
+            return Long.numberOfLeadingZeros(a) - b > 0;
+        }
+
     }
 
     @CoreMethod(names = ">>", required = 1, lowerFixnumParameters = 0)

diff --git a/core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -485,6 +485,10 @@ public RubyException typeErrorCantConvertInto(String from, String to, Node curre
         return typeError(String.format("can't convert %s into %s", from, to), currentNode);
     }
 
+    public RubyException typeErrorCantConvertInto(Object from, RubyClass to, Node currentNode) {
+        return typeErrorCantConvertInto(box(from).getLogicalClass().getName(), to.getName(), currentNode);
+    }
+
     public RubyException typeErrorIsNotA(String value, String expectedType, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
         return typeError(String.format("%s is not a %s", value, expectedType), currentNode);

diff --git a/spec/truffle/tags/core/fixnum/bit_and_tags.txt b/spec/truffle/tags/core/fixnum/bit_and_tags.txt
@@ -1,3 +1,2 @@
 fails:Fixnum#& raises a TypeError when passed a Float
 fails:Fixnum#& raises a TypeError and does not call #to_int when defined on an object
-fails:Fixnum#& returns self bitwise AND a Bignum
diff --git a/spec/truffle/tags/core/fixnum/bit_or_tags.txt b/spec/truffle/tags/core/fixnum/bit_or_tags.txt
@@ -1,3 +1,2 @@
 fails:Fixnum#| raises a TypeError when passed a Float
 fails:Fixnum#| raises a TypeError and does not call #to_int when defined on an object
-fails:Fixnum#| returns self bitwise OR other
diff --git a/spec/truffle/tags/core/fixnum/bit_xor_tags.txt b/spec/truffle/tags/core/fixnum/bit_xor_tags.txt
@@ -1,4 +1,2 @@
-fails:Fixnum#^ returns self bitwise EXCLUSIVE OR other
-fails:Fixnum#^ returns self bitwise EXCLUSIVE OR a Bignum
 fails:Fixnum#^ raises a TypeError when passed a Float
 fails:Fixnum#^ raises a TypeError and does not call #to_int when defined on an object
diff --git a/spec/truffle/tags/core/fixnum/divmod_tags.txt b/spec/truffle/tags/core/fixnum/divmod_tags.txt
@@ -1,3 +1,2 @@
 fails:Fixnum#divmod returns an Array containing quotient and modulus obtained from dividing self by the given argument
 fails:Fixnum#divmod raises a TypeError when given a non-Integer
-fails:Fixnum#divmod raises a ZeroDivisionError when the given argument is 0 and a Float
diff --git a/spec/truffle/tags/core/fixnum/exponent_tags.txt b/spec/truffle/tags/core/fixnum/exponent_tags.txt
@@ -1,6 +1,4 @@
 fails:Fixnum#** returns self raised to the given power
-fails:Fixnum#** overflows the answer to a bignum transparantly
-fails:Fixnum#** raises negative numbers to the given power
 fails:Fixnum#** can raise 1 to a Bignum safely
 fails:Fixnum#** can raise -1 to a Bignum safely
 fails:Fixnum#** switches to a Float when the number is too big

diff --git a/spec/truffle/tags/core/fixnum/left_shift_tags.txt b/spec/truffle/tags/core/fixnum/left_shift_tags.txt
@@ -3,5 +3,3 @@ fails:Fixnum#<< with n << m returns a Bignum == fixnum_max() * 2 when fixnum_max
 fails:Fixnum#<< with n << m returns a Bignum == fixnum_min() * 2 when fixnum_min() << 1 and n < 0
 fails:Fixnum#<< with n << m calls #to_int to convert the argument to an Integer
 fails:Fixnum#<< with n << m raises a TypeError when #to_int does not return an Integer
-fails:Fixnum#<< with n << m raises a TypeError when passed nil
-fails:Fixnum#<< with n << m raises a TypeError when passed a String
diff --git a/spec/truffle/tags/core/fixnum/minus_tags.txt b/spec/truffle/tags/core/fixnum/minus_tags.txt
@@ -1,2 +1 @@
 fails:Fixnum#- raises a TypeError when given a non-Integer
-fails:Fixnum#- returns self minus the given Integer
diff --git a/spec/truffle/tags/core/fixnum/multiply_tags.txt b/spec/truffle/tags/core/fixnum/multiply_tags.txt
@@ -1,3 +1,2 @@
 fails:Fixnum#* raises a TypeError when given a non-Integer
 fails:Fixnum#* overflows to Bignum when the result does not fit in Fixnum
-fails:Fixnum#* returns self multiplied by the given Integer
diff --git a/spec/truffle/tags/core/fixnum/plus_tags.txt b/spec/truffle/tags/core/fixnum/plus_tags.txt
@@ -1,2 +1 @@
-fails:Fixnum#+ returns self plus the given Integer
 fails:Fixnum#+ raises a TypeError when given a non-Integer
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Fixnum#- raises a TypeError when given a non-Integer
		fails:Fixnum#- returns self minus the given Integer
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Fixnum#+ returns self plus the given Integer
		fails:Fixnum#+ raises a TypeError when given a non-Integer