[20210107][index] Add macro definitions to the index store #2803
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
The major change here is to index macro occurrences in more places than before, specifically * In non-expansion references such as `#if`, `#ifdef`, etc. * When the macro is a reference to a builtin macro such as __LINE__. * When using the preprocessor state instead of callbacks, we now include all definition locations and undefinitions instead of just the latest one (which may also have had the wrong location previously). * When indexing an existing module file (.pcm), we now include module macros, and we no longer report unrelated preprocessor macros during indexing the module, which could have caused duplication. Additionally, we now correctly obey the system symbol filter for macros, so by default in system headers only definition/undefinition occurrences are reported, but it can be configured to report references as well if desired. Extends FileIndexRecord to support occurrences of macros. Since the design of this type is to keep a single list of entities organized by source location, we incorporate macros into the existing DeclOccurrence struct. Differential Revision: https://reviews.llvm.org/D99758
This is a minimal change to fix the build/tests; a change to actually use the new macro support is forthcoming.
Add support for indexing macro definitions, undefs, and references in the index store. In the normal case of compiling source files the macros are indexed using preprocessor callbacks that include every reference. When we are instead indexing a module that has already been compiled (.pcm), we get the module macros from the preprocessor, and only one definition is found. Macro indexing is enabled by default, but can be disabled using a new -index-ignore-macros driver flag. rdar://47815401
|
@swift-ci please test |
|
@swift-ci please test macOS |
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.
Cherry-pick 93c87fc, 2934d72, and cb756c2 to apple/stable/20210107 branch.
Originally reviewed #2740 and https://reviews.llvm.org/D99758
Add support for indexing macro definitions, undefs, and references in
the index store. In the normal case of compiling source files the macros
are indexed using preprocessor callbacks that include every reference.
When we are instead indexing a module that has already been compiled
(.pcm), we get the module macros from the preprocessor, and only
one definition is found.
Macro indexing is enabled by default, but can be disabled using a new
-index-ignore-macros driver flag.
rdar://47815401