Apply bugfix from Bobby

camelid · camelid · commit c4636522fb12 · 2024-04-17T19:08:19.000-04:00
maxCount bit width changed but load wasn't updated.
diff --git a/src/mini_heap.h b/src/mini_heap.h
@@ -62,7 +62,7 @@ class Flags {
     d_assert(svOffset < (kPageSize / kMinObjectSize - 1));
     d_assert_msg(sizeClass < 255, "sizeClass: %u", sizeClass);
     d_assert(maxCount <= (kPageSize / kMinObjectSize));
-    d_assert(this->maxCount() == maxCount);
+    d_assert_msg(this->maxCount() == maxCount, "maxCount() (%u) != maxCount (%u)", this->maxCount(), maxCount);
   }
 
   inline uint32_t freelistId() const {
@@ -79,7 +79,7 @@ class Flags {
 
   inline uint32_t maxCount() const {
     // XXX: does this assume little endian?
-    return (_flags.load(std::memory_order_seq_cst) >> MaxCountShift) & 0x1ff;
+    return (_flags.load(std::memory_order_seq_cst) >> MaxCountShift) & 0x7ff;
   }
 
   inline uint32_t sizeClass() const {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class Flags {`
`62`	`62`	`d_assert(svOffset < (kPageSize / kMinObjectSize - 1));`
`63`	`63`	`d_assert_msg(sizeClass < 255, "sizeClass: %u", sizeClass);`
`64`	`64`	`d_assert(maxCount <= (kPageSize / kMinObjectSize));`
`65`		`- d_assert(this->maxCount() == maxCount);`
	`65`	`+ d_assert_msg(this->maxCount() == maxCount, "maxCount() (%u) != maxCount (%u)", this->maxCount(), maxCount);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`inline uint32_t freelistId() const {`
`@@ -79,7 +79,7 @@ class Flags {`
`79`	`79`
`80`	`80`	`inline uint32_t maxCount() const {`
`81`	`81`	`// XXX: does this assume little endian?`
`82`		`- return (_flags.load(std::memory_order_seq_cst) >> MaxCountShift) & 0x1ff;`
	`82`	`+ return (_flags.load(std::memory_order_seq_cst) >> MaxCountShift) & 0x7ff;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`inline uint32_t sizeClass() const {`