-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[clang][Dependency Scanning] Report What a Module Exports during Scanning #137421
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.
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
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0093c2f
Adding an API to report exported modules and update existing tests.
qiongsiwu 52515f8
Adding a test case.
qiongsiwu 077c5c2
Renaming the new struct and place it in a better context.
qiongsiwu fc18c64
Revising how results are printed out.
qiongsiwu 2b26d70
Rename the new struct to make it a bit cleaner.
qiongsiwu 792b92e
Renaming loop variables.
qiongsiwu 051e294
Renaming a loop variable.
qiongsiwu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| // Test correctly reporting what a module exports during dependency scanning. | ||
| // Module A depends on modules B, C and D, but only exports B and C. | ||
| // Module E depends on modules B, C and D, and exports all of them. | ||
|
|
||
| // RUN: rm -rf %t | ||
| // RUN: split-file %s %t | ||
| // RUN: sed -e "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json | ||
| // RUN: clang-scan-deps -compilation-database \ | ||
| // RUN: %t/cdb.json -format experimental-full > %t/deps.db | ||
| // RUN: cat %t/deps.db | sed 's:\\\\\?:/:g' | FileCheck %s | ||
|
|
||
| //--- cdb.json.template | ||
| [ | ||
| { | ||
| "directory": "DIR", | ||
| "command": "clang -c DIR/test.c -I DIR/AH -I DIR/BH -I DIR/CH -I DIR/DH -I DIR/EH -fmodules -fmodules-cache-path=DIR/cache", | ||
| "file": "DIR/test.c" | ||
| }, | ||
| ] | ||
|
|
||
| //--- AH/A.h | ||
| #include "B.h" | ||
| #include "C.h" | ||
| #include "D.h" | ||
|
|
||
| int funcA(); | ||
|
|
||
| //--- AH/module.modulemap | ||
| module A { | ||
| header "A.h" | ||
|
|
||
| export B | ||
| export C | ||
| } | ||
|
|
||
| //--- BH/B.h | ||
| //--- BH/module.modulemap | ||
| module B { | ||
| header "B.h" | ||
| } | ||
|
|
||
| //--- CH/C.h | ||
| //--- CH/module.modulemap | ||
| module C { | ||
| header "C.h" | ||
| } | ||
|
|
||
| //--- DH/D.h | ||
| //--- DH/module.modulemap | ||
| module D { | ||
| header "D.h" | ||
| } | ||
|
|
||
| //--- EH/E.h | ||
| #include "B.h" | ||
| #include "C.h" | ||
| #include "D.h" | ||
|
|
||
| //--- EH/module.modulemap | ||
| module E { | ||
| header "E.h" | ||
| export * | ||
| } | ||
|
|
||
| //--- test.c | ||
| #include "A.h" | ||
| #include "E.h" | ||
|
|
||
| int test1() { | ||
| return funcA(); | ||
| } | ||
|
|
||
| // CHECK: { | ||
| // CHECK-NEXT: "modules": [ | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "clang-module-deps": [ | ||
| // CHECK-NEXT: { | ||
qiongsiwu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_B:.*]]", | ||
| // CHECK-NEXT: "module-name": "B" | ||
| // CHECK-NEXT: }, | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_C:.*]]", | ||
| // CHECK-NEXT: "module-name": "C" | ||
| // CHECK-NEXT: }, | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_D:.*]]", | ||
| // CHECK-NEXT: "module-name": "D" | ||
| // CHECK-NEXT: } | ||
| // CHECK-NEXT: ], | ||
| // CHECK-NEXT: "clang-modulemap-file":{{.*}}, | ||
| // CHECK-NEXT: "command-line": [ | ||
| // CHECK: ], | ||
| // CHECK-NEXT: "context-hash":{{.*}} | ||
| // CHECK-NEXT: "file-deps": [ | ||
| // CHECK: ], | ||
| // CHECK-NEXT: "link-libraries": [], | ||
| // CHECK-NEXT: "clang-modules-exported": [ | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_B]]", | ||
| // CHECK-NEXT: "module-name": "B" | ||
| // CHECK-NEXT: }, | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_C]]", | ||
| // CHECK-NEXT: "module-name": "C" | ||
| // CHECK-NEXT: } | ||
| // CHECK-NOT: { | ||
| // CHECK-NOT: "context-hash": "[[HASH_MOD_D]]", | ||
| // CHECK-NOT: "module-name": "D" | ||
| // CHECK-NOT: } | ||
| // CHECK-NEXT: ], | ||
| // CHECK-NEXT: "name": "A" | ||
| // CHECK-NEXT: } | ||
| // CHECK: { | ||
| // CHECK: "name": "B" | ||
| // CHECK: } | ||
| // CHECK: { | ||
| // CHECK: "name": "C" | ||
| // CHECK: } | ||
| // CHECK: { | ||
| // CHECK: "name": "D" | ||
| // CHECK: } | ||
| // CHECK: { | ||
| // CHECK-NEXT: "clang-module-deps": [ | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_B]]", | ||
| // CHECK-NEXT: "module-name": "B" | ||
| // CHECK-NEXT: }, | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_C]]", | ||
| // CHECK-NEXT: "module-name": "C" | ||
| // CHECK-NEXT: }, | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_D]]", | ||
| // CHECK-NEXT: "module-name": "D" | ||
| // CHECK-NEXT: } | ||
| // CHECK-NEXT: ], | ||
| // CHECK-NEXT: "clang-modulemap-file":{{.*}}, | ||
| // CHECK-NEXT: "command-line": [ | ||
| // CHECK: ], | ||
| // CHECK-NEXT: "context-hash":{{.*}} | ||
| // CHECK-NEXT: "file-deps": [ | ||
| // CHECK: ], | ||
| // CHECK-NEXT: "link-libraries": [], | ||
| // CHECK-NEXT: "clang-modules-exported": [ | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_B]]", | ||
| // CHECK-NEXT: "module-name": "B" | ||
| // CHECK-NEXT: }, | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_C]]", | ||
| // CHECK-NEXT: "module-name": "C" | ||
| // CHECK-NEXT: } | ||
| // CHECK-NEXT: { | ||
| // CHECK-NEXT: "context-hash": "[[HASH_MOD_D]]", | ||
| // CHECK-NEXT: "module-name": "D" | ||
| // CHECK-NEXT: } | ||
| // CHECK-NEXT: ], | ||
| // CHECK-NEXT: "name": "E" | ||
| // CHECK-NEXT: } | ||
| // CHECK: ] | ||
| // CHECK: } | ||
|
|
||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.