[6.3] Do not pass index store options if indexing is disabled #923
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
We were passing `-index-store-compress` to the compiler even though we don’t pass `-index-store-path` if `INDEX_STORE_ENABLE = YES` but `COMPILER_INDEX_STORE_ENABLE = NO`. This is because `CLANG_INDEX_STORE_ENABLE` still evaluated to `YES` and thus the `Condition` of `CLANG_INDEX_STORE_COMPRESS` also evaluated to `YES` but we didn’t pass `-index-store-path` because the condition of `CLANG_INDEX_STORE_ENABLE` evaluated to `NO`. This was a misconception on my side when I added these build settings because I assumed that the `Condition` would influence the value of the build setting instead of just influencing `ComandLineArgs`. I don’t like how we need to repeat the same condition in multiple build settings now but haven’t found a better solution. rdar://164248532
ahoppen
requested review from
aciidgh,
jakepetroules,
mhrawdon,
neonichu and
owenv
as code owners
Member
Author
|
@swift-ci Please test |
Collaborator
|
@ahoppen we're going to end up auto merging main into 6.3 for a bit so this should get included automatically once the first 6.3 toolchain gets released to unblock CI |
Member
Author
|
👍 Even better |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
-index-store-compressto the compiler even though we don’t pass-index-store-pathifINDEX_STORE_ENABLE = YESbutCOMPILER_INDEX_STORE_ENABLE = NO. This is becauseCLANG_INDEX_STORE_ENABLEstill evaluated toYESand thus theConditionofCLANG_INDEX_STORE_COMPRESSalso evaluated toYESbut we didn’t pass-index-store-pathbecause the condition ofCLANG_INDEX_STORE_ENABLEevaluated toNO.This was a misconception on my side when I added these build settings because I assumed that the
Conditionwould influence the value of the build setting instead of just influencingComandLineArgs.