[SILGen] correct missing canonicalization of global actor

kavon · kavon · commit f512c4bf04f6 · 2022-08-31T14:57:21.000-07:00
resolves rdar://96309577 / #59705
diff --git a/lib/SILGen/SILGenProlog.cpp b/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");
diff --git a/test/SILGen/hop_to_executor_async_prop.swift b/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

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ void SILGenFunction::emitPrologGlobalActorHop(SILLocation loc,`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`SILValue SILGenFunction::emitLoadGlobalActorExecutor(Type globalActor) {`
`736`		`- CanType actorType = CanType(globalActor);`
	`736`	`+ CanType actorType = globalActor->getCanonicalType();`
`737`	`737`	`NominalTypeDecl *nominal = actorType->getNominalOrBoundGenericNominal();`
`738`	`738`	`VarDecl *sharedInstanceDecl = nominal->getGlobalActorInstance();`
`739`	`739`	`assert(sharedInstanceDecl && "no shared actor field in global actor");`
Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,9 @@ struct Blah {`
`667`	`667`	`}`
`668`	`668`	`}`
`669`	`669`
`670`		`-@MainActor`
	`670`	`+typealias FancyActor = MainActor // helps cover rdar://96309577`
	`671`	`+`
	`672`	`+@FancyActor`
`671`	`673`	`func getTemperature() -> Int { return 0 }`
`672`	`674`
`673`	`675`	`@MainActor`