Skip to content

[6.0] Two small cherry-picks to improve build stability #73232

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 2 commits into from
Apr 25, 2024
Merged

[6.0] Two small cherry-picks to improve build stability #73232

merged 2 commits into from
Apr 25, 2024

Conversation

gottesmm
Copy link
Contributor

Explanation: This contains two small cherry-picks to improve build stability:

  1. The first adds a missing cake dependency from the stdlib on SwiftMacros. We even on 6.0 use macros and without this we race in between building stdlibcore and SwiftMacros. This can cause non-deterministic failures. The commit just adds the dependency in the same manner that we already do for swift-frontend. rdar://126998047
  2. This just adds REQUIRES: asserts to a test. This will prevent us from running the test without asserts and avoid compiler failure. rdar://126006489

Original PRs:

Risk: Low.
Testing: Verified REQUIRES: asserts fixes the issue locally. Validated locally that the new dependency fixes the race.
Reviewer: N/A

gottesmm added 2 commits April 24, 2024 16:40
@gottesmm
[cmake] Make the hosttools lib SwiftMacros a dependency of the stdlib…
740f299 
… when we aren't cross compiling.

This just matches the dependency behavior of the stdlib for swift-frontend. So
we should always have SwiftMacros as needed.

rdar://126998047
(cherry picked from commit b6e9c9c)
@gottesmm
[concurrency] Add REQUIRES: asserts to a test.
783d654 
(cherry picked from commit a3d95b9)
@gottesmm gottesmm requested a review from a team as a code owner April 24, 2024 21:46
@gottesmm
Copy link
Contributor Author

@swift-ci test

@gottesmm gottesmm enabled auto-merge April 25, 2024 03:30
@gottesmm gottesmm merged commit 6406030 into swiftlang:release/6.0 Apr 25, 2024
@gottesmm gottesmm deleted the release/6.0-misc-cherry-picks branch April 25, 2024 03:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hborla hborla hborla approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gottesmm @hborla