Merge pull request swiftlang#60861 from kavon/overly-sweet-mainactor-96309577

swift-ci · web-flow · commit 9234cd66a37b · 2022-08-30T21:25:35.000-07:00
[SILGen] correct missing canonicalization of global actor
diff --git a/lib/SILGen/SILGenProlog.cpp b/lib/SILGen/SILGenProlog.cpp
@@ -823,7 +823,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
`@@ -823,7 +823,7 @@ void SILGenFunction::emitPrologGlobalActorHop(SILLocation loc,`
`823`	`823`	`}`
`824`	`824`
`825`	`825`	`SILValue SILGenFunction::emitLoadGlobalActorExecutor(Type globalActor) {`
`826`		`- CanType actorType = CanType(globalActor);`
	`826`	`+ CanType actorType = globalActor->getCanonicalType();`
`827`	`827`	`NominalTypeDecl *nominal = actorType->getNominalOrBoundGenericNominal();`
`828`	`828`	`VarDecl *sharedInstanceDecl = nominal->getGlobalActorInstance();`
`829`	`829`	`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`