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

[CAS] Update swift CAS file system usage after llvm-project change

Browse Source 
Update swift compiler to go with llvm CAS update to decouple CAS file
system from VFS that breaks layering violation.
This commit is contained in:
Steven Wu
2025-10-16 10:12:00 -07:00
parent 1ae8ef0004
commit 1beef99ba1
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/DependencyScan/ModuleDependencyScanner.cpp
View File

@@ -436,12 +436,14 @@ SwiftDependencyTracker::SwiftDependencyTracker(
auto status = (*file)->status();
if (!status)
return;
auto fileRef = (*file)->getObjectRefForContent();
if (!fileRef)
auto casFile = dyn_cast<llvm::cas::CASBackedFile>(*file);
if (!casFile)
return;
auto fileRef = casFile->getObjectRefForContent();
std::string realPath = Mapper ? Mapper->mapToString(path) : path.str();
CommonFiles.try_emplace(realPath, **fileRef, (size_t)status->getSize());
CommonFiles.try_emplace(realPath, fileRef, (size_t)status->getSize());
};
// Add SDKSetting file.
@@ -493,12 +495,13 @@ void SwiftDependencyTracker::trackFile(const Twine &path) {
auto status = (*file)->status();
if (!status)
return;
auto fileRef = (*file)->getObjectRefForContent();
if (!fileRef)
auto CASFile = dyn_cast<llvm::cas::CASBackedFile>(*file);
if (!CASFile)
return;
auto fileRef = CASFile->getObjectRefForContent();
std::string realPath =
Mapper ? Mapper->mapToString(path.str()) : path.str();
TrackedFiles.try_emplace(realPath, **fileRef, (size_t)status->getSize());
TrackedFiles.try_emplace(realPath, fileRef, (size_t)status->getSize());
}
llvm::Expected<llvm::cas::ObjectProxy>
@@ -557,8 +560,9 @@ ModuleDependencyScanner::ModuleDependencyScanner(
}
if (CAS)
CacheFS = llvm::cas::createCASProvidingFileSystem(
CAS, ScanASTContext.SourceMgr.getFileSystem());
CacheFS = cast<llvm::cas::CASBackedFileSystem>(
llvm::cas::createCASProvidingFileSystem(
CAS, ScanASTContext.SourceMgr.getFileSystem()));
// TODO: Make num threads configurable
for (size_t i = 0; i < NumThreads; ++i)