Skip to content

[release/5.10] Support Xcode 15.1 Beta 2 #69660

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

Merged
merged 5 commits into from
Jan 8, 2024
Merged

[release/5.10] Support Xcode 15.1 Beta 2 #69660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c10b7f1
[NFC] Update dispatch test for new preconcurrency annotations.
hborla Aug 1, 2023
25d844c
[Disable] test/ClangImporter/Dispatch_test.swift as the test should b…
shahmishal Oct 28, 2023
4c0b475
[Disable] Skip running llbuild test until issue is resolved https://g…
shahmishal Oct 29, 2023
c452d4e
Do not install install-libcxx
shahmishal Nov 1, 2023
2357443
Merge remote-tracking branch 'origin/release/5.10' into 5.10-xcode-15…
shahmishal Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/ClangImporter/Dispatch_test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// RUN: %target-typecheck-verify-swift

// REQUIRES: rdar112865148

// REQUIRES: libdispatch
// UNSUPPORTED: OS=linux-gnu
// UNSUPPORTED: OS=linux-android
Expand Down
4 changes: 2 additions & 2 deletions test/Concurrency/dispatch_inference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ func testMe() {
func testUnsafeSendableInMainAsync() async {
var x = 5
DispatchQueue.main.async {
x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}}
x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}}
}
print(x)
}

func testUnsafeSendableInAsync(queue: DispatchQueue) async {
var x = 5
queue.async {
x = 17 // expected-error{{mutation of captured var 'x' in concurrently-executing code}}
x = 17 // expected-warning{{mutation of captured var 'x' in concurrently-executing code}}
}

queue.sync {
Expand Down
9 changes: 4 additions & 5 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ install-llbuild
install-swiftpm
install-swift-driver
install-swiftsyntax
install-libcxx

[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
Expand Down Expand Up @@ -644,7 +643,6 @@ install-llbuild
install-swiftpm
install-swiftsyntax
install-swift-driver
install-libcxx

# We need to build the unittest extras so we can test
build-swift-stdlib-unittest-extra
Expand Down Expand Up @@ -1603,7 +1601,6 @@ libcxx
install-llvm
install-swift
install-swiftsyntax
install-libcxx

# Build Playground support
playgroundsupport
Expand Down Expand Up @@ -1661,7 +1658,6 @@ install-llbuild
install-swiftpm
install-swift-driver
install-swiftsyntax
install-libcxx
install-swiftdocc

# Build the stress tester and SwiftEvolve
Expand All @@ -1687,6 +1683,10 @@ sil-verify-all-macos-only
skip-test-ios-host
skip-test-watchos-host

# Skip LLBuild test until GitHub issue is fixed:
# https://github.com/apple/swift-llbuild/issues/894
skip-test-llbuild

[preset: llvm_project_pull_request]
mixin-preset=buildbot_all_platforms,tools=RA,stdlib=RA

Expand Down Expand Up @@ -1741,7 +1741,6 @@ install-swift
install-llbuild
install-swiftpm
install-swiftsyntax
install-libcxx

skip-test-swift
skip-test-cmark
Expand Down