Skip to content

Commit 7885233

Browse files
authored
Revert "On 'canImport' of Clang submodules of modules with an umbrella header, attempt to infer the submodule"
1 parent 74cf3dd commit 7885233

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
@@ -2083,7 +2083,7 @@ bool ClangImporter::canImportModule(ImportPath::Module modulePath,
20832083

20842084
if (modulePath.hasSubmodule()) {
20852085
for (auto &component : modulePath.getSubmodulePath()) {
2086-
clangModule = clangModule->findOrInferSubmodule(component.Item.str());
2086+
clangModule = clangModule->findSubmodule(component.Item.str());
20872087

20882088
// Special case: a submodule named "Foo.Private" can be moved to a
20892089
// 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)