some adjustment to use new string hash function

src/runtime/builtin_modules/sys.cpp

@@ -39,6 +39,7 @@ BoxedDict* sys_modules_dict;
 extern "C" {
 // supposed to be exposed through sys.flags
 int Py_BytesWarningFlag = 0;
+int Py_HashRandomizationFlag = 0;
 }
 
 Box* sysExcInfo() {

src/runtime/objmodel.cpp

@@ -130,9 +130,8 @@ size_t PyHasher::operator()(Box* b) const {
     ScopedStatTimer _st(pyhasher_timer_counter, 10);
 #endif
     if (b->cls == str_cls) {
-        StringHash<char> H;
         auto s = static_cast<BoxedString*>(b);
-        return H(s->data(), s->size());
+        return strHashUnboxed(s);
     }
 
     return hashUnboxed(b);

src/runtime/types.h

@@ -430,36 +430,7 @@ private:
     friend void setupRuntime();
 };
 
-template <typename T> struct StringHash {
-    size_t operator()(const T* str) {
-        size_t hash = 5381;
-        T c;
-
-        while ((c = *str++))
-            hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
-
-        return hash;
-    }
-    size_t operator()(const T* str, int len) {
-        size_t hash = 5381;
-        T c;
-
-        while (--len >= 0) {
-            c = *str++;
-            hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
-        }
-
-        return hash;
-    }
-};
-
-template <> struct StringHash<std::string> {
-    size_t operator()(const std::string& str) {
-        StringHash<char> H;
-        return H(&str[0], str.size());
-    }
-};
-
+extern "C" size_t strHashUnboxed(BoxedString* self);
 
 class BoxedInstanceMethod : public Box {
 public: