Skip to content

Commit a2d5ac8

Browse files
authored
Merge pull request #72880 from artemcm/60-revert-72129-canImportSubmoduleInfer
[6.0🍒] Revert "On 'canImport' of Clang submodules of modules with an umbrella header, attempt to infer the submodule"
2 parents b099cd5 + b4699d2 commit a2d5ac8

File tree

5 files changed

+1
-22
lines changed

5 files changed

+1
-22
lines changed

lib/ClangImporter/ClangImporter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2069,7 +2069,7 @@ bool ClangImporter::canImportModule(ImportPath::Module modulePath,
20692069

20702070
if (modulePath.hasSubmodule()) {
20712071
for (auto &component : modulePath.getSubmodulePath()) {
2072-
clangModule = clangModule->findOrInferSubmodule(component.Item.str());
2072+
clangModule = clangModule->findSubmodule(component.Item.str());
20732073

20742074
// Special case: a submodule named "Foo.Private" can be moved to a
20752075
// top-level module named "Foo_Private". Clang has special support for

test/ScanDependencies/Inputs/Frameworks/WithInferredClangModule.framework/Headers/InferredClangModule.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/ScanDependencies/Inputs/Frameworks/WithInferredClangModule.framework/Headers/WithInferredClangModule.h

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/ScanDependencies/Inputs/Frameworks/WithInferredClangModule.framework/Modules/module.modulemap

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/ScanDependencies/can_import_inferred_submodule.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)