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

[Dependency Scanning] Refactor 'createScanQueryContext' to directly return an error

Browse Source
This commit is contained in:
Artem Chikin
2025-09-12 15:50:40 -07:00
parent b6760e7617
commit 50c0dd844f
4 changed files with 149 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
unittests/DependencyScan/ModuleDeps.cpp
View File

@@ -246,11 +246,15 @@ public func overlayFuncA() { }\n"));
CommandB.push_back(command.c_str());
}
auto queryAContext = ScannerTool.createScanQueryContext(CommandA, {});
auto queryBContext = ScannerTool.createScanQueryContext(CommandB, {});
std::vector<DepScanInMemoryDiagnosticCollector::ScannerDiagnosticInfo>
InitializationDiagnostics;
auto queryAContext = ScannerTool.createScanQueryContext(CommandA, {},
InitializationDiagnostics);
auto queryBContext = ScannerTool.createScanQueryContext(CommandB, {},
InitializationDiagnostics);
// Ensure that scans that only differ in module name have distinct scanning context hashes
ASSERT_NE(queryAContext.ScanInstance.get()->getInvocation().getModuleScanningHash(),
queryBContext.ScanInstance.get()->getInvocation().getModuleScanningHash());
ASSERT_NE(queryAContext->ScanInstance.get()->getInvocation().getModuleScanningHash(),
queryBContext->ScanInstance.get()->getInvocation().getModuleScanningHash());
}
namespace {
@@ -336,16 +340,19 @@ public func funcA() { }\n"));
{
auto ScanningService = std::make_unique<SwiftDependencyScanningService>();
auto QueryContext = ScannerTool.createScanQueryContext(Command, {});
ASSERT_FALSE(QueryContext.ScanInstance.getError());
std::vector<DepScanInMemoryDiagnosticCollector::ScannerDiagnosticInfo>
InitializationDiagnostics;
auto QueryContext = ScannerTool.createScanQueryContext(Command, {},
InitializationDiagnostics);
ASSERT_FALSE(QueryContext.getError());
ModuleDependenciesCache ScanCache(
QueryContext.ScanInstance.get()->getMainModule()->getNameStr().str(),
QueryContext.ScanInstance.get()
QueryContext->ScanInstance.get()->getMainModule()->getNameStr().str(),
QueryContext->ScanInstance.get()
->getInvocation()
.getModuleScanningHash());
auto DependenciesOrErr =
performModuleScan(*ScanningService, ScanCache, QueryContext);
performModuleScan(*ScanningService, ScanCache, *QueryContext);
ASSERT_FALSE(DependenciesOrErr.getError());
}