[GR-69530] Fix integer division with large negative divisors

msimacek · msimacek · commit 6d4acbbe508e · 2025-09-08T11:58:05.000Z
PullRequest: graalpython/3992
diff --git a/.gitignore b/.gitignore
@@ -96,3 +96,4 @@ pom-mx.xml
 !graalpython/com.oracle.graal.python.test/src/tests/standalone/gradle/gradle-test-project/gradle/wrapper/gradle-wrapper.jar
 /*-venv/
 .aider*
+*.iprof.gz
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_int.py b/graalpython/com.oracle.graal.python.test/src/tests/test_int.py
@@ -150,6 +150,10 @@ def test_bigint_mul():
     assert 99999937497465632974931 * 1223432423545234234123123 == 122343165886896325043539375228725106116626429513
     assert 99999937497465632974931 * (2**100) == 126764980791447734004805377032945185921379990352429056
 
+def test_floordiv():
+    assert 0 // (-92233720368547394651) == 0
+    assert -234 // (-92233720368547394651) == 0
+    assert 234 // (-92233720368547394651) == -1
 
 def test_pow():
     assert 2 ** 10 == 1024
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -41,8 +41,8 @@
 package com.oracle.graal.python.builtins.objects.ints;
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.DeprecationWarning;
-import static com.oracle.graal.python.nodes.ErrorMessages.BITWISE_INVERSION_OF_THE_UNDERLYING_INT;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_INT;
+import static com.oracle.graal.python.nodes.ErrorMessages.BITWISE_INVERSION_OF_THE_UNDERLYING_INT;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___CEIL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___FLOOR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.J___FORMAT__;
@@ -65,10 +65,10 @@
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;
+import com.oracle.graal.python.annotations.Builtin;
 import com.oracle.graal.python.annotations.Slot;
 import com.oracle.graal.python.annotations.Slot.SlotKind;
 import com.oracle.graal.python.annotations.Slot.SlotSignature;
-import com.oracle.graal.python.annotations.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
@@ -813,7 +813,7 @@ static Object doIPi(int left, PInt right,
                 }
                 return Math.floorDiv(left, rightValue);
             } catch (OverflowException e) {
-                return left < 0 == right.isNegative() ? 0 : -1;
+                return left == 0 || left < 0 == right.isNegative() ? 0 : -1;
             }
         }
 
@@ -831,7 +831,7 @@ static Object doLPi(long left, PInt right,
                 }
                 return Math.floorDiv(left, rightValue);
             } catch (OverflowException e) {
-                return left < 0 == right.isNegative() ? 0 : -1;
+                return left == 0 || left < 0 == right.isNegative() ? 0 : -1;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@`
`41`	`41`	`package com.oracle.graal.python.builtins.objects.ints;`
`42`	`42`
`43`	`43`	`import static com.oracle.graal.python.builtins.PythonBuiltinClassType.DeprecationWarning;`
`44`		`-import static com.oracle.graal.python.nodes.ErrorMessages.BITWISE_INVERSION_OF_THE_UNDERLYING_INT;`
`45`	`44`	`import static com.oracle.graal.python.nodes.BuiltinNames.J_INT;`
	`45`	`+import static com.oracle.graal.python.nodes.ErrorMessages.BITWISE_INVERSION_OF_THE_UNDERLYING_INT;`
`46`	`46`	`import static com.oracle.graal.python.nodes.SpecialMethodNames.J___CEIL__;`
`47`	`47`	`import static com.oracle.graal.python.nodes.SpecialMethodNames.J___FLOOR__;`
`48`	`48`	`import static com.oracle.graal.python.nodes.SpecialMethodNames.J___FORMAT__;`
`@@ -65,10 +65,10 @@`
`65`	`65`	`import com.oracle.graal.python.PythonLanguage;`
`66`	`66`	`import com.oracle.graal.python.annotations.ArgumentClinic;`
`67`	`67`	`import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;`
	`68`	`+import com.oracle.graal.python.annotations.Builtin;`
`68`	`69`	`import com.oracle.graal.python.annotations.Slot;`
`69`	`70`	`import com.oracle.graal.python.annotations.Slot.SlotKind;`
`70`	`71`	`import com.oracle.graal.python.annotations.Slot.SlotSignature;`
`71`		`-import com.oracle.graal.python.annotations.Builtin;`
`72`	`72`	`import com.oracle.graal.python.builtins.CoreFunctions;`
`73`	`73`	`import com.oracle.graal.python.builtins.PythonBuiltinClassType;`
`74`	`74`	`import com.oracle.graal.python.builtins.PythonBuiltins;`
`@@ -813,7 +813,7 @@ static Object doIPi(int left, PInt right,`
`813`	`813`	`}`
`814`	`814`	`return Math.floorDiv(left, rightValue);`
`815`	`815`	`} catch (OverflowException e) {`
`816`		`- return left < 0 == right.isNegative() ? 0 : -1;`
	`816`	`+ return left == 0 \|\| left < 0 == right.isNegative() ? 0 : -1;`
`817`	`817`	`}`
`818`	`818`	`}`
`819`	`819`
`@@ -831,7 +831,7 @@ static Object doLPi(long left, PInt right,`
`831`	`831`	`}`
`832`	`832`	`return Math.floorDiv(left, rightValue);`
`833`	`833`	`} catch (OverflowException e) {`
`834`		`- return left < 0 == right.isNegative() ? 0 : -1;`
	`834`	`+ return left == 0 \|\| left < 0 == right.isNegative() ? 0 : -1;`
`835`	`835`	`}`
`836`	`836`	`}`
`837`	`837`