Merge pull request swiftlang#60887 from kavon/5.7-tiny-combo-of-fixes

[5.7🍒] pair of small fixes

Author: DougGregor

lib/SILGen/SILGenProlog.cpp

@@ -733,7 +733,7 @@ void SILGenFunction::emitPrologGlobalActorHop(SILLocation loc,
 }
 
 SILValue SILGenFunction::emitLoadGlobalActorExecutor(Type globalActor) {
-  CanType actorType = CanType(globalActor);
+  CanType actorType = globalActor->getCanonicalType();
   NominalTypeDecl *nominal = actorType->getNominalOrBoundGenericNominal();
   VarDecl *sharedInstanceDecl = nominal->getGlobalActorInstance();
   assert(sharedInstanceDecl && "no shared actor field in global actor");

lib/Sema/TypeCheckConcurrency.cpp

@@ -124,10 +124,13 @@ bool swift::usesFlowSensitiveIsolation(AbstractFunctionDecl const *fn) {
   }
 
   auto *dc = fn->getDeclContext();
+  if (!dc)
+    return false;
 
   // Must be part of a nominal type.
   auto *nominal = dc->getSelfNominalTypeDecl();
-  assert(nominal && "init/deinit not part of a nominal?");
+  if (!nominal)
+    return false;
 
   // If it's part of an actor type, then its deinit and some of its inits use
   // flow-isolation.

test/SILGen/hop_to_executor_async_prop.swift

@@ -667,7 +667,9 @@ struct Blah {
     }
 }
 
-@MainActor
+typealias FancyActor = MainActor // helps cover rdar://96309577
+
+@FancyActor
 func getTemperature() -> Int { return 0 }
 
 @MainActor