Merge pull request swiftlang#40914 from mikeash/slab-size-fix

mikeash · web-flow · commit 0a93cff965f5 · 2022-01-20T10:29:41.000-05:00
[Reflection] Fix async task slab size calculation.
diff --git a/include/swift/Reflection/ReflectionContext.h b/include/swift/Reflection/ReflectionContext.h
@@ -1372,8 +1372,8 @@ class ReflectionContext
     Chunk.Length = Slab->CurrentOffset;
     Chunk.Kind = AsyncTaskAllocationChunk::ChunkKind::Unknown;
 
-    // Total slab size is the slab's capacity plus the slab struct itself.
-    StoredPointer SlabSize = Slab->Capacity + sizeof(*Slab);
+    // Total slab size is the slab's capacity plus the header.
+    StoredPointer SlabSize = Slab->Capacity + HeaderSize;
 
     return {llvm::None, {Slab->Next, SlabSize, {Chunk}}};
   }

Original file line number	Diff line number	Diff line change
`@@ -1372,8 +1372,8 @@ class ReflectionContext`
`1372`	`1372`	`Chunk.Length = Slab->CurrentOffset;`
`1373`	`1373`	`Chunk.Kind = AsyncTaskAllocationChunk::ChunkKind::Unknown;`
`1374`	`1374`
`1375`		`- // Total slab size is the slab's capacity plus the slab struct itself.`
`1376`		`- StoredPointer SlabSize = Slab->Capacity + sizeof(*Slab);`
	`1375`	`+ // Total slab size is the slab's capacity plus the header.`
	`1376`	`+ StoredPointer SlabSize = Slab->Capacity + HeaderSize;`
`1377`	`1377`
`1378`	`1378`	`return {llvm::None, {Slab->Next, SlabSize, {Chunk}}};`
`1379`	`1379`	`}`