diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -1774,9 +1774,6 @@ Module *HeaderSearch::loadFrameworkModule(StringRef Name, DirectoryEntryRef Dir, bool IsSystem) { - if (Module *Module = ModMap.findModule(Name)) - return Module; - // Try to load a module map file. switch (loadModuleMapFile(Dir, IsSystem, /*IsFramework*/true)) { case LMM_InvalidModuleMap: diff --git a/clang/test/ClangScanDeps/modules-private-framework-submodule.c b/clang/test/ClangScanDeps/modules-private-framework-submodule.c new file mode 100644 --- /dev/null +++ b/clang/test/ClangScanDeps/modules-private-framework-submodule.c @@ -0,0 +1,54 @@ +// RUN: rm -rf %t +// RUN: split-file %s %t + +//--- frameworks1/FW1.framework/Modules/module.modulemap +framework module FW1 { header "FW1.h" } +//--- frameworks1/FW1.framework/Headers/FW1.h +#import + +//--- frameworks2/FW2.framework/Modules/module.modulemap +framework module FW2 { header "FW2.h" } +//--- frameworks2/FW2.framework/Modules/module.private.modulemap +framework module FW2_Private { header "FW2_Private.h" } +//--- frameworks2/FW2.framework/Headers/FW2.h +//--- frameworks2/FW2.framework/PrivateHeaders/FW2_Private.h + +//--- tu.c +#import +#import + +//--- cdb.json.template +[{ + "file": "DIR/tu.c", + "directory": "DIR", + "command": "clang -fmodules -fmodules-cache-path=DIR/cache -fimplicit-module-maps -F DIR/frameworks1 -F DIR/frameworks2 -c DIR/tu.c -o DIR/tu.o" +}] + +// RUN: sed "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json +// RUN: clang-scan-deps -format experimental-full -compilation-database %t/cdb.json > %t/result.json +// RUN: cat %t/result.json | FileCheck %s -DPREFIX=%/t + +// CHECK: "translation-units": [ +// CHECK-NEXT: { +// CHECK-NEXT: "commands": [ +// CHECK-NEXT: { +// CHECK-NEXT: "clang-context-hash": "{{.*}}", +// CHECK-NEXT: "clang-module-deps": [ +// CHECK-NEXT: { +// CHECK-NEXT: "context-hash": "{{.*}}", +// CHECK-NEXT: "module-name": "FW1" +// CHECK-NEXT: }, +// CHECK-NEXT: { +// CHECK-NEXT: "context-hash": "{{.*}}", +// CHECK-NEXT: "module-name": "FW2_Private" +// CHECK-NEXT: } +// CHECK-NEXT: ], +// CHECK: "file-deps": [ +// CHECK-NEXT: "[[PREFIX]]/tu.c" +// CHECK-NEXT: ], +// CHECK-NEXT: "input-file": "[[PREFIX]]/tu.c" +// CHECK: } +// CHECK: ] +// CHECK: } +// CHECK: ] +// CHECK: }