Skip to content

Merge main into release/6.2 #472

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 44 commits into from
May 1, 2025
Merged

Conversation

github-actions[bot]
Copy link

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.

usama54321 and others added 30 commits April 23, 2025 15:19
The motivation here is to make back deployment easier by conditionally
linking in a shim layer in the clang driver.

rdar://149709799
…ostics with target location (rdar://149397709)"

This reverts commit f97263c.

This seems to trigger conflicting target info in client events. Reverting while I investigate.
These now go through Foundation rather than Win32 APIs directly. This simplifies Unicode and long path handling in particular.

For realpath I left the POSIX implementation in place for non-Windows for now since it's not clear that has equivalent behavior. touch/setFileTimestamp now differ in that they no longer set atime, but virtually nothing uses atime.
This overload was only meant to be used in one place, and its behavior was a little confusing, since it does not actually run the work on the queue. Over time, this overload got used in a few other places due to overload resolution picking it up, and turning formerly synchronous work asynchronous. Remove it to restore the intended behavior.
libcxx changed the name of the macro used to include sanitizer container annotations.

We should add the new flag name to maintain current behavior.

Sanitizer container overflow checks are prone to false positives, so we default to disabling these on xcode projects.

rdar://149350723
…set to NO, but is set to YES in your entitlements file.' warning (#433)
…-linker-arg

Pass -ftyped-cxx-new-delete as a linker arg.
… an opt-out build setting SWIFT_DISABLE_INCREMENTAL_SCAN in case early adoption shows any troubles
[Explicit Module Builds] Enable incremental dependency scanning
This setting controls default actor isolation for unannotated code.

Resolves: rdar://145751834
Add new libcxx flag for disabling container overflow checks for Asan.
[SE-0466] Add SWIFT_DEFAULT_ACTOR_ISOLATION build setting
- Make --sysroot-path optional
- Fail early if --disable-sandbox is not passed
- Use SwiftPM's checkouts of dependencies instead of assuming the update-checkout layout
The text now reads "2 hits / 4 cacheable tasks (50%)".
The intention of the change is to avoid "miss" which can have negative associations.
Our xcspecs in particular expect to exist with Unix newlines, and some tests may fail depending on git's autocrlf settings on Windows. Just standardize the newlines to keep everything consistent.
There's various paths that should be specific to the index workspace
description rather than if the index arena is enabled. Specifically the
recent change to replace parameters for host tools
(#345) broke the *package*
description as it uses the passed in run destination rather than
configuring for all platforms. This replacement would then create two
configured targets for macOS for the same target (one for the given run
destination and one for the macOS platform that the index uses).

This also changes the *target* description to only build for the run
destination, which makes sense given its entire purpose is to be a
replacement for the workspace description if it hasn't built yet (ie. it
should be as fast as possible).

Resolves rdar://149896775.
Add missing host SDK requirement to test
This renames occurrences of "master" in relation to this feature to "prelink" or "prelinked". There are 3 remaining exceptions, which is to default the GENERATE_PRELINK_OBJECT_FILE build setting to GENERATE_MASTER_OBJECT_FILE for backwards compatibility.
This is still used by, e.g., Swift LTO.

rdar://150188689
shahmishal and others added 14 commits April 29, 2025 01:51
* [CI] Add support for GitHub Actions
* Update the license headers
Export CMake targets for use by SwiftPM
Add missing license header to CMake filewq
These just need simple synchronization; use a mutex instead.
Add automerge action for scheduled updates to release branch
Add a DispatchIO-based helper which returns the data asynchronously.
…r-flag

Add -ftyped-cxx-delete to CLANG_ENABLE_CPLUSPLUS_TYPED_ALLOCATOR_SUPPORT

rdar://150337166
Enable testing in GitHub Actions workflows
Missed this in #452, just going it add it for now while we're merging branches around to reduce the chance of things going wrong.
@owenv
Copy link
Collaborator

owenv commented Apr 30, 2025

@swift-ci test

@owenv owenv marked this pull request as ready for review April 30, 2025 22:53
@owenv owenv merged commit 7ce677e into release/6.2 May 1, 2025
4 checks passed
@owenv owenv deleted the automerge/merge-main-2025-04-30_22-51 branch May 1, 2025 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.