Skip to content

[main] Support Xcode 15.1 Beta 2 #69482

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 8 commits into from
Jan 8, 2024
Merged

[main] Support Xcode 15.1 Beta 2 #69482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bccaa50
[NFC] Update dispatch test for new preconcurrency annotations.
hborla Aug 1, 2023
64cf590
Revert "XFail SceneKit_test"
shahmishal Oct 28, 2023
9c4bc9a
[Disable] test/ClangImporter/Dispatch_test.swift as the test should b…
shahmishal Oct 28, 2023
ea67ce3
[Disable] Concurrency/dispatch_inference.swift https://github.com/app…
shahmishal Oct 28, 2023
5bc7c39
[Disable] Skip running llbuild test until issue is resolved https://g…
shahmishal Oct 29, 2023
128e21a
Do not install install-libcxx
shahmishal Nov 1, 2023
043f964
Merge remote-tracking branch 'origin/main' into xcode-15-1-b2-test
shahmishal Jan 5, 2024
8d165df
Merge remote-tracking branch 'origin/main' into xcode-15-1-b2-test
shahmishal Jan 6, 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: 0 additions & 4 deletions test/ClangImporter/SceneKit_test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
// REQUIRES: objc_interop
// REQUIRES: OS=macosx

// SceneKit has two protocols sections, which clang treats as an error now
// rdar://113874614
// XFAIL: *

import SceneKit
import Foundation

Expand Down
6 changes: 4 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 @@ -3,6 +3,8 @@
// RUN: %target-swift-frontend -disable-availability-checking %import-libdispatch -strict-concurrency=complete %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
// RUN: %target-swift-frontend -disable-availability-checking %import-libdispatch -strict-concurrency=complete %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation

// https://github.com/apple/swift/issues/69481
// REQUIRES: GH69481
// REQUIRES: concurrency
// REQUIRES: libdispatch
// REQUIRES: asserts
Expand All @@ -22,15 +24,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 @@ -396,7 +396,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 @@ -604,7 +603,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 @@ -1564,7 +1562,6 @@ libcxx
install-llvm
install-swift
install-swiftsyntax
install-libcxx

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

# Build the stress tester
Expand All @@ -1647,6 +1643,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 @@ -1701,7 +1701,6 @@ install-swift
install-llbuild
install-swiftpm
install-swiftsyntax
install-libcxx

skip-test-swift

Expand Down