Expose hash-related constants in sys.hash_info

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -1466,7 +1466,7 @@ Object doUnicode(VirtualFrame frame, Object o, Object errorMarker) {
     abstract static class PyHashImagNode extends PythonBuiltinNode {
         @Specialization
         long getHash() {
-            return PComplex.IMAG_MULTIPLIER;
+            return SysModuleBuiltins.HASH_IMAG;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

@@ -109,6 +109,12 @@ public class SysModuleBuiltins extends PythonBuiltins {
     public static final String PLATFORM_WIN32 = "win32";
     public static final PNone FRAMEWORK = PNone.NONE;
     public static final int MAXSIZE = Integer.MAX_VALUE;
+    public static final long HASH_MULTIPLIER = 1000003L;
+    public static final int HASH_BITS = 61;
+    public static final long HASH_MODULUS = (1L << HASH_BITS) - 1;
+    public static final long HASH_INF = 314159;
+    public static final long HASH_NAN = 0;
+    public static final long HASH_IMAG = HASH_MULTIPLIER;
 
     static {
         String compile_time;
@@ -155,6 +161,17 @@ public void initialize(PythonCore core) {
                         2,                          // FLT_RADIX
                         1                           // FLT_ROUNDS
         }));
+        builtinConstants.put("hash_info", core.factory().createTuple(new Object[]{
+                        "java",                     // algorithm
+                        0,                          // cutoff
+                        64,                         // hash_bits
+                        HASH_IMAG,                  // imag
+                        HASH_INF,                   // inf
+                        HASH_MODULUS,               // modulus
+                        HASH_NAN,                   // nan
+                        0,                          // seed_bits
+                        64,                         // width
+        }));
         builtinConstants.put("maxunicode", IntegerFormatter.LIMIT_UNICODE.intValue() - 1);
 
         String os = getPythonOSName();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/ComplexBuiltins.java

@@ -81,6 +81,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.floats.FloatBuiltins;
@@ -831,7 +832,7 @@ long hash(PComplex self) {
             // just like CPython
             long realHash = PythonObjectLibrary.hash(self.getReal());
             long imagHash = PythonObjectLibrary.hash(self.getImag());
-            return realHash + PComplex.IMAG_MULTIPLIER * imagHash;
+            return realHash + SysModuleBuiltins.HASH_IMAG * imagHash;
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/complex/PComplex.java

@@ -31,8 +31,6 @@
 import com.oracle.truffle.api.object.Shape;
 
 public final class PComplex extends PythonBuiltinObject {
-    /* Prime multiplier used in string and various other hashes in CPython. */
-    public static final int IMAG_MULTIPLIER = 1000003; /* 0xf4243 */
 
     private final double real;
     private final double imag;

graalpython/lib-graalpython/sys.py

@@ -131,9 +131,7 @@ def make_hash_info_class():
          "seed_bits",
          "width"]
     )
-hash_info = make_hash_info_class()(
-    ("java", 0, 64, 0, float('inf').__hash__(), 7, float('nan').__hash__(), 0, 64)
-)
+hash_info = make_hash_info_class()(hash_info)
 del make_hash_info_class