Skip to content

Commit c51e10a

Browse files
authored
RemoteInspection: Update DefaultActorImpl layout (swiftlang#80278)
The definition of `DefautlActorImpl` changed in swiftlang#73998. This change reflects those changes on to RemoteInspection's platform independent definition.
1 parent 5f5d1cf commit c51e10a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

include/swift/RemoteInspection/RuntimeInternals.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -159,24 +159,25 @@ struct FutureAsyncContextPrefix {
159159
};
160160

161161
template <typename Runtime>
162-
struct ActiveActorStatusWithEscalation {
162+
struct alignas(2 * sizeof(typename Runtime::StoredPointer))
163+
ActiveActorStatusWithEscalation {
163164
uint32_t Flags[1];
164165
uint32_t DrainLock[(sizeof(typename Runtime::StoredPointer) == 8) ? 1 : 2];
165166
typename Runtime::StoredPointer FirstJob;
166167
};
167168

168169
template <typename Runtime>
169-
struct ActiveActorStatusWithoutEscalation {
170+
struct alignas(2 * sizeof(typename Runtime::StoredPointer))
171+
ActiveActorStatusWithoutEscalation {
170172
uint32_t Flags[sizeof(typename Runtime::StoredPointer) == 8 ? 2 : 1];
171173
typename Runtime::StoredPointer FirstJob;
172174
};
173175

174176
template <typename Runtime, typename ActiveActorStatus>
175177
struct DefaultActorImpl {
176178
HeapObject<Runtime> HeapObject;
177-
Job<Runtime> JobStorage;
178-
ActiveActorStatus Status;
179179
bool IsDistributedRemote;
180+
ActiveActorStatus Status;
180181
};
181182

182183
template <typename Runtime>

0 commit comments

Comments
 (0)