Define a popcount util

add include Define a popcount util Update MathUtils.h
apple · Apr 30, 2024 · 852ef0b · 852ef0b
1 parent 0e673f7
commit 852ef0b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/include/swift/ABI/GenericContext.h b/include/swift/ABI/GenericContext.h
@@ -23,6 +23,7 @@
 #include "swift/ABI/MetadataRef.h"
 #include "swift/ABI/InvertibleProtocols.h"
 #include "swift/ABI/TrailingObjects.h"
+#include "swift/Basic/MathUtils.h"
 #include "swift/Demangling/Demangle.h"
 
 namespace swift {
@@ -696,7 +697,7 @@ class TrailingGenericContextObjects<TargetSelf<Runtime>,
  if (!asSelf()->hasConditionalInvertedProtocols())
  return 0;
 
- return __builtin_popcount(getConditionalInvertedProtocols().rawBits());
+ return popcount(getConditionalInvertedProtocols().rawBits());
  }
 
  size_t numTrailingObjects(

diff --git a/include/swift/Basic/MathUtils.h b/include/swift/Basic/MathUtils.h
@@ -19,6 +19,10 @@
 
 #include <cstddef>
 
+#if SWIFT_COMPILER_IS_MSVC
+#include <intrin.h>
+#endif
+
 namespace swift {
 
 /// Round the given value up to the given alignment, as a power of two.
@@ -33,6 +37,15 @@ static inline size_t roundUpToAlignMask(size_t size, size_t alignMask) {
  return (size + alignMask) & ~alignMask;
 }
 
+static inline unsigned popcount(unsigned value) {
+#if SWIFT_COMPILER_IS_MSVC
+ return __popcnt(value);
+#else
+ // Assume we have a compiler with this intrinsic.
+ return __builtin_popcount(value);
+#endif
+}
+
 } // namespace swift
 
 #endif // #ifndef SWIFT_BASIC_MATH_UTILS_H