Skip to content
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

Jump to bottom

[stdlib] Update platform versions for SwiftStdlib 5.6; define placeholders for SwiftStdlib 5.7 #41046

Merged
merged 3 commits into from Jan 29, 2022
Merged

[stdlib] Update platform versions for SwiftStdlib 5.6; define placeholders for SwiftStdlib 5.7 #41046

merged 3 commits into from Jan 29, 2022
+6 −7

Conversation

@lorentey
Copy link
Member

@lorentey lorentey commented Jan 27, 2022 •
edited

Set platform version numbers for SwiftStdlib 5.6 to match the SDK releases that shipped with Xcode 13.3 beta 1.

Define the SwiftStdlib 5.7 macro with placeholder version numbers, and update APIs that are currently scheduled to ship from the main branch to use this instead of the generic SwiftStdlib 9999.

rdar://88154764
@lorentey lorentey requested a review from stephentyrone Jan 27, 2022
lorentey added 2 commits Jan 27, 2022
@lorentey
[stdlib] Define platform version numbers for SwiftStdlib 5.6
aa3b48f
@lorentey
[stdlib] Define placeholder version numbers for SwiftStdlib 5.7
61268aa 
Also update existing declarations with SwiftStdlib 9999 availability to use the 5.7 name.
@lorentey lorentey force-pushed the define-stdlib-version-5.7 branch from 91272f4 to 61268aa Jan 27, 2022
@lorentey
Copy link
Member Author

@lorentey lorentey commented Jan 27, 2022

@swift-ci test

lorentey added a commit to lorentey/swift that referenced this issue Jan 27, 2022
@lorentey
[5.6][stdlib] Define platform version numbers for SwiftStdlib 5.6
bf84340 
(Cherry picked from aa3b48f in apple#41046)
@lorentey lorentey mentioned this pull request Jan 27, 2022
Open
@swift-ci
Copy link
Contributor

@swift-ci swift-ci commented Jan 28, 2022

Build failed
Swift Test OS X Platform
Git Sha - 61268aa

@lorentey
Copy link
Member Author

@lorentey lorentey commented Jan 28, 2022 

--- /Users/buildnode/jenkins/workspace/swift-PR-macos/branch-main/swift/test/api-digester/Outputs/cake.json	2022-01-27 14:45:11.000000000 -0800
+++ /Users/buildnode/jenkins/workspace/swift-PR-macos/branch-main/buildbot_incremental/swift-macosx-x86_64/test-macosx-x86_64/api-digester/Output/dump-module.swift.tmp.dump.json	2022-01-27 16:59:22.000000000 -0800
@@ -1713,8 +1713,7 @@
           "name": "CodingKeyRepresentable",
           "printedName": "CodingKeyRepresentable",
           "usr": "s:s22CodingKeyRepresentableP",
-          "mangledName": "$ss22CodingKeyRepresentableP",
-          "isABIPlaceholder": true
+          "mangledName": "$ss22CodingKeyRepresentableP"
         },
         {
           "kind": "Conformance",

--

This may be a related failure.

@lorentey
Copy link
Member Author

@lorentey lorentey commented Jan 28, 2022 

/Users/buildnode/jenkins/workspace/swift-PR-macos/branch-main/swift/test/Sanitizers/tsan/racy_async_let_fibonacci.swift:70:11: error: CHECK: expected string not found in input
// CHECK: ThreadSanitizer: Swift access race
          ^

This is definitely unrelated.

@lorentey
Copy link
Member Author

@lorentey lorentey commented Jan 28, 2022

@swift-ci test

@swift-ci
Copy link
Contributor

@swift-ci swift-ci commented Jan 28, 2022

Build failed
Swift Test OS X Platform
Git Sha - d94ed86

@benrimmington
Copy link
Collaborator

@benrimmington benrimmington commented Jan 28, 2022

You may need to update cake.json and cake-abi.json as well.

@lorentey lorentey force-pushed the define-stdlib-version-5.7 branch from d94ed86 to f36a72e Jan 29, 2022
@lorentey
Copy link
Member Author

@lorentey lorentey commented Jan 29, 2022

@swift-ci test

@lorentey lorentey merged commit 63b752e into apple:main Jan 29, 2022
5 checks passed
@lorentey lorentey deleted the define-stdlib-version-5.7 branch Jan 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephentyrone stephentyrone

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@lorentey @swift-ci @benrimmington