nicefy mi_popcount

daanx · daanx · commit dfa50c37d951 · 2025-06-13T21:45:06.000-07:00
diff --git a/include/mimalloc/bits.h b/include/mimalloc/bits.h
@@ -209,7 +209,7 @@ static inline size_t mi_popcount(size_t x) {
     return mi_builtinz(popcount)(x);
   #else
     #define MI_HAS_FAST_POPCOUNT  0
-    return (x<=1 ? x : _mi_popcount_generic(x));
+    return _mi_popcount_generic(x);
   #endif
 }
 
diff --git a/src/libc.c b/src/libc.c
@@ -383,6 +383,8 @@ static size_t mi_popcount_generic32(uint32_t x) {
 }
 
 mi_decl_noinline size_t _mi_popcount_generic(size_t x) {
+  if (x<=1) return x;
+  if (~x==0) return MI_SIZE_BITS;
   return mi_popcount_generic32(x);
 }
 
@@ -407,6 +409,8 @@ static size_t mi_popcount_generic64(uint64_t x) {
 }
 
 mi_decl_noinline size_t _mi_popcount_generic(size_t x) {
+  if (x<=1) return x;
+  if (~x==0) return MI_SIZE_BITS;
   return mi_popcount_generic64(x);
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ static inline size_t mi_popcount(size_t x) {`
`209`	`209`	`return mi_builtinz(popcount)(x);`
`210`	`210`	`#else`
`211`	`211`	`#define MI_HAS_FAST_POPCOUNT 0`
`212`		`- return (x<=1 ? x : _mi_popcount_generic(x));`
	`212`	`+ return _mi_popcount_generic(x);`
`213`	`213`	`#endif`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,8 @@ static size_t mi_popcount_generic32(uint32_t x) {`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`mi_decl_noinline size_t _mi_popcount_generic(size_t x) {`
	`386`	`+ if (x<=1) return x;`
	`387`	`+ if (~x==0) return MI_SIZE_BITS;`
`386`	`388`	`return mi_popcount_generic32(x);`
`387`	`389`	`}`
`388`	`390`
`@@ -407,6 +409,8 @@ static size_t mi_popcount_generic64(uint64_t x) {`
`407`	`409`	`}`
`408`	`410`
`409`	`411`	`mi_decl_noinline size_t _mi_popcount_generic(size_t x) {`
	`412`	`+ if (x<=1) return x;`
	`413`	`+ if (~x==0) return MI_SIZE_BITS;`
`410`	`414`	`return mi_popcount_generic64(x);`
`411`	`415`	`}`
`412`	`416`	`#endif`