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

add fingerprint excluding to basic source file info

Browse Source
This commit is contained in:
David Ungar
2021-02-26 13:22:28 -08:00
parent bc7eb593da
commit 90ee114b4a
5 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Serialization/ModuleFile.cpp
View File

@@ -978,10 +978,17 @@ void ModuleFile::collectBasicSourceFileInfo(
while (Cursor < End) {
// FilePath (byte offset in 'SourceLocsTextData').
auto fileID = endian::readNext<uint32_t, little, unaligned>(Cursor);
// InterfaceHash (fixed length string).
auto fpStr = StringRef{reinterpret_cast<const char *>(Cursor),
// InterfaceHashIncludingTypeMembers (fixed length string).
auto fpStrIncludingTypeMembers = StringRef{reinterpret_cast<const char *>(Cursor),
Fingerprint::DIGEST_LENGTH};
Cursor += Fingerprint::DIGEST_LENGTH;
// InterfaceHashExcludingTypeMembers (fixed length string).
auto fpStrExcludingTypeMembers = StringRef{reinterpret_cast<const char *>(Cursor),
Fingerprint::DIGEST_LENGTH};
Cursor += Fingerprint::DIGEST_LENGTH;
// LastModified (nanoseconds since epoch).
auto timestamp = endian::readNext<uint64_t, little, unaligned>(Cursor);
// FileSize (num of bytes).
@@ -992,13 +999,25 @@ void ModuleFile::collectBasicSourceFileInfo(
size_t terminatorOffset = filePath.find('\0');
filePath = filePath.slice(0, terminatorOffset);
auto fingerprint = Fingerprint::fromString(fpStr);
if (!fingerprint) {
llvm::errs() << "Unconvertable fingerprint '" << fpStr << "'\n";
auto fingerprintIncludingTypeMembers =
Fingerprint::fromString(fpStrIncludingTypeMembers);
if (!fingerprintIncludingTypeMembers) {
llvm::errs() << "Unconvertible fingerprint including type members'"
<< fpStrIncludingTypeMembers << "'\n";
abort();
}
callback(BasicSourceFileInfo(filePath, fingerprint.getValue(), llvm::sys::TimePoint<>(std::chrono::nanoseconds(timestamp)), fileSize));
auto fingerprintExcludingTypeMembers =
Fingerprint::fromString(fpStrExcludingTypeMembers);
if (!fingerprintExcludingTypeMembers) {
llvm::errs() << "Unconvertible fingerprint excluding type members'"
<< fpStrExcludingTypeMembers << "'\n";
abort();
}
callback(BasicSourceFileInfo(filePath,
fingerprintIncludingTypeMembers.getValue(),
fingerprintExcludingTypeMembers.getValue(),
llvm::sys::TimePoint<>(std::chrono::nanoseconds(timestamp)),
fileSize));
}
}