Skip to content

Commit 36279e2

Browse files
committed
Use LLVM version of combineHashValue
This fixes the master-next build.
1 parent 8e0bea9 commit 36279e2

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

include/swift/AST/SourceFile.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,11 @@ struct DenseMapInfo<swift::SourceFile::ImportedModuleDesc> {
734734
StringRefDMI::getTombstoneKey());
735735
}
736736
static inline unsigned getHashValue(const ImportedModuleDesc &import) {
737-
return combineHashValue(ImportedModuleDMI::getHashValue(import.module),
738-
combineHashValue(ImportOptionsDMI::getHashValue(import.importOptions),
739-
StringRefDMI::getHashValue(import.filename)));
737+
return detail::combineHashValue(
738+
ImportedModuleDMI::getHashValue(import.module),
739+
detail::combineHashValue(
740+
ImportOptionsDMI::getHashValue(import.importOptions),
741+
StringRefDMI::getHashValue(import.filename)));
740742
}
741743
static bool isEqual(const ImportedModuleDesc &a,
742744
const ImportedModuleDesc &b) {

lib/IRGen/LocalTypeDataKind.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ template <> struct DenseMapInfo<swift::irgen::LocalTypeDataKey> {
211211
swift::irgen::LocalTypeDataKind::forFormalTypeMetadata() };
212212
}
213213
static unsigned getHashValue(const LocalTypeDataKey &key) {
214-
return combineHashValue(CanTypeInfo::getHashValue(key.Type),
215-
key.Kind.getRawValue());
214+
return detail::combineHashValue(CanTypeInfo::getHashValue(key.Type),
215+
key.Kind.getRawValue());
216216
}
217217
static bool isEqual(const LocalTypeDataKey &a, const LocalTypeDataKey &b) {
218218
return a == b;

0 commit comments

Comments
 (0)