Skip to content

Typos: test/concurrency #75031

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 1 commit into from
Jul 8, 2024
Merged

Typos: test/concurrency #75031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion test/Concurrency/isolated_parameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ actor MyActor {
func hello() {} // expected-typechecker-note {{calls to instance method 'hello()' from outside of its actor context are implicitly asynchronous}}
}

// Compiler >= 5.3 is eneded to suppress the parser error
// Compiler >= 5.3 is ended to suppress the parser error
#if compiler(>=5.3) && ALLOW_TYPECHECKER_ERRORS
typealias MyFn = (isolated: Int) -> Void // expected-typechecker-error {{function types cannot have argument labels; use '_' before 'isolated'}}
#endif
Expand Down
4 changes: 2 additions & 2 deletions test/Concurrency/sendable_objc_attr_in_type_context_swift5_strict.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ func test_sendable_attr_in_type_context(test: Test) {

_ = TestWithSendableID<SendableValue>() // Ok

// TOOD(diagnostics): Duplicate diagnostics
// TODO(diagnostics): Duplicate diagnostics
TestWithSendableID().add(MyValue())
// expected-warning@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}

TestWithSendableSuperclass().add(SendableMyValue()) // Ok

// TOOD(diagnostics): Duplicate diagnostics
// TODO(diagnostics): Duplicate diagnostics
TestWithSendableSuperclass().add(MyValue())
// expected-warning@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}
}
Expand Down
4 changes: 2 additions & 2 deletions test/Concurrency/sendable_objc_attr_in_type_context_swift6.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ func test_sendable_attr_in_type_context(test: Test) {

_ = TestWithSendableID<SendableValue>() // Ok

// TOOD(diagnostics): Duplicate diagnostics
// TODO(diagnostics): Duplicate diagnostics
TestWithSendableID().add(MyValue())
// expected-error@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}

TestWithSendableSuperclass().add(SendableMyValue()) // Ok

// TOOD(diagnostics): Duplicate diagnostics
// TODO(diagnostics): Duplicate diagnostics
TestWithSendableSuperclass().add(MyValue())
// expected-error@-1 3 {{type 'MyValue' does not conform to the 'Sendable' protocol}}
}
Expand Down
12 changes: 6 additions & 6 deletions test/Concurrency/sending_mangling.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func testNoRemoveFunctionResultSubTypeResult() -> sending S<() -> sending NonSen
// CHECK: sil hidden [ossa] @sending_mangling.testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> (sending __owned sending_mangling.NonSendableKlass) -> () : $@convention(thin) () -> @owned @callee_guaranteed (@sil_sending @owned NonSendableKlass) -> () {
func testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> ((sending NonSendableKlass) -> ()) { fatalError() }

// CHECK: sil hidden [ossa] @sending_mangling.testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(thin) () -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
func testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
// CHECK: sil hidden [ossa] @sending_mangling.testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(thin) () -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
func testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }

struct MethodTest {
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.init(__owned sending_mangling.NonSendableKlass) -> sending_mangling.MethodTest : $@convention(method) (@sil_sending @owned NonSendableKlass, @thin MethodTest.Type) -> MethodTest {
Expand Down Expand Up @@ -61,8 +61,8 @@ struct MethodTest {
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> (sending __owned sending_mangling.NonSendableKlass) -> () : $@convention(method) (MethodTest) -> @owned @callee_guaranteed (@sil_sending @owned NonSendableKlass) -> () {
func testNoRemoveFunctionResultImmediateTypedFunctionWithArg() -> ((sending NonSendableKlass) -> ()) { fatalError() }

// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(method) (MethodTest) -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
func testNoRemoveFunctionResultImmedateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
// CHECK: sil hidden [ossa] @sending_mangling.MethodTest.testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> () -> sending sending_mangling.NonSendableKlass : $@convention(method) (MethodTest) -> @owned @callee_guaranteed () -> @sil_sending @owned NonSendableKlass {
func testNoRemoveFunctionResultImmediateTypedFunctionWithResult() -> (() -> sending NonSendableKlass) { fatalError() }
}

protocol SendingProtocol {
Expand Down Expand Up @@ -107,6 +107,6 @@ struct ConstructorSharedTest {

// This is a func which takes its parameter at +0 so we should suppress both.
//
// CHECK: sil hidden [ossa] @sending_mangling.ConstructorSharedTest.functionSupressed(sending_mangling.NonSendableKlass) -> () : $@convention(method) (@sil_sending @guaranteed NonSendableKlass, ConstructorSharedTest) -> () {
func functionSupressed(_ x: __shared sending NonSendableKlass) {}
// CHECK: sil hidden [ossa] @sending_mangling.ConstructorSharedTest.functionSuppressed(sending_mangling.NonSendableKlass) -> () : $@convention(method) (@sil_sending @guaranteed NonSendableKlass, ConstructorSharedTest) -> () {
func functionSuppressed(_ x: __shared sending NonSendableKlass) {}
}
6 changes: 3 additions & 3 deletions test/Concurrency/transfernonsendable_closureliterals_isolationinference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func useValue<T>(_ x: T) { }

@CustomActor
func test_CallerSyncNormal_CalleeSyncNonIsolated() async {
// Just to help start our pattern matchin since the closure #$NUM line
// Just to help start our pattern matching since the closure #$NUM line
// appears in other parts of the file.
// CHECK-LABEL: } // end sil function '$s54transfernonsendable_closureliterals_isolationinference028test_CallerSyncNormal_CalleeF11NonIsolatedyyYaF'

Expand Down Expand Up @@ -270,7 +270,7 @@ func test_CallerSyncInheritsActorContext_CalleeAsyncMainActorIsolated() async {

@CustomActor
func test_CallerAsyncNormal_CalleeSyncNonIsolated() async {
// Just to help start our pattern matchin since the closure #$NUM line
// Just to help start our pattern matching since the closure #$NUM line
// appears in other parts of the file.
// CHECK-LABEL: } // end sil function '$s54transfernonsendable_closureliterals_isolationinference44test_CallerAsyncNormal_CalleeSyncNonIsolatedyyYaF'

Expand Down Expand Up @@ -582,7 +582,7 @@ extension MyActor {
extension MyActor {

func test_CallerAsyncNormal_CalleeSyncNonIsolated() async {
// Just to help start our pattern matchin since the closure #$NUM line
// Just to help start our pattern matching since the closure #$NUM line
// appears in other parts of the file.
// CHECK-LABEL: } // end sil function '$s54transfernonsendable_closureliterals_isolationinference7MyActorC44test_CallerAsyncNormal_CalleeSyncNonIsolatedyyYaF'

Expand Down
2 changes: 1 addition & 1 deletion test/Concurrency/transfernonsendable_sending_results.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func simpleTest() async {
useValue(y)
}

// Since y is transfered, we should emit the error on useValue(x). We generally
// Since y is transferred, we should emit the error on useValue(x). We generally
// emit the first seen error on a path, so if we were to emit an error on
// useValue(y), we would have emitted that error.
func simpleTest2() async {
Expand Down