Merge commit 'a6459debc06f' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 6f22b11b3715 · 2025-05-01T15:02:17.000+02:00
diff --git a/libcxx/include/__bit/bit_floor.h b/libcxx/include/__bit/bit_floor.h
@@ -12,7 +12,6 @@
 #include <__bit/bit_log2.h>
 #include <__concepts/arithmetic.h>
 #include <__config>
-#include <limits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
diff --git a/libcxx/include/__bit/countl.h b/libcxx/include/__bit/countl.h
@@ -9,7 +9,6 @@
 #ifndef _LIBCPP___BIT_COUNTL_H
 #define _LIBCPP___BIT_COUNTL_H
 
-#include <__bit/rotate.h>
 #include <__concepts/arithmetic.h>
 #include <__config>
 #include <__type_traits/is_unsigned_integer.h>
diff --git a/libcxx/include/__bit/countr.h b/libcxx/include/__bit/countr.h
@@ -9,7 +9,6 @@
 #ifndef _LIBCPP___BIT_COUNTR_H
 #define _LIBCPP___BIT_COUNTR_H
 
-#include <__assert>
 #include <__concepts/arithmetic.h>
 #include <__config>
 #include <__type_traits/is_unsigned.h>
diff --git a/libcxx/include/__bit/popcount.h b/libcxx/include/__bit/popcount.h
@@ -9,11 +9,9 @@
 #ifndef _LIBCPP___BIT_POPCOUNT_H
 #define _LIBCPP___BIT_POPCOUNT_H
 
-#include <__bit/rotate.h>
 #include <__concepts/arithmetic.h>
 #include <__config>
 #include <__type_traits/is_unsigned.h>
-#include <limits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
