diff --git a/bolt/include/bolt/Passes/ShrinkWrapping.h b/bolt/include/bolt/Passes/ShrinkWrapping.h
--- a/bolt/include/bolt/Passes/ShrinkWrapping.h
+++ b/bolt/include/bolt/Passes/ShrinkWrapping.h
@@ -308,12 +308,12 @@
   std::vector<std::vector<MCInst *>> BestSavePos;
 
   /// Pass stats
-  static std::atomic_uint64_t SpillsMovedRegularMode;
-  static std::atomic_uint64_t SpillsMovedPushPopMode;
-  static std::atomic_uint64_t SpillsMovedDynamicCount;
-  static std::atomic_uint64_t SpillsFailedDynamicCount;
-  static std::atomic_uint64_t InstrDynamicCount;
-  static std::atomic_uint64_t StoreDynamicCount;
+  static std::atomic<std::uint64_t> SpillsMovedRegularMode;
+  static std::atomic<std::uint64_t> SpillsMovedPushPopMode;
+  static std::atomic<std::uint64_t> SpillsMovedDynamicCount;
+  static std::atomic<std::uint64_t> SpillsFailedDynamicCount;
+  static std::atomic<std::uint64_t> InstrDynamicCount;
+  static std::atomic<std::uint64_t> StoreDynamicCount;
 
   Optional<unsigned> AnnotationIndex;
 
diff --git a/bolt/lib/Passes/ShrinkWrapping.cpp b/bolt/lib/Passes/ShrinkWrapping.cpp
--- a/bolt/lib/Passes/ShrinkWrapping.cpp
+++ b/bolt/lib/Passes/ShrinkWrapping.cpp
@@ -712,12 +712,12 @@
   IsInitialized = true;
 }
 
-std::atomic_uint64_t ShrinkWrapping::SpillsMovedRegularMode{0};
-std::atomic_uint64_t ShrinkWrapping::SpillsMovedPushPopMode{0};
-std::atomic_uint64_t ShrinkWrapping::SpillsMovedDynamicCount{0};
-std::atomic_uint64_t ShrinkWrapping::SpillsFailedDynamicCount{0};
-std::atomic_uint64_t ShrinkWrapping::InstrDynamicCount{0};
-std::atomic_uint64_t ShrinkWrapping::StoreDynamicCount{0};
+std::atomic<std::uint64_t> ShrinkWrapping::SpillsMovedRegularMode{0};
+std::atomic<std::uint64_t> ShrinkWrapping::SpillsMovedPushPopMode{0};
+std::atomic<std::uint64_t> ShrinkWrapping::SpillsMovedDynamicCount{0};
+std::atomic<std::uint64_t> ShrinkWrapping::SpillsFailedDynamicCount{0};
+std::atomic<std::uint64_t> ShrinkWrapping::InstrDynamicCount{0};
+std::atomic<std::uint64_t> ShrinkWrapping::StoreDynamicCount{0};
 
 using BBIterTy = BinaryBasicBlock::iterator;