From 116ee23f4cc6e830dfc6e47cd792e2f014ae2ace Mon Sep 17 00:00:00 2001
From: Sriraman Tallam <tmsriram@google.com>
Date: Tue, 19 Jul 2022 16:09:11 -0700
Subject: [PATCH] [bolt] std::atomic_uint64_t to std::atomic<uint64_t>

Differential Revision: https://reviews.llvm.org/D129903
---
 bolt/include/bolt/Passes/ShrinkWrapping.h | 12 ++++++------
 bolt/lib/Passes/ShrinkWrapping.cpp        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bolt/include/bolt/Passes/ShrinkWrapping.h b/bolt/include/bolt/Passes/ShrinkWrapping.h
index e045a75..4c7e3df 100644
--- a/bolt/include/bolt/Passes/ShrinkWrapping.h
+++ b/bolt/include/bolt/Passes/ShrinkWrapping.h
@@ -308,12 +308,12 @@ class ShrinkWrapping {
   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
index af818d2..d4ac26f 100644
--- a/bolt/lib/Passes/ShrinkWrapping.cpp
+++ b/bolt/lib/Passes/ShrinkWrapping.cpp
@@ -712,12 +712,12 @@ void StackLayoutModifier::initialize() {
   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;
 
-- 
2.7.4