[5.5-05142021] Fix ClassDecl::isRootDefaultActor to use the maximal resilience expansion (#37786)

aschwaighofer · web-flow · commit d96fea5dda91 · 2021-06-04T13:53:59.000-07:00
Otherwise, we fail to emit default actor layout fields and intialization
and deintialization routine calls.

Meaning that actors in resilient libraries are broken.

rdar://78622313
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -8093,7 +8093,7 @@ bool ClassDecl::hasExplicitCustomActorMethods() const {
 }
 
 bool ClassDecl::isRootDefaultActor() const {
-  return isRootDefaultActor(getModuleContext(), ResilienceExpansion::Minimal);
+  return isRootDefaultActor(getModuleContext(), ResilienceExpansion::Maximal);
 }
 
 bool ClassDecl::isRootDefaultActor(ModuleDecl *M,
diff --git a/test/IRGen/actor_class.swift b/test/IRGen/actor_class.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend -emit-ir %s -swift-version 5 -enable-experimental-concurrency | %IRGenFileCheck %s
+// RUN: %target-swift-frontend -enable-library-evolution -emit-ir %s -swift-version 5 -enable-experimental-concurrency | %IRGenFileCheck %s
 // REQUIRES: concurrency
 
 

Original file line number	Diff line number	Diff line change
`@@ -8093,7 +8093,7 @@ bool ClassDecl::hasExplicitCustomActorMethods() const {`
`8093`	`8093`	`}`
`8094`	`8094`
`8095`	`8095`	`bool ClassDecl::isRootDefaultActor() const {`
`8096`		`- return isRootDefaultActor(getModuleContext(), ResilienceExpansion::Minimal);`
	`8096`	`+ return isRootDefaultActor(getModuleContext(), ResilienceExpansion::Maximal);`
`8097`	`8097`	`}`
`8098`	`8098`
`8099`	`8099`	`bool ClassDecl::isRootDefaultActor(ModuleDecl *M,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// RUN: %target-swift-frontend -emit-ir %s -swift-version 5 -enable-experimental-concurrency \| %IRGenFileCheck %s`
	`2`	`+// RUN: %target-swift-frontend -enable-library-evolution -emit-ir %s -swift-version 5 -enable-experimental-concurrency \| %IRGenFileCheck %s`
`2`	`3`	`// REQUIRES: concurrency`
`3`	`4`
`4`	`5`