averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Compare spiGroups in DenseMapInfo

Browse Source 
This ought to result in more consistent behavior.
This commit is contained in:
Brent Royal-Gordon
2020-10-09 17:47:40 -07:00
parent f71923778b
commit 48b866b8fe
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/swift/AST/Import.h
View File

@@ -691,17 +691,20 @@ struct DenseMapInfo<swift::AttributedImport<ModuleInfo>> {
using ModuleInfoDMI = DenseMapInfo<ModuleInfo>;
using ImportOptionsDMI = DenseMapInfo<swift::ImportOptions>;
using StringRefDMI = DenseMapInfo<StringRef>;
// FIXME: SPI groups not used by DenseMapInfo???
// We can't include spiGroups in the hash because ArrayRef<Identifier> is not
// DenseMapInfo-able, but we do check that the spiGroups match in isEqual().
static inline AttributedImport getEmptyKey() {
return AttributedImport(ModuleInfoDMI::getEmptyKey(),
ImportOptionsDMI::getEmptyKey(),
StringRefDMI::getEmptyKey());
StringRefDMI::getEmptyKey(),
{});
}
static inline AttributedImport getTombstoneKey() {
return AttributedImport(ModuleInfoDMI::getTombstoneKey(),
ImportOptionsDMI::getTombstoneKey(),
StringRefDMI::getTombstoneKey());
StringRefDMI::getTombstoneKey(),
{});
}
static inline unsigned getHashValue(const AttributedImport &import) {
return detail::combineHashValue(
@@ -714,7 +717,8 @@ struct DenseMapInfo<swift::AttributedImport<ModuleInfo>> {
const AttributedImport &b) {
return ModuleInfoDMI::isEqual(a.module, b.module) &&
ImportOptionsDMI::isEqual(a.options, b.options) &&
StringRefDMI::isEqual(a.sourceFileArg, b.sourceFileArg);
StringRefDMI::isEqual(a.sourceFileArg, b.sourceFileArg) &&
a.spiGroups == b.spiGroups;
}
};
}