Merge main into release/6.3
#927
Open
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
Do not pass index store options if indexing is disabled
Use the platform of a stub binary when looking up compatible architectures
…arning. rdar://164578995
…d warning. rdar://164578985
The title appears in two places; one of them was still backwards.
We were still going through the lock once for every `MacroValueAssignment` which was causing performance issues during config file parsing. This didn't really make sense since we can instead do the insert in `MacroConfigFileParser` and otherwise only deal in index references. Real locations only need to be materialized for code that deals with them. rdar://164650188
Fix IndexDependencyResolutionTests when EnableDebugActivityLogs is enabled
Cleanup targetArchitecture handling in macOS test run destination
FreeBSD's pkg returns 1 if a package isn't installed. Across all platforms, we really only care about parsing the tool's output, not whether it exited successfully or not. This allows tests to be properly skipped on FreeBSD when the requisite tool is not installed.
Whatever toolchain issue caused this to originally be skipped is no longer present.
This avoids incorrectly diagnosing an entitlements change during the build.
Stop passing -fobjc-arc to linker invocations
A couple incremental entitlements processing / signing fixes
On Linux, chown is at /usr/bin/chown, while on BSDs it's at /usr/sbin/chown It was also being incorrectly located based on the target platform, which is incorrect. Only the host platform matters for this lookup. This meant macOS to Android or WebAssembly cross compilation, FreeBSD to Linux cross compilation, or FreeBSD native compilation could have failed if the build graph contained any chown commands. Also use a search path so we don't have to hardcode knowledge of any specific platform for this.
…rror formats. rdar://164727713
Correct linker file list escaping depending on the LINKER_DRIVER used
Flip direction of the 6.3 merge workflow
owenv
requested review from
jakepetroules,
jonathanpenn and
mhrawdon
as code owners
Collaborator
|
@swift-ci test |
owenv
approved these changes
Nov 17, 2025
jakepetroules
approved these changes
Nov 17, 2025
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 PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.