IRGen: correct field counting for distributed actors (#64439)

compnerd · web-flow · commit 06725cca3ddd · 2023-03-17T13:31:19.000+09:00
diff --git a/lib/IRGen/StructLayout.cpp b/lib/IRGen/StructLayout.cpp
@@ -446,7 +446,7 @@ unsigned irgen::getNumFields(const NominalTypeDecl *target) {
   if (auto cls = dyn_cast<ClassDecl>(target)) {
     if (cls->isRootDefaultActor()) {
       numFields++;
-    } else if (cls->isRootDefaultActor()) {
+    } else if (cls->isNonDefaultExplicitDistributedActor()) {
       numFields++;
     }
   }
diff --git a/test/Distributed/Runtime/distributed_actor_assume_executor.swift b/test/Distributed/Runtime/distributed_actor_assume_executor.swift
@@ -14,9 +14,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: freestanding
 
-// rdar://106822386
-// REQUIRES: rdar106822386
-
 import StdlibUnittest
 import Distributed
 import FakeDistributedActorSystems

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ unsigned irgen::getNumFields(const NominalTypeDecl *target) {`
`446`	`446`	`if (auto cls = dyn_cast<ClassDecl>(target)) {`
`447`	`447`	`if (cls->isRootDefaultActor()) {`
`448`	`448`	`numFields++;`
`449`		`- } else if (cls->isRootDefaultActor()) {`
	`449`	`+ } else if (cls->isNonDefaultExplicitDistributedActor()) {`
`450`	`450`	`numFields++;`
`451`	`451`	`}`
`452`	`452`	`}`