[clang][deps] Report module map describing compiled module
This patch fixes compilation failure with explicit modules caused by scanner not reporting the module map describing the module whose implementation is being compiled.
Below is a breakdown of the attached test case. Note the VFS that makes frameworks "A" and "B" share the same header "shared/H.h".
In non-modular build, Clang skips the last import, since the "shared/H.h" header has already been included.
During scan (or implicit build), the compiler handles "tu.m" as follows:
* `@import B` imports module "B", as expected,
* `#import <A/H.h>` is resolved textually (due to `-fmodule-name=A`) to "shared/H.h" (due to the VFS remapping),
* `#import <B/H.h>` is resolved to import module "A_Private", since the header "shared/H.h" is already known to be part of that module, and the import is skipped.
In the end, the only modular dependency of the TU is "B".
In explicit modular build without `-fmodule-name=A`, TU does depend on module "A_Private" properly, not just textually. Clang therefore builds & loads its PCM, and knows to ignore the last import, since "shared/H.h" is known to be part of "A_Private".
But with current scanner behavior and `-fmodule-name=A` present, the last import fails during explicit build. Clang doesn't know about "A_Private" (it's included textually) and tries to import "B_Private" instead, which it doesn't know about either (the scanner correctly didn't report it as dependency). This is fixed by reporting the module map describing "A" and matching the semantics of implicit build.
Reviewed By: Bigcheese
Differential Revision: https://reviews.llvm.org/D134222
GitOrigin-RevId: 9dc0b1674841243110f95cdc9c9d97bcf30c1544
diff --git a/test/orc/TestCases/Darwin/x86-64/Inputs/dlopen-dlclose-x2.s b/test/orc/TestCases/Darwin/x86-64/Inputs/dlopen-dlclose-x2.s
deleted file mode 100644
index 3fbd177..0000000
--- a/test/orc/TestCases/Darwin/x86-64/Inputs/dlopen-dlclose-x2.s
+++ /dev/null
@@ -1,90 +0,0 @@
-// Runs a sequence of dlopen, dlclose, dlopen, dlclose on a library "inits".
-// This is intended as a standard harness for testing constructor / destructor
-// behavior in the context of a full dlclose and then re-dlopen'ing of the
-// inits library.
-//
-// Compiled from:
-//
-// int main(int argc, char *argv[]) {
-// printf("entering main\n");
-// void *H = dlopen("inits", 0);
-// if (!H) {
-// printf("failed\n");
-// return -1;
-// }
-// if (dlclose(H) == -1) {
-// printf("failed\n");
-// return -1;
-// }
-// H = dlopen("inits", 0);
-// if (!H) {
-// printf("failed\n");
-// return -1;
-// }
-// if (dlclose(H) == -1) {
-// printf("failed\n");
-// return -1;
-// }
-// printf("leaving main\n");
-// return 0;
-//}
-
- .section __TEXT,__text,regular,pure_instructions
- .build_version macos, 13, 0 sdk_version 13, 0
- .globl _main
- .p2align 4, 0x90
-_main:
-
- pushq %r14
- pushq %rbx
- pushq %rax
- leaq L_str(%rip), %rdi
- callq _puts
- leaq L_.str.1(%rip), %rdi
- xorl %esi, %esi
- callq _dlopen
- movl $-1, %ebx
- leaq L_str.8(%rip), %r14
- testq %rax, %rax
- je LBB0_4
-
- movq %rax, %rdi
- callq _dlclose
- cmpl $-1, %eax
- je LBB0_4
-
- leaq L_.str.1(%rip), %rdi
- xorl %esi, %esi
- callq _dlopen
- testq %rax, %rax
- je LBB0_4
-
- movq %rax, %rdi
- callq _dlclose
- xorl %ebx, %ebx
- cmpl $-1, %eax
- sete %bl
- leaq L_str.8(%rip), %rax
- leaq L_str.6(%rip), %r14
- cmoveq %rax, %r14
- negl %ebx
-LBB0_4:
- movq %r14, %rdi
- callq _puts
- movl %ebx, %eax
- addq $8, %rsp
- popq %rbx
- popq %r14
- retq
-
- .section __TEXT,__cstring,cstring_literals
-L_.str.1:
- .asciz "inits"
-L_str:
- .asciz "entering main"
-L_str.6:
- .asciz "leaving main"
-L_str.8:
- .asciz "failed"
-
-.subsections_via_symbols
