Skip to content

Add support for the libswiftCompatibilitySpan.dylib backward deployment library #642

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
Jul 8, 2025
Merged

Add support for the libswiftCompatibilitySpan.dylib backward deployment library #642

merged 8 commits into from
Jul 8, 2025

Conversation

DougGregor
Copy link
Member

The Swift library libswiftCompatibilitySpan.dylib allows uses of Span, MutableSpan, etc. to deploy to earlier OS versions. Detect when it is needed and copy it into the build artifact.

@DougGregor
Copy link
Member Author

@swift-ci please test

1 similar comment
@DougGregor
Copy link
Member Author

@swift-ci please test

@jakepetroules
Copy link
Collaborator

Note that we need this in release/6.2. You can either cherry pick it there afterwards, or land it in release/6.2 first and it'll be automatically forwarded to main.

Also, @slavapestov opened a PR for this a couple months ago (#359), I guess we should close that one now.

@DougGregor
Copy link
Member Author

Ah, I can replace this with one that targets release/6.2. Didn't realize that's how swift-build is handling branching.

jakepetroules
jakepetroules requested changes Jul 4, 2025
View reviewed changes
@jakepetroules jakepetroules mentioned this pull request Jul 4, 2025
Closed
@jakepetroules
Copy link
Collaborator

Ah, I can replace this with one that targets release/6.2. Didn't realize that's how swift-build is handling branching.

Yeah, we have a custom job set up... bit different from the rest of swiftlang.

FYI, you can just change the PR's target branch and force push without needing to open a new PR.

@jakepetroules
Copy link
Collaborator

jakepetroules commented Jul 4, 2025 •
edited
Loading

The Windows failures:

× Test debuggableCommandLineTool() recorded an issue at BuildOperationTests.swift:390:17: Expectation failed: (executionResult.exitStatus → terminated with uncaught signal 309) == (.exit(0) → exited with status 0)

...look like STATUS_DLL_NOT_FOUND, meaning the binary that's running is failing to find some dependent DLL.

EDIT: not a blocker, this is showing up everywhere.

slavapestov and others added 3 commits July 7, 2025 11:58
@slavapestov @DougGregor
Add support for the libswiftCompatibilitySpan.dylib backward deployme…
20966fc 
…nt library
@DougGregor
Improve handling of Span back-deployment library bundling
94abd81 
A couple of related fixes:
* Use 26.0 as the fallback version number when SDKSettings doesn't include SwiftSpanMinimumDeploymentTarget
* Update tests to expect `--back-deploy-swift-span` and check when it shouldn't be there
@DougGregor @owenv
Further handling of Swift back deployment + e2e tests
90d556b 
Co-authored-by: Owen Voorhees <[email protected]>
@DougGregor DougGregor force-pushed the compatibility-span branch from 80215d6 to f64487d Compare July 7, 2025 19:00
@DougGregor DougGregor requested a review from jonathanpenn as a code owner July 7, 2025 19:00
@DougGregor DougGregor changed the base branch from main to release/6.2 July 7, 2025 19:00
owenv
owenv approved these changes Jul 7, 2025
View reviewed changes
Copy link
Collaborator

@owenv owenv left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good to me. There's a chance some more tests might need tweaks since CI is on Xcode 16.2 and associated SDKs, but we'll see.

@owenv
Copy link
Collaborator

owenv commented Jul 7, 2025

@swift-ci test

@DougGregor DougGregor force-pushed the compatibility-span branch from f64487d to 6b581ea Compare July 7, 2025 19:09
@DougGregor
Copy link
Member Author

@swift-ci please test

@DougGregor
Copy link
Member Author

FYI, you can just change the PR's target branch and force push without needing to open a new PR.

Yep, done!

@jakepetroules
Copy link
Collaborator

@swift-ci test macos

@jakepetroules
Copy link
Collaborator

I misread the CI results -- there's a few which still need adjustment. Here's a link to the last failing run: https://ci.swift.org/job/pr-swift-build-macos/1004/console

@DougGregor
Copy link
Member Author

@owenv has a suggestion for making the tests run properly on older Xcodes, I'll get that pushed soon

@DougGregor
Introduce a hack to allow testing Span back-deployment on older Xcode…
334460e 
… versions

Xcode versions that predate Xcode 26 don't include the Span
back-deployment library. Introduce a hack to make it easier to still
test with those Xcode versions.
@DougGregor
Copy link
Member Author

@swift-ci test

@DougGregor
Copy link
Member Author

@swift-ci please test

@DougGregor
Copy link
Member Author

@swift-ci please test Linux

@DougGregor
Copy link
Member Author

@swift-ci please test

@DougGregor DougGregor merged commit 187d0ae into swiftlang:release/6.2 Jul 8, 2025
23 of 24 checks passed
@DougGregor DougGregor deleted the compatibility-span branch July 8, 2025 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jakepetroules jakepetroules jakepetroules approved these changes

@owenv owenv owenv approved these changes

@aciidgh aciidgh Awaiting requested review from aciidgh aciidgh is a code owner

@mirza-garibovic mirza-garibovic Awaiting requested review from mirza-garibovic mirza-garibovic is a code owner

@mhrawdon mhrawdon Awaiting requested review from mhrawdon mhrawdon is a code owner

@neonichu neonichu Awaiting requested review from neonichu neonichu is a code owner

@jonathanpenn jonathanpenn Awaiting requested review from jonathanpenn

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@DougGregor @jakepetroules @owenv @slavapestov