Address review feedback

Author: msimacek

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 # Copyright (c) 2013, Regents of the University of California
 #
 # All rights reserved.
@@ -195,6 +195,15 @@ def test_floor_div():
     assert_exception(lambda: 5.4 // 0.0, ZeroDivisionError)
 
 
+def test_true_div():
+    assert 1 / 2 == 0.5
+    assert 108086391056891904 / 30023997515803307 == 3.6
+    assert 295147905179352825856 / 2 == 1.4757395258967641e+20
+    assert_exception(lambda: 1 / 0, ZeroDivisionError)
+    assert_exception(lambda: 108086391056891904 / 0, ZeroDivisionError)
+    assert_exception(lambda: 295147905179352825856 / 0, ZeroDivisionError)
+
+
 def test_int_rfloor_div():
     assert int.__rfloordiv__(2, 5) == 2
     assert int.__rfloordiv__(2, 0x8000000000000001) == 0x4000000000000000

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

@@ -519,13 +519,17 @@ public abstract static class TrueDivNode extends PythonBinaryBuiltinNode {
             return divDD(x, y);
         }
 
-        @Specialization
+        @Specialization(guards = {"fitsIntoDouble(x)", "fitsIntoDouble(y)"})
         double divLL(long x, long y) {
-            if (fitsIntoDouble(x) && fitsIntoDouble(y)) {
-                return divDD(x, y);
-            } else {
-                return op(PInt.longToBigInteger(x), PInt.longToBigInteger(y), getRaiseNode());
+            return divDD(x, y);
+        }
+
+        @Specialization(guards = {"!fitsIntoDouble(x) || !fitsIntoDouble(y)"})
+        double divLLLarge(long x, long y) {
+            if (y == 0) {
+                throw raise(PythonErrorType.ZeroDivisionError, ErrorMessages.DIVISION_BY_ZERO);
             }
+            return op(PInt.longToBigInteger(x), PInt.longToBigInteger(y), getRaiseNode());
         }
 
         double divDD(double x, double y) {
@@ -581,7 +585,7 @@ private static double op(BigInteger a, BigInteger b, PRaiseNode raiseNode) {
             return d;
         }
 
-        private static boolean fitsIntoDouble(long x) {
+        protected static boolean fitsIntoDouble(long x) {
             return x < (1L << 52) && x > -(1L << 52);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/NonMappingException.java

@@ -40,14 +40,14 @@
  */
 package com.oracle.graal.python.nodes.argument.keywords;
 
-public class NonMappingException extends RuntimeException {
+public final class NonMappingException extends RuntimeException {
 
     private static final long serialVersionUID = -5215981713505181732L;
 
     private final Object object;
 
     public NonMappingException(Object object) {
-        super();
+        super(null, null);
         this.object = object;
     }
 
@@ -57,7 +57,7 @@ public Object getObject() {
 
     @SuppressWarnings("sync-override")
     @Override
-    public final Throwable fillInStackTrace() {
+    public Throwable fillInStackTrace() {
         return this;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/SameDictKeyException.java

@@ -40,14 +40,14 @@
  */
 package com.oracle.graal.python.nodes.argument.keywords;
 
-public class SameDictKeyException extends RuntimeException {
+public final class SameDictKeyException extends RuntimeException {
 
     private static final long serialVersionUID = 301451134733299948L;
 
     private final Object key;
 
     public SameDictKeyException(Object key) {
-        super();
+        super(null, null);
         this.key = key;
     }
 
@@ -57,7 +57,7 @@ public Object getKey() {
 
     @SuppressWarnings("sync-override")
     @Override
-    public final Throwable fillInStackTrace() {
+    public Throwable fillInStackTrace() {
         return this;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NativeLibrary.java

@@ -110,16 +110,17 @@ enum NFIBackend {
      * This is a helper exception that will be thrown in case a library is {@link #optional} and not
      * available.
      */
-    public static class NativeLibraryCannotBeLoaded extends RuntimeException {
+    public static final class NativeLibraryCannotBeLoaded extends RuntimeException {
         private static final NativeLibraryCannotBeLoaded INSTANCE = new NativeLibraryCannotBeLoaded();
         private static final long serialVersionUID = 6066722947025284374L;
 
         private NativeLibraryCannotBeLoaded() {
+            super(null, null);
         }
 
         @SuppressWarnings("sync-override")
         @Override
-        public final Throwable fillInStackTrace() {
+        public Throwable fillInStackTrace() {
             return this;
         }
     }

graalpython/lib-python/3/test/test_int.py

@@ -214,8 +214,6 @@ def test_basic(self):
         self.assertEqual(int('2br45qc', 35), 4294967297)
         self.assertEqual(int('1z141z5', 36), 4294967297)
 
-        self.assertEqual(108086391056891904 / 30023997515803307, 3.6)
-
     def test_underscores(self):
         for lit in VALID_UNDERSCORE_LITERALS:
             if any(ch in lit for ch in '.eEjJ'):