Merge pull request #14862 from compnerd/hash

bob-wilson · web-flow · commit b7eb3bfeee7f · 2018-02-28T13:59:01.000-08:00
upstream-update: adjust for SVN r326091
diff --git a/lib/ClangImporter/SwiftLookupTable.cpp b/lib/ClangImporter/SwiftLookupTable.cpp
@@ -33,6 +33,7 @@
 #include "llvm/Bitcode/BitstreamReader.h"
 #include "llvm/Bitcode/BitstreamWriter.h"
 #include "llvm/Bitcode/RecordLayout.h"
+#include "llvm/Support/DJB.h"
 #include "llvm/Support/OnDiskHashTable.h"
 
 using namespace swift;
@@ -1054,7 +1055,7 @@ namespace {
     }
 
     hash_value_type ComputeHash(key_type_ref key) {
-      return static_cast<unsigned>(key.first) + llvm::HashString(key.second);
+      return static_cast<unsigned>(key.first) + llvm::djbHash(key.second);
     }
 
     std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,
@@ -1297,7 +1298,7 @@ namespace {
     }
 
     hash_value_type ComputeHash(internal_key_type key) {
-      return static_cast<unsigned>(key.first) + llvm::HashString(key.second);
+      return static_cast<unsigned>(key.first) + llvm::djbHash(key.second);
     }
 
     static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
@@ -48,6 +48,7 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/DJB.h"
 
 using namespace swift;
 
