[Clang][ScanDeps] Add C API and implement enough to build Foundation. #699
Conversation
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
|
@swift-ci please test |
dexonsmith
approved these changes
Jan 31, 2020
Bigcheese
force-pushed
the
scan-deps-apple-master
branch
from
a049f94 to
124c28a
Compare
|
Test failure was due to non determinism in the output. Fixed by sorting file-deps in the C API. @swift-ci please test |
This adds an experimental C API for clang-scan-deps. It provides both the full module dependency graph along with a flattened list of dependencies. See clang/include/clang-c/Dependencies.h for the API and documentation. You can test it out using: c-index-test core --scan-deps <working-directory> -- clang --cc1 <args> This will output a list of modules and then the direct dependencies of the main translation unit.
This function returns the equivalent of -### <rdar://problem/49928458> <rdar://problem/49396121>
…e-options Removes any arguments before this one that would be incompatible with explicitly building a module. This includes things like -o and input files. This option can be used to append arguments to convert a build of a translation unit with implicit modules into an explicit build of a specific module.
This assert fires for ObjectiveC id, SEL, and Class declarations when the module is explicitly built. For implicit builds it works fine. This reproduces with: typedef struct objc_class Class; struct objc_class; As a module imported into another module, and both the above and that module imported into a third TU. Changing the name (`Class`) or reordering the declarations does not assert. rdar://58552906
Gives the last of -f{no-}implicit-module-maps precedence.
rdar://58883354
Building the actual module still fails, but make sure it fails for the right reason.
The `UmbrellaAsWritten` and `NameAsWritten` fields in `clang::Module` are a lie for framework modules. For those they actually are the path to the header or umbrella relative to the `clang::Module::Directory`. The exception to this case is for inferred modules. Here it actually is the name as written, because we print out the module and read it back in when implicitly building modules. This causes a problem when explicitly building an inferred module, as we skip the printing out step. In order to fix this issue this patch adds a new field for the path we want to use in `getInputBufferForModule`. It also makes `NameAsWritten` actually be the name written in the module map file (or that would be, in the case of an inferred module). rdar://58619519
This shows up with inferred modules, but it doesn't exist on disk, so don't report it as a dependency.
Bigcheese
force-pushed
the
scan-deps-apple-master
branch
from
124c28a to
21c4c10
Compare
|
I was not able to reproduce the previous test failure. Trying again. @swift-ci please test |
|
I was able to confirm that the failing tests were already failing on master, and aren't related to this change. |
jansvoboda11
pushed a commit
to llvm/llvm-project
that referenced
this pull request
May 17, 2021
This patch enables explicitly building inferred modules. Effectively a cherry-pick of swiftlang#699 authored by @Bigcheese with libclang and dependency scanner changes omitted. Contains the following changes: 1. [Clang] Fix the header paths in clang::Module for inferred modules. * The UmbrellaAsWritten and NameAsWritten fields in clang::Module are a lie for framework modules. For those they actually are the path to the header or umbrella relative to the clang::Module::Directory. * The exception to this case is for inferred modules. Here it actually is the name as written, because we print out the module and read it back in when implicitly building modules. This causes a problem when explicitly building an inferred module, as we skip the printing out step. * In order to fix this issue this patch adds a new field for the path we want to use in getInputBufferForModule. It also makes NameAsWritten actually be the name written in the module map file (or that would be, in the case of an inferred module). 2. [Clang] Allow explicitly building an inferred module. * Building the actual module still fails, but make sure it fails for the right reason. Split from D100934. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D102491
jansvoboda11
pushed a commit
to llvm/llvm-project
that referenced
this pull request
May 17, 2021
This patch adds support for inferred modules to the dependency scanner. Effectively a cherry-pick of swiftlang#699 authored by @Bigcheese with libclang and other changes omitted. Contains following changes: 1. [Clang][ScanDeps] Ignore __inferred_module.map dependency. * This shows up with inferred modules, but it doesn't exist on disk, so don't report it as a dependency. 2. [Clang][ScanDeps] Use the module map a module was inferred from for inferred modules. Also includes a smoke test that uses clang-scan-deps output to perform an explicit build. There's no intention to duplicate whatever `test/Modules` contains, just to verify the produced command-line does "work" (with very loose definition of work). Split from D100934. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D102495
arichardson
pushed a commit
to arichardson/llvm-project
that referenced
this pull request
Sep 12, 2021
This patch enables explicitly building inferred modules. Effectively a cherry-pick of swiftlang/llvm-project#699 authored by @Bigcheese with libclang and dependency scanner changes omitted. Contains the following changes: 1. [Clang] Fix the header paths in clang::Module for inferred modules. * The UmbrellaAsWritten and NameAsWritten fields in clang::Module are a lie for framework modules. For those they actually are the path to the header or umbrella relative to the clang::Module::Directory. * The exception to this case is for inferred modules. Here it actually is the name as written, because we print out the module and read it back in when implicitly building modules. This causes a problem when explicitly building an inferred module, as we skip the printing out step. * In order to fix this issue this patch adds a new field for the path we want to use in getInputBufferForModule. It also makes NameAsWritten actually be the name written in the module map file (or that would be, in the case of an inferred module). 2. [Clang] Allow explicitly building an inferred module. * Building the actual module still fails, but make sure it fails for the right reason. Split from D100934. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D102491
arichardson
pushed a commit
to arichardson/llvm-project
that referenced
this pull request
Sep 12, 2021
This patch adds support for inferred modules to the dependency scanner. Effectively a cherry-pick of swiftlang/llvm-project#699 authored by @Bigcheese with libclang and other changes omitted. Contains following changes: 1. [Clang][ScanDeps] Ignore __inferred_module.map dependency. * This shows up with inferred modules, but it doesn't exist on disk, so don't report it as a dependency. 2. [Clang][ScanDeps] Use the module map a module was inferred from for inferred modules. Also includes a smoke test that uses clang-scan-deps output to perform an explicit build. There's no intention to duplicate whatever `test/Modules` contains, just to verify the produced command-line does "work" (with very loose definition of work). Split from D100934. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D102495
vgvassilev
pushed a commit
to vgvassilev/clang
that referenced
this pull request
Dec 28, 2022
This patch enables explicitly building inferred modules. Effectively a cherry-pick of swiftlang/llvm-project#699 authored by @Bigcheese with libclang and dependency scanner changes omitted. Contains the following changes: 1. [Clang] Fix the header paths in clang::Module for inferred modules. * The UmbrellaAsWritten and NameAsWritten fields in clang::Module are a lie for framework modules. For those they actually are the path to the header or umbrella relative to the clang::Module::Directory. * The exception to this case is for inferred modules. Here it actually is the name as written, because we print out the module and read it back in when implicitly building modules. This causes a problem when explicitly building an inferred module, as we skip the printing out step. * In order to fix this issue this patch adds a new field for the path we want to use in getInputBufferForModule. It also makes NameAsWritten actually be the name written in the module map file (or that would be, in the case of an inferred module). 2. [Clang] Allow explicitly building an inferred module. * Building the actual module still fails, but make sure it fails for the right reason. Split from D100934. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D102491 llvm-monorepo: d3676d4b666ead794fc58bbc7e07aa406dcf487a
vgvassilev
pushed a commit
to vgvassilev/clang
that referenced
this pull request
Dec 28, 2022
This patch adds support for inferred modules to the dependency scanner. Effectively a cherry-pick of swiftlang/llvm-project#699 authored by @Bigcheese with libclang and other changes omitted. Contains following changes: 1. [Clang][ScanDeps] Ignore __inferred_module.map dependency. * This shows up with inferred modules, but it doesn't exist on disk, so don't report it as a dependency. 2. [Clang][ScanDeps] Use the module map a module was inferred from for inferred modules. Also includes a smoke test that uses clang-scan-deps output to perform an explicit build. There's no intention to duplicate whatever `test/Modules` contains, just to verify the produced command-line does "work" (with very loose definition of work). Split from D100934. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D102495 llvm-monorepo: 1d9e8e13dd7b3204fa51ada17d1608bdbd1bed66
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds an experimental C API to
clang-scan-depsand implements enough to build the Foundation module and everything it depends on. See individual commit messages for details.