Merge pull request #37142 from CodaFi/insert-send-rights

Author: CodaFi

lib/Sema/TypeCheckConcurrency.cpp

@@ -2597,7 +2597,8 @@ static Optional<ActorIsolation> getIsolationFromConformances(
     return None;
 
   Optional<ActorIsolation> foundIsolation;
-  for (auto proto : nominal->getLocalProtocols()) {
+  for (auto proto :
+       nominal->getLocalProtocols(ConformanceLookupKind::NonStructural)) {
     switch (auto protoIsolation = getActorIsolation(proto)) {
     case ActorIsolation::ActorInstance:
     case ActorIsolation::Unspecified:

test/Concurrency/Inputs/sendable_cycle_other.swift

@@ -0,0 +1,3 @@
+struct Foo {
+  static let member = Bar()
+}

test/Concurrency/sendable_cycle.swift

@@ -0,0 +1,10 @@
+// RUN: %target-typecheck-verify-swift %S/Inputs/sendable_cycle_other.swift -enable-experimental-concurrency
+// REQUIRES: concurrency
+
+struct Bar {
+  lazy var foo = {
+    self.x()
+  }
+
+  func x() -> Int { 42 }
+}

test/Sema/option-set-empty.swift

@@ -1,8 +1,6 @@
 // RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 struct SomeOptions: OptionSet {
-  // expected-error@-1{{circular reference}}
-  // expected-note@-2 2{{through reference here}}
     var rawValue: Int
 
     static let some = MyOptions(rawValue: 4)
@@ -12,7 +10,6 @@ struct SomeOptions: OptionSet {
     let someVal = MyOptions(rawValue: 6)
     let option = MyOptions(float: Float.infinity)
     let none = SomeOptions(rawValue: 0) // expected-error {{value type 'SomeOptions' cannot have a stored property that recursively contains it}}
-  // expected-note@-1 3{{through reference here}}
 }
 
 struct MyOptions: OptionSet {