Merge pull request #79549 from gottesmm/pr-1e29cd1e901335aa05ad7b07bbc832c30d7fc250

[rbi] Convert an assert to an if check.

Author: gottesmm

lib/SILOptimizer/Utils/SILIsolationInfo.cpp

@@ -14,7 +14,6 @@
 
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/Expr.h"
-#include "swift/Basic/Assertions.h"
 #include "swift/SIL/AddressWalker.h"
 #include "swift/SIL/ApplySite.h"
 #include "swift/SIL/InstructionUtils.h"
@@ -487,8 +486,8 @@ SILIsolationInfo SILIsolationInfo::get(SILInstruction *inst) {
                                                         nomDecl)
           .withUnsafeNonIsolated(varIsolation.isNonisolatedUnsafe());
 
-    if (auto isolation = swift::getActorIsolation(nomDecl)) {
-      assert(isolation.isGlobalActor());
+    if (auto isolation = swift::getActorIsolation(nomDecl);
+        isolation && isolation.isGlobalActor()) {
       return SILIsolationInfo::getGlobalActorIsolated(
                  rei, isolation.getGlobalActor())
           .withUnsafeNonIsolated(varIsolation.isNonisolatedUnsafe());

test/Concurrency/transfernonsendable.swift

@@ -31,6 +31,10 @@ class NonSendableKlass { // expected-complete-note 53{{}}
   func getSendableGenericStructAsync() async -> SendableGenericStruct { fatalError() }
 }
 
+nonisolated final class NonIsolatedFinalKlass {
+  var ns = NonSendableKlass()
+}
+
 class SendableKlass : @unchecked Sendable {}
 
 actor MyActor {
@@ -1955,3 +1959,12 @@ func unsafeNonIsolatedAppliesToAssignToOutParam(ns: NonSendableKlass) -> sending
     return obj
   }
 }
+
+extension NonIsolatedFinalKlass {
+  // We used to crash while computing the isolation of the ref_element_addr
+  // here. Make sure we do not crash.
+  func testGetIsolationInfoOfField() async {
+    await transferToMain(ns) // expected-tns-warning {{sending 'self.ns' risks causing data races}}
+    // expected-tns-note @-1 {{sending task-isolated 'self.ns' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and task-isolated uses}}
+  }
+}