@@ -168,7 +169,7 @@ class DenseMapInfo<RawValueKey> {
       return DenseMapInfo<uint64_t>::getHashValue(k.intValue.v0) &
              DenseMapInfo<uint64_t>::getHashValue(k.intValue.v1);
     case RawValueKey::Kind::String:
-      return llvm::HashString(k.stringValue);
+      return llvm::djbHash(k.stringValue);
     case RawValueKey::Kind::Empty:
     case RawValueKey::Kind::Tombstone:
       return 0;
diff --git a/lib/Serialization/DeserializeSIL.cpp b/lib/Serialization/DeserializeSIL.cpp
@@ -29,6 +29,7 @@
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/DJB.h"
 #include "llvm/Support/OnDiskHashTable.h"
 
 #include <type_traits>
@@ -102,7 +103,7 @@ class SILDeserializer::FuncTableInfo {
   external_key_type GetExternalKey(internal_key_type ID) { return ID; }
 
   hash_value_type ComputeHash(internal_key_type key) {
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
diff --git a/lib/Serialization/ModuleFile.cpp b/lib/Serialization/ModuleFile.cpp
@@ -27,6 +27,7 @@
 #include "swift/Serialization/BCReadingExtras.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/DJB.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/OnDiskHashTable.h"
 
@@ -317,7 +318,7 @@ class ModuleFile::DeclTableInfo {
 
   hash_value_type ComputeHash(internal_key_type key) {
     if (key.first == DeclBaseName::Kind::Normal) {
-      return llvm::HashString(key.second);
+      return llvm::djbHash(key.second);
     } else {
       return (hash_value_type)key.first;
     }
@@ -379,7 +380,7 @@ class ModuleFile::ExtensionTableInfo {
   }
 
   hash_value_type ComputeHash(internal_key_type key) {
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
@@ -438,7 +439,7 @@ class ModuleFile::LocalDeclTableInfo {
   }
 
   hash_value_type ComputeHash(internal_key_type key) {
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
@@ -475,7 +476,7 @@ class ModuleFile::NestedTypeDeclsTableInfo {
   }
 
   hash_value_type ComputeHash(internal_key_type key) {
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
@@ -530,7 +531,7 @@ class ModuleFile::DeclMemberNamesTableInfo {
 
   hash_value_type ComputeHash(internal_key_type key) {
     if (key.first == DeclBaseName::Kind::Normal) {
-      return llvm::HashString(key.second);
+      return llvm::djbHash(key.second);
     } else {
       return (hash_value_type)key.first;
     }
@@ -703,7 +704,7 @@ class ModuleFile::ObjCMethodTableInfo {
   }
 
   hash_value_type ComputeHash(internal_key_type key) {
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
@@ -890,7 +891,7 @@ class ModuleFile::DeclCommentTableInfo {
 
   hash_value_type ComputeHash(internal_key_type key) {
     assert(!key.empty());
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
@@ -48,6 +48,7 @@
 #include "llvm/Config/config.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Compiler.h"
+#include "llvm/Support/DJB.h"
 #include "llvm/Support/EndianStream.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -100,7 +101,7 @@ namespace {
       switch (key.getKind()) {
         case DeclBaseName::Kind::Normal:
           assert(!key.empty());
-          return llvm::HashString(key.getIdentifier().str());
+          return llvm::djbHash(key.getIdentifier().str());
         case DeclBaseName::Kind::Subscript:
           return static_cast<uint8_t>(DeclNameKind::Subscript);
         case DeclBaseName::Kind::Destructor:
@@ -167,7 +168,7 @@ namespace {
 
     hash_value_type ComputeHash(key_type_ref key) {
       assert(!key.empty());
-      return llvm::HashString(key.str());
+      return llvm::djbHash(key.str());
     }
 
     int32_t getNameDataForBase(const NominalTypeDecl *nominal,
@@ -229,7 +230,7 @@ namespace {
 
     hash_value_type ComputeHash(key_type_ref key) {
       assert(!key.empty());
-      return llvm::HashString(key);
+      return llvm::djbHash(key);
     }
 
     std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,
@@ -269,7 +270,7 @@ namespace {
 
     hash_value_type ComputeHash(key_type_ref key) {
       assert(!key.empty());
-      return llvm::HashString(key.str());
+      return llvm::djbHash(key.str());
     }
 
     std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,
@@ -312,7 +313,7 @@ namespace {
       switch (key.getKind()) {
       case DeclBaseName::Kind::Normal:
         assert(!key.empty());
-        return llvm::HashString(key.getIdentifier().str());
+        return llvm::djbHash(key.getIdentifier().str());
       case DeclBaseName::Kind::Subscript:
         return static_cast<uint8_t>(DeclNameKind::Subscript);
       case DeclBaseName::Kind::Destructor:
@@ -4265,7 +4266,7 @@ class DeclCommentTableInfo {
 
   hash_value_type ComputeHash(key_type_ref key) {
     assert(!key.empty());
-    return llvm::HashString(key);
+    return llvm::djbHash(key);
   }
 
   std::pair<unsigned, unsigned>
@@ -4636,7 +4637,7 @@ namespace {
 
     hash_value_type ComputeHash(key_type_ref key) {
       llvm::SmallString<32> scratch;
-      return llvm::HashString(key.getString(scratch));
+      return llvm::djbHash(key.getString(scratch));
     }
 
     std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,
diff --git a/lib/Serialization/SerializeSIL.cpp b/lib/Serialization/SerializeSIL.cpp
@@ -30,6 +30,7 @@
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
+#include "llvm/Support/DJB.h"
 #include "llvm/Support/EndianStream.h"
 #include "llvm/Support/OnDiskHashTable.h"
 
@@ -110,7 +111,7 @@ namespace {
 
     hash_value_type ComputeHash(key_type_ref key) {
       assert(!key.empty());
-      return llvm::HashString(key.str());
+      return llvm::djbHash(key.str());
     }
 
     std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`#include "llvm/Bitcode/BitstreamReader.h"`
`34`	`34`	`#include "llvm/Bitcode/BitstreamWriter.h"`
`35`	`35`	`#include "llvm/Bitcode/RecordLayout.h"`
	`36`	`+#include "llvm/Support/DJB.h"`
`36`	`37`	`#include "llvm/Support/OnDiskHashTable.h"`
`37`	`38`
`38`	`39`	`using namespace swift;`
`@@ -1054,7 +1055,7 @@ namespace {`
`1054`	`1055`	`}`
`1055`	`1056`
`1056`	`1057`	`hash_value_type ComputeHash(key_type_ref key) {`
`1057`		`- return static_cast<unsigned>(key.first) + llvm::HashString(key.second);`
	`1058`	`+ return static_cast<unsigned>(key.first) + llvm::djbHash(key.second);`
`1058`	`1059`	`}`
`1059`	`1060`
`1060`	`1061`	`std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,`
`@@ -1297,7 +1298,7 @@ namespace {`
`1297`	`1298`	`}`
`1298`	`1299`
`1299`	`1300`	`hash_value_type ComputeHash(internal_key_type key) {`
`1300`		`- return static_cast<unsigned>(key.first) + llvm::HashString(key.second);`
	`1301`	`+ return static_cast<unsigned>(key.first) + llvm::djbHash(key.second);`
`1301`	`1302`	`}`
`1302`	`1303`
`1303`	`1304`	`static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include "swift/Serialization/BCReadingExtras.h"`
`28`	`28`	`#include "swift/Serialization/SerializedModuleLoader.h"`
`29`	`29`	`#include "llvm/ADT/StringExtras.h"`
	`30`	`+#include "llvm/Support/DJB.h"`
`30`	`31`	`#include "llvm/Support/MemoryBuffer.h"`
`31`	`32`	`#include "llvm/Support/OnDiskHashTable.h"`
`32`	`33`
`@@ -317,7 +318,7 @@ class ModuleFile::DeclTableInfo {`
`317`	`318`
`318`	`319`	`hash_value_type ComputeHash(internal_key_type key) {`
`319`	`320`	`if (key.first == DeclBaseName::Kind::Normal) {`
`320`		`- return llvm::HashString(key.second);`
	`321`	`+ return llvm::djbHash(key.second);`
`321`	`322`	`} else {`
`322`	`323`	`return (hash_value_type)key.first;`
`323`	`324`	`}`
`@@ -379,7 +380,7 @@ class ModuleFile::ExtensionTableInfo {`
`379`	`380`	`}`
`380`	`381`
`381`	`382`	`hash_value_type ComputeHash(internal_key_type key) {`
`382`		`- return llvm::HashString(key);`
	`383`	`+ return llvm::djbHash(key);`
`383`	`384`	`}`
`384`	`385`
`385`	`386`	`static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {`
`@@ -438,7 +439,7 @@ class ModuleFile::LocalDeclTableInfo {`
`438`	`439`	`}`
`439`	`440`
`440`	`441`	`hash_value_type ComputeHash(internal_key_type key) {`
`441`		`- return llvm::HashString(key);`
	`442`	`+ return llvm::djbHash(key);`
`442`	`443`	`}`
`443`	`444`
`444`	`445`	`static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {`
`@@ -475,7 +476,7 @@ class ModuleFile::NestedTypeDeclsTableInfo {`
`475`	`476`	`}`
`476`	`477`
`477`	`478`	`hash_value_type ComputeHash(internal_key_type key) {`
`478`		`- return llvm::HashString(key);`
	`479`	`+ return llvm::djbHash(key);`
`479`	`480`	`}`
`480`	`481`
`481`	`482`	`static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {`
`@@ -530,7 +531,7 @@ class ModuleFile::DeclMemberNamesTableInfo {`
`530`	`531`
`531`	`532`	`hash_value_type ComputeHash(internal_key_type key) {`
`532`	`533`	`if (key.first == DeclBaseName::Kind::Normal) {`
`533`		`- return llvm::HashString(key.second);`
	`534`	`+ return llvm::djbHash(key.second);`
`534`	`535`	`} else {`
`535`	`536`	`return (hash_value_type)key.first;`
`536`	`537`	`}`
`@@ -703,7 +704,7 @@ class ModuleFile::ObjCMethodTableInfo {`
`703`	`704`	`}`
`704`	`705`
`705`	`706`	`hash_value_type ComputeHash(internal_key_type key) {`
`706`		`- return llvm::HashString(key);`
	`707`	`+ return llvm::djbHash(key);`
`707`	`708`	`}`
`708`	`709`
`709`	`710`	`static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {`
`@@ -890,7 +891,7 @@ class ModuleFile::DeclCommentTableInfo {`
`890`	`891`
`891`	`892`	`hash_value_type ComputeHash(internal_key_type key) {`
`892`	`893`	`assert(!key.empty());`
`893`		`- return llvm::HashString(key);`
	`894`	`+ return llvm::djbHash(key);`
`894`	`895`	`}`
`895`	`896`
`896`	`897`	`static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {`