Add missing check for negative value to int.__lshift__

Author: otethal

graalpython/com.oracle.graal.python.test/src/tests/test_int.py

@@ -109,6 +109,37 @@ def test_bigint():
     assert isinstance(i, int)
     assert i == BIG_NUMBER
 
+def test_bigint_lshift():
+    INT_SHIFT = -2147483648
+    LONG_SHIFT = -2147483649
+
+    assert_raises(ValueError, lambda: 0 << INT_SHIFT)
+    assert_raises(ValueError, lambda: -1 << INT_SHIFT)
+    assert_raises(ValueError, lambda: ((1 << 32) - 1) << INT_SHIFT)
+    assert_raises(ValueError, lambda: ((1 << 64) - 1) << INT_SHIFT)
+    assert_raises(ValueError, lambda: BIG_NUMBER << INT_SHIFT)
+
+    assert_raises(ValueError, lambda: 0 << LONG_SHIFT)
+    assert_raises(ValueError, lambda: -1 << LONG_SHIFT)
+    assert_raises(ValueError, lambda: 2147483647 << LONG_SHIFT)
+    assert_raises(ValueError, lambda: 9223372036854775807 << LONG_SHIFT)
+    assert_raises(ValueError, lambda: BIG_NUMBER << LONG_SHIFT)
+
+def test_bigint_rshift():
+    INT_SHIFT = -2147483648
+    LONG_SHIFT = -2147483649
+
+    assert_raises(ValueError, lambda: 0 >> INT_SHIFT)
+    assert_raises(ValueError, lambda: -1 >> INT_SHIFT)
+    assert_raises(ValueError, lambda: ((1 >> 32) - 1) >> INT_SHIFT)
+    assert_raises(ValueError, lambda: ((1 >> 64) - 1) >> INT_SHIFT)
+    assert_raises(ValueError, lambda: BIG_NUMBER >> INT_SHIFT)
+
+    assert_raises(ValueError, lambda: 0 >> LONG_SHIFT)
+    assert_raises(ValueError, lambda: -1 >> LONG_SHIFT)
+    assert_raises(ValueError, lambda: 2147483647 >> LONG_SHIFT)
+    assert_raises(ValueError, lambda: 9223372036854775807 >> LONG_SHIFT)
+    assert_raises(ValueError, lambda: BIG_NUMBER >> LONG_SHIFT)
 
 def test_boolean2int():
     assert int(True) == 1
@@ -425,10 +456,10 @@ def test_create_int_from_float():
         assert True
     else:
         assert False, "expected ValueError"
-        
+
     class FloatSub(float):
         pass
-    
+
     try:
         int(FloatSub(float('nan')))
     except ValueError:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -1852,9 +1852,10 @@ static PInt doGuardedBiI(Node inliningTarget, BigInteger left, int right, PRaise
         static PInt doPiL(PInt left, long right,
                         @Bind("this") Node inliningTarget,
                         @Shared @Cached PRaiseNode raiseNode) {
+            raiseNegativeShiftCount(inliningTarget, right < 0, raiseNode);
             int rightI = (int) right;
             if (rightI == right) {
-                return doPiI(left, rightI, inliningTarget, raiseNode);
+                return doGuardedBiI(inliningTarget, left.getValue(), rightI, raiseNode);
             } else {
                 throw raiseNode.raise(inliningTarget, PythonErrorType.OverflowError);
             }