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] Detect cycles of main target module depending on an existing Swift textual or prebuilt binary module

Browse Source 
Resolves rdar://123112402
This commit is contained in:
Artem Chikin
2024-02-20 14:18:27 -08:00
parent 9607e9dec1
commit 8734d2eb97
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/DependencyScan/ScanDependencies.cpp
View File

@@ -1299,6 +1299,9 @@ static bool diagnoseCycle(CompilerInstance &instance,
[&buffer](const ModuleDependencyID &id) {
buffer.append(id.ModuleName);
switch (id.Kind) {
case swift::ModuleDependencyKind::SwiftSource:
buffer.append(" (Source Target)");
break;
case swift::ModuleDependencyKind::SwiftInterface:
buffer.append(".swiftinterface");
break;
@@ -1318,11 +1321,12 @@ static bool diagnoseCycle(CompilerInstance &instance,
[&buffer] { buffer.append(" -> "); });
};
auto emitCycleDiagnostic = [&](const ModuleDependencyID &dep) {
auto startIt = std::find(openSet.begin(), openSet.end(), dep);
auto emitCycleDiagnostic = [&](const ModuleDependencyID &sourceId,
const ModuleDependencyID &sinkId) {
auto startIt = std::find(openSet.begin(), openSet.end(), sourceId);
assert(startIt != openSet.end());
std::vector<ModuleDependencyID> cycleNodes(startIt, openSet.end());
cycleNodes.push_back(*startIt);
cycleNodes.push_back(sinkId);
llvm::SmallString<64> errorBuffer;
emitModulePath(cycleNodes, errorBuffer);
instance.getASTContext().Diags.diagnose(
@@ -1361,13 +1365,20 @@ static bool diagnoseCycle(CompilerInstance &instance,
auto beforeSize = openSet.size();
assert(cache.findDependency(lastOpen).has_value() &&
"Missing dependency info during cycle diagnosis.");
for (const auto &dep : cache.getAllDependencies(lastOpen)) {
if (closeSet.count(dep))
for (const auto &depId : cache.getAllDependencies(lastOpen)) {
if (closeSet.count(depId))
continue;
if (openSet.insert(dep)) {
// Ensure we detect dependency of the Source target
// on an existing Swift module with the same name
if (kindIsSwiftDependency(depId) &&
depId.ModuleName == mainId.ModuleName && openSet.contains(mainId)) {
emitCycleDiagnostic(mainId, depId);
return true;
}
if (openSet.insert(depId)) {
break;
} else {
emitCycleDiagnostic(dep);
emitCycleDiagnostic(depId, depId);
return true;
}
}