diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h
index 53ae2757d64e5..bba4f3c56e44f 100644
--- a/clang/include/clang/Basic/LangOptions.h
+++ b/clang/include/clang/Basic/LangOptions.h
@@ -461,7 +461,7 @@ class LangOptionsBase {
   };
 
   /* TODO(BoundsSafety) Deprecate the flag  */
-  enum BoundsSafetyNewChecks : uint8_t {
+  enum BoundsSafetyNewChecks : unsigned {
     BS_CHK_None = 0,
 
     BS_CHK_AccessSize = 1 << 0,          // rdar://72252593
diff --git a/clang/unittests/Tooling/BoundsSafetyBringupMissingChecks.cpp b/clang/unittests/Tooling/BoundsSafetyBringupMissingChecks.cpp
index 7613f990b878d..f17f6bfdbb7e1 100644
--- a/clang/unittests/Tooling/BoundsSafetyBringupMissingChecks.cpp
+++ b/clang/unittests/Tooling/BoundsSafetyBringupMissingChecks.cpp
@@ -179,7 +179,7 @@ TEST(BoundsSafetyBringUpMissingChecks, ChkPairValidMask) {
   static_assert(LangOptions::BS_CHK_None == 0, "expected 0");
   for (size_t Idx = 0; Idx < NumChkDescs; ++Idx) {
     unsigned CurrentMask = CheckKinds[Idx].Mask;
-    EXPECT_EQ(__builtin_popcount(CurrentMask), 1); // Check is a power of 2
+    EXPECT_EQ(llvm::popcount(CurrentMask), 1); // Check is a power of 2
     EXPECT_EQ(SeenBits & CurrentMask,
               0U); // Doesn't overlap with a previously seen value
     SeenBits |= CurrentMask;