Skip to content

[DependencyScanning] Fix clang submodule canImport check after #70974 #71016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2024
Merged

[DependencyScanning] Fix clang submodule canImport check after #70974 #71016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/AST/ASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,10 +2382,12 @@ bool ASTContext::canImportModule(ImportPath::Module ModuleName,
if (!canImportModuleImpl(ModuleName, version, underlyingVersion, true))
return false;

// If inserted successfully, add that to success list as dependency.
SmallString<64> FullModuleName;
ModuleName.getString(FullModuleName);
SucceededModuleImportNames.insert(FullModuleName.str());
// If checked successfully, add the top level name to success list as
// dependency to handle clang submodule correctly. Swift does not have
// submodule so the name should be the same.
SmallString<64> TopModuleName;
ModuleName.getTopLevelPath().getString(TopModuleName);
SucceededModuleImportNames.insert(TopModuleName.str());
return true;
}

Expand Down
8 changes: 4 additions & 4 deletions test/CAS/can-import.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@

//--- main.swift
#if canImport(A.Sub)
import A.Sub
func a() {}
#endif

#if canImport(A.Missing)
import A.Missing
#endif

#if canImport(B) // never actually import B
#if canImport(B)
func b() {}
#endif

Expand All @@ -99,7 +99,7 @@ module B {
}

//--- include/sub.h
void a(void);
void notused(void);

//--- include/B.h
void notused(void);
void notused2(void);
21 changes: 20 additions & 1 deletion test/ScanDependencies/module_deps_can_import.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache %s -module-name Test -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -swift-version 4
// RUN: split-file %s %t
// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/clang-module-cache %t/main.swift -module-name Test -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -I %t/include -swift-version 4

// RUN: %{python} %S/../CAS/Inputs/SwiftDepsExtractor.py %t/deps.json Test directDependencies | %FileCheck %s

// CHECK-DAG: "clang": "C"
// CHECK-DAG: "clang": "ClangTest"
// CHECK-DAG: "swift": "A"
// CHECK-DAG: "swift": "F"
// CHECK-NOT: "swift": "G"
// CHECK-NOT: "swift": "B"
// CHECK-NOT: "Missing"

//--- main.swift

#if canImport(Missing)
import G
#endif
Expand All @@ -32,3 +36,18 @@ import Missing
// B is short circuited
#if canImport(C) || canImport(B)
#endif

// Check clang submodule, this should import ClangTest, not ClangTest.Sub
#if canImport(ClangTest.Sub)
#endif

//--- include/module.modulemap
module ClangTest {
module Sub {
header "sub.h"
export *
}
}

//--- include/sub.h
void notused(void